|
 |
69cc7b |
From db7a015c86248bd2a3d090240f9360f84b3bec8c Mon Sep 17 00:00:00 2001
|
|
|
69cc7b |
From: Justin Luth <justin_luth@sil.org>
|
|
|
69cc7b |
Date: Thu, 24 Aug 2017 15:48:29 -0400
|
|
|
69cc7b |
Subject: [PATCH] tdf#111891 unostyle: use default handler for non-page style
|
|
|
69cc7b |
|
|
|
69cc7b |
LO 5.1 commit 664197d95becd516c3dac25a50439078ba61e051
|
|
|
69cc7b |
introduced a handler for RES_TEXT_VERT_ADJUST to handle
|
|
|
69cc7b |
page styles, but that meant that the default handler
|
|
|
69cc7b |
was no longer called for frames (the only other item
|
|
|
69cc7b |
currently using RES_TEXT_VERT_ADJUST).
|
|
|
69cc7b |
|
|
|
69cc7b |
Change-Id: I33827160fe64dc4cc2107afc26f7ac2e698007e1
|
|
|
69cc7b |
Reviewed-on: https://gerrit.libreoffice.org/41538
|
|
|
69cc7b |
Tested-by: Justin Luth <justin_luth@sil.org>
|
|
|
69cc7b |
Reviewed-by: Justin Luth <justin_luth@sil.org>
|
|
|
69cc7b |
(cherry picked from commit 10dc371d31f003ac3ed9b89ca1db95d36603603f)
|
|
|
69cc7b |
Reviewed-on: https://gerrit.libreoffice.org/41910
|
|
|
69cc7b |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
69cc7b |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
69cc7b |
(cherry picked from commit 461aa995d75f031209711feda9d785d915c42dd2)
|
|
|
69cc7b |
Reviewed-on: https://gerrit.libreoffice.org/42082
|
|
|
69cc7b |
---
|
|
|
69cc7b |
sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt | Bin 0 -> 8814 bytes
|
|
|
69cc7b |
sw/qa/extras/odfexport/odfexport.cxx | 6 ++++++
|
|
|
69cc7b |
sw/source/core/unocore/unostyle.cxx | 7 ++++++-
|
|
|
69cc7b |
3 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
69cc7b |
create mode 100644 sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt
|
|
|
69cc7b |
|
|
|
69cc7b |
diff --git a/sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt b/sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt
|
|
|
69cc7b |
new file mode 100644
|
|
|
69cc7b |
index 0000000000000000000000000000000000000000..8fcf98a6272bb749d26c88030b35f8c147a02308
|
|
|
69cc7b |
GIT binary patch
|
|
|
69cc7b |
literal 8814
|
|
|
69cc7b |
zcmb_>1z1~Kvo^({xND*1KyfKjw73
|
|
|
69cc7b |
zAI|smw&%M&=YID-|K!=pUP
|
|
|
69cc7b |
zuMof>Fc9i$3k2BOT7yghP>>CT!wF)>ZUb-tIk4N<0wHELrjB4B1j-Htx
|
|
|
69cc7b |
zarFTa0pac-y9Lv*bOf6~03d4z4(N|lc3X%=sH(CoHYNq;?O(9v<)qXR5boWcBGjTI
|
|
|
69cc7b |
z-M-(G%L%#tm{wKPkba@`Qo~T!Kto?a!$ijjpkr*JY2^km)HgP_v;ccpnnNui9#;0A
|
|
|
69cc7b |
z_E1|32Y*XwfVF2dG&IRGCe16hB+Sh^!3XM-P~ewR5S>#OUD!~b8PQmfSX-I}tH`UY
|
|
|
69cc7b |
ztZZ&>E^h5_`8d~BmegL8Kh#(-)l%Bo3GeLc?dgIK_I3^Q_Vf&VY#o^!8W|tyZyOov
|
|
|
69cc7b |
zUz{GCn3x!wU0C=u*EO-yGrcjhusXN2zP>cKwKVp9fA;If(%#p#ue
|
|
|
69cc7b |
z92^{+U3|YhJGeYQxW2x=y|bH}8!n?ArrSGBm6sCNaGBki)KP9XCJR#2c;t|VM)jVN
|
|
|
69cc7b |
zgucxu301oK(am+;8gz$Vsb*8515tS)znTcsi~bhk|0?@)k*md!G!-Al#z5-~#xevQ
|
|
|
69cc7b |
zY99~8&g6TYBnV=N|Njo-8Vr2{B4OW!UCw|xvl)uIU5hKYwF@^*BN3DD!cgzBxbsc6
|
|
|
69cc7b |
zFo!6g%wRRN*{;?g7ujtmfA9njY@jHdatDBQR4BJJvkCYGMXq(l=nLj2WCqXNblt%u
|
|
|
69cc7b |
zUyO|RuW-=E%u+m>kup~0g||37(7)jwKGZ<>Q6`eMBf9!tdc3tpxP<%Q|7s)zgzrU{
|
|
|
69cc7b |
z2*KuKmR+a1F?T5P(#le$62^Z2TJ7lQ=zqG-ulV<G2c|X<=$&7<fUWbi6>L`d@S4xG
|
|
|
69cc7b |
z(3w9{Dv2Iy5bgoOQDzyWE989_NFt<qrI=#qLH!FxEs~>enY!((Q^Ub_&E!L?t61v|
|
|
|
69cc7b |
zxN|9wDGPZB2R#K-6~_YjV2s)?KIPvCdrLgs3SL)ne#@$(TqUvgHH8m#{Vmsix{p&1
|
|
|
69cc7b |
zH%F7oRADdjh@u5{LBWt>28Mj9GE4YK@?3wJWz}lV1U3I8AM{lhv!1oeo5qO68DG;K
|
|
|
69cc7b |
zi5REiO1Ol&>4|#8%LS{b=l68V=()Cg!r3eaz0bD#$dUo`wL7^6iUEcD+oz`_LLggy
|
|
|
69cc7b |
zTz;75e0CVs3*{YiieU!sdB7{H9_<@eKBoemDGrTDWo)jsmoHD=Q4EGC@kXb3NRL}W
|
|
|
69cc7b |
z_-$Jn!%aL~Nu`VR2&*XG_hNe?XJ5K_@Y{+{n4VQm8y4Eb*FJNK2u_kpAZwNQiDnIb
|
|
|
69cc7b |
z`UZ9Ly>bYE47cmSv0mZ}i{2l`7?$jk_GAY6qyoff>nnJ$JL^I}B4Ijg!|xS`i;vwr
|
|
|
69cc7b |
zdnUZjq8o>l)PyZlJQBncJiw?I&?d)G@m8IYkl;m>O_FMf>pmE0^~__wq}pGzkWpEp
|
|
|
69cc7b |
zEgdB&2Nw+&Oa}H=c2EB<{1EaQeR+08j~R#PY_JNmim5iqHp2H&Fhf}(XYlh12rYV&
|
|
|
69cc7b |
z!6ou&Np6@9{<1RLSDg@@VK{Em{BUWHL|Ha>UqckWgdj);UE>uk9u?8UD!B$x8jU7u
|
|
|
69cc7b |
zi=hWNYVqA9uPLNUPukN~I*u%?fjv>OWC)k(Z(p?u8#p;5EQ<2r+^3&MQI)q3!%T5#
|
|
|
69cc7b |
zYCLKZW_^4;bK#lkr5^t*MrL>vdDaQ7kbIHa3^ZD09Qgh%cIW+csXE24M45~0zHR4r
|
|
|
69cc7b |
z(ux^kCBhXm98#E9U%5V(WjKn3rtpXam@x#Kw>%6JNc0YNcs5(-i8PNs
|
|
|
69cc7b |
zVHr}U)NSeZZwbI>pI=+0@n%q=i5srgb$E+f#gog)V35-Ym*iP2i>tXOLzYNq@pymH
|
|
|
69cc7b |
z^VH<ho#b>jm^SoL!Xx_$4C6M#vQJ1~tPqWiHpVzEh3b?WsJB7V1W`gSgVfRkHqzT*
|
|
|
69cc7b |
zfzNmX59&Xp4UfqYI7!KpQG(XaZHe;Sh=aI$4(t5TqxKFe_6$GzwORx^^a;6N^Mw|x
|
|
|
69cc7b |
zjv@x)86Q7IwA17s6Ms5M#p8|)uPY6sAb)5iPrUv(wuK
|
|
|
69cc7b |
zxYITY$J^;ZG`-&Une8?7c1@RA2JJ4D?D(aC2)FF`)(t-^P2Tq;C_9}?5$?ky$2Yu<
|
|
|
69cc7b |
z11RmyhKlp*ZPjaL!JV_M{fL3lPx%DND3!Na&V@E#fjvY8n>w7y+;?%NE{j`-ohiQ!
|
|
|
69cc7b |
zw!DF1;#erTB_xfi*q*V3F#AlLmc}L|u7qBacg)+_6^+Oz?HKsX(b-}qr{{V;lPL4=
|
|
|
69cc7b |
z6-}Qv94^&aC3SLIUa|KYW2-JM=O91og|A$+v)6;0+v&5iG#icvPC`j5P-e||UwsU#
|
|
|
69cc7b |
zv;uBxx763yBg2<zvw>_z0ryCDtLPpoiR65$y6;V%?Ka*eGP&y8LYTOSpsIj|9!#E7
|
|
|
69cc7b |
z=ZK7e@EQ-{c6>+lzl&CP#OnZcwFWxe1*;uho!9dp@V$o1EPJLKD~4h9s|U}>I4eVU
|
|
|
69cc7b |
z5MFJ%wk1xpb;UDAYtUSu=m|>~
|
|
|
69cc7b |
zxY-*J&opca^H#jRIze)i^YS`-Q|D2a!!%<iTykHX`HzWYe1Ut*>JZigt^#S;vbH*m
|
|
|
69cc7b |
z$xeJtCXdoEX7oPTWH&OoFNzFk3deR}E$NYuB%W+!(`lp@tpY^lar?eD4dmrG=OI}<
|
|
|
69cc7b |
zsAzxO`!Omfo|IU#+7uo-ayVxi%kmOzUbT9_FH-tWf7>Gb#7%^I+}M`lyik|3BO#Bw
|
|
|
69cc7b |
zJtRYMh-3^ta6}@tTyY9on9i+aua$~$!qz;0RCriU6B*Ls)yfNsf?HaXZ8*7T&7AL-
|
|
|
69cc7b |
zR%+L_GSh_gc5D;k4H{)W
|
|
|
69cc7b |
z-(9pVD^84$@9vf$0%yg3uqmB6=3~Q!gd>GR@h(H}vox+%b2^5)UAEuDh65DL#wx6>
|
|
|
69cc7b |
zgd#ue{5S91CYyRH4K+C}c>OhyvT~5
|
|
|
69cc7b |
zM3;Y|0e=>MMO~(#jciRk<h!PUFV2g>O;-y7g{XC%
|
|
|
69cc7b |
z47J2)U7KKtg}l7aq*ch_VdR|-q8M#J8<%~mQVn8{bM^|Jx0|MR=BH<*V~X2bnC&A8
|
|
|
69cc7b |
zdVE^PcgXdP7X6!_0!)rUwNv
|
|
|
69cc7b |
z3WH%YZ#eNA@2^j0M~YC<4VNn6YHA4*TSCU-*r+!?c1|@abEqD4idD_7K_E3`FIIkw
|
|
|
69cc7b |
z0=WaK`_CNUgZ7X2ZVrZf-<-u6^){PpW4VFkj3XLkbc87VV3c*65-o)h+qQ%AppjQj
|
|
|
69cc7b |
zsCy`-_9+Y*Q&%#?W{mh@?OW;`>db8|_|uEz!AS7biNQ~7&GHQO`r@eEB#dYMC+sNJ
|
|
|
69cc7b |
zd*>VIg?MH0y+g5dS975~R2JVuT6N`#1VtE*woDGnvw$2|9`ahYa$>gc9?5C)2NF{E
|
|
|
69cc7b |
z!Lk-%rQC_`b`Fu3SyPFp`|W%@x_c-#nVOpr)P4c=1Uh%+1poux{7Y@))o+Q5*z!ko
|
|
|
69cc7b |
z`Yff7?{SVs*!G9%B$$f&R+zG&2XQkZhrcTfe5h+KWm8cP3Q;;ubdfafKup?yZWWC^
|
|
|
69cc7b |
zM>1VwN6Ii2+p4QTEzS+=2qNGGk@ISh-V+L9-*V34NKANQiuLA_Vh`~7a?4CceYz%|
|
|
|
69cc7b |
z{}nVroR<#sl=L_
|
|
|
69cc7b |
zNRAm3Bj=7oCHWdKl
|
|
|
69cc7b |
zY6&nYMc{Ynpe}O-rBt?Big(P)ylpD%*O<`EW@lMKw8ad#+=A|-%aRAytA3H+7)w1l
|
|
|
69cc7b |
ztd-aFgidbh??+hDZ09I?N`KEpIN;g{;jlBH#Z))eee}u3jmPk9O(Adr;3^|H<3w9n
|
|
|
69cc7b |
z6Va(%`IJ(R9qMPf-zI}7XYwJIVs<#448v<%5r-~a_*zCTkZ6%G;cF36dYFn5m5SxP
|
|
|
69cc7b |
zYZL;Ojz<cp{h_!IItU5_lnWW)>?c?0ORUd##T_~EAaK
|
|
|
69cc7b |
z;o^KuBVQDv2evvur>h2`7jhKsi7a`STi>A9
|
|
|
69cc7b |
z4|JZr3_`VvkmoTnxxU=|2H|Ze7(XhE;cg2RJ_^~Hz@n}eY0?=|HP|+oIw9CpB!{o<
|
|
|
69cc7b |
zU=R3{phW>vQ!5KgAOshoQo9N`(@$A~hSe?<O%5GmkAjaNoa>Wk{S{0WQCI@mm-<_u
|
|
|
69cc7b |
zEUw2~o_Yr4biOXWdA
|
|
|
69cc7b |
z0nXsuMri=OH%m2XUE5pS>~M5nTC(V_MyB%3J_$hegnlfUqN
|
|
|
69cc7b |
zT4sXd<79>*-iz_i4PgbOVb__wuSL<%Wl7oNXgAohY-~8K
|
|
|
69cc7b |
zLJ><$2li+|tz7UrphW;SD06e;QE|Xo`QlyJd>JV?tbFb{O|MqoeF=>Os=-+>r6HKi
|
|
|
69cc7b |
zG$7EwL^_8-^AE{3i0h15YPbM3iD5W`zQW;CZFFU|a{Qw&ezZ`n(LVyiOD$eO`iq0&
|
|
|
69cc7b |
z<2Q)E_zC8sCK@ddG`n}S+xWk*)-yxhW9E%X8?in#hg^TS
|
|
|
69cc7b |
zNU+E-->7*ivyCWyQyHJz(bMD0*$o*pz!jU7$rihC#FOkqnmrEMm1^(_m)BPxb3xo4
|
|
|
69cc7b |
z%#fUCL+;R9nanYIaWU?sod)6l;LjdQbB|=MN<>%ek`$IR#g~P{=AJ8=ScU@
|
|
|
69cc7b |
zT`LJOq#kwZ*(s8o#eumy%FR7IyZdczdEy~BxY&q#R3K^a=C$xB102E(d!(LO?F=<)
|
|
|
69cc7b |
zP*@ZbE3KKeD?Q$O_L@!K{ng?aZqmfX!2q_KIJxk8#*hj5T<+&O-jZQ&kK8Gt1qpR?
|
|
|
69cc7b |
zNz_p
|
|
|
69cc7b |
zueK2dvjt9&7a#3CoIl4}20Jom7MjEyb2^r$V6Dq>U#YF_90NccvLbDZo(qbkMH6ne
|
|
|
69cc7b |
zkr0CYY>AJ
|
|
|
69cc7b |
zKzvS=`2O;ABbBC`R(^d#hg7^spyf4%&5cP!E%J8&GS;;Y)yIwi=L@ykH~I2|-JLv@
|
|
|
69cc7b |
z89r4v
|
|
|
69cc7b |
z5;Op@KZ|Z)1GVN|kxf9wApZLts;&2#C*D{$yUuqh4{)#4u;I3Jp~&%1DbJs^4ImV7
|
|
|
69cc7b |
zm+(Z!DUGGl5(S=J5l8K4;?s9>b~%r2ec7oFhrVmT@}-n~)hZsb)xu$=cvSPb{BVBL
|
|
|
69cc7b |
zb{K_qVW?Y>-xr)P@)fUJp3H|thS{K`gC>
|
|
|
69cc7b |
z36lT|Uhc-1Y-8Wi*&O_mQID+wbv%@mN_{ZRi!(uC{wdCYi{{sttbDZ+E;YK@6@oeH
|
|
|
69cc7b |
z`mlFZCvx(>SwY#7;kFSY12`BrPsdvqWS(^CQ(~VJxmmwqzz`ohQ`FMzyO==87>riw
|
|
|
69cc7b |
zp?
|
|
|
69cc7b |
zmKk%6&onFB?r(ew=$!F;C(s*GH#9v?oNIr*LN_yGS9W;GaOpO4Q{ZHS?=6K5mVfX$
|
|
|
69cc7b |
zT)2YRa^Kvv-?^r0ADni
|
|
|
69cc7b |
z4+Ew0Ejb?SjZ0?9AH)i*y%O(`?|We!mF>l^UWDmw%7W4f+TIH_7d<3+HwK};=;jRj
|
|
|
69cc7b |
z(o^(!WIKrJwUvY9N|CuM(AB|(^|-4~R*6cOjcOVu#(}c4S0l=Z2JQ&lI~d5W6muR%
|
|
|
69cc7b |
zZ@K{Xx7;lS7ozTpiQ7`r{%sxU@3UX5yX+STg@Pa!f9AhUx_ZvD{CHlAMll`k&*kd3
|
|
|
69cc7b |
zg5q+!qen+$TidDy=AHs@v!o}_
|
|
|
69cc7b |
zavDL^3u(N{Vlre70xckq^kd~4tHzeARSFC42jW6qj0$2YFR;5l(p>}?zNt@NYzCP<
|
|
|
69cc7b |
zuZ;nf&c)Ja%`sS+V%neSUapUU^I2OeN%YxmDDIn%I#t1ROBRaR7qU{G>S<|dDLFfz
|
|
|
69cc7b |
zSq9j5ZFU#-WqK80;%5@ikRHPMftwZ
|
|
|
69cc7b |
z)C$ZP)+#iBqWew>gD0vcD1sL*zopw8dt~`2ae}vZla!u2Blo$ko^IEF)9pMkLF43p
|
|
|
69cc7b |
zw)X6BniU7L`GbqItD4gJ
|
|
|
69cc7b |
z;sVs3Gio13ZC`T{$!Bt9zb5fcDL;
|
|
|
69cc7b |
zbXdw7(G=b?RMr>HCeimT(}JFEm2%31Im@e
|
|
|
69cc7b |
zq&Gln2W<{9p`cS1skUtZs%92C-wibw6$
|
|
|
69cc7b |
zF9EiEBP=8FRE)tv@!}SU7$*)S;OC4&wg>ca#Ge*oSC`Qk@o6&akM1X%1Y!Cv_Ab-C
|
|
|
69cc7b |
zRp3^C|Dv)Mja%qjV!F(L!erl+N~I91?hvuLy(ryyUT*lBB2n`xo?K`bY!5-RNX<9y
|
|
|
69cc7b |
zMy&$cMrYLToVGjGEmG^{GKf3}T@)5nRaX@Wlt*WnQvufmHsr;}7~`|5c9yF|)
|
|
|
69cc7b |
zgbju;@zohNSy;_TCUA1M1+ymmRfXmcMz+;bs)kfz9zM3VN=~Zf-W>J+j%$|kL6(y}
|
|
|
69cc7b |
zVg$3jLs8(gV#xcCvH%RicK-|-VT&u99mo9Xz6#H)zIwlWrcSyC$%@314SqoxV&+&m
|
|
|
69cc7b |
zeLMFEH(h9SoBNnf%oXy@(eP;8^aBDZm7aRQXGs32)j#O0CVa(U#Pc9_9mS)ofD}u2
|
|
|
69cc7b |
zz)`1AHtSJg6C<^O;e`(hrnv5sWNeBOX+XJZ@uD$d*i1>=Ax^fbKmW(l`3g}H>z#~b
|
|
|
69cc7b |
z>0nTKPLS9>tlGcuqK>4~6(E{6_+I-2|GuY)@e4fXIi1upD0-p#%O?X7HOD@&h3BdM
|
|
|
69cc7b |
zAvMFuUS%|Da0A8BP?I#GVIjZXJkq0KdPgmh(rWULsF&kga$|3vIiK-HCg0Qhq(m!^
|
|
|
69cc7b |
za&_7XFsruQidjU7uscC%mG%AdL<8%9Iwx0wzl^8}76*b0M%z7jt`V&3?VKF)WO
|
|
|
69cc7b |
zCS#J5=zzrgOzbP$?yJJi@?5D`g2?2mfWAkf0Lse8=Zv;}8L%*{&nR(|YNq9eu6`IB
|
|
|
69cc7b |
z(Zw{6Ob5?Wkq+b1(=rV7<EeJ9c=E_pP@AXc>5p%=O^W!yMD=|p!-Tw^E65O#J01;X
|
|
|
69cc7b |
zh{5nOnN@gjYd{bauG)B2FJ}+dMzLXwUz()HMh?<Op*Q6xl!A~DRIp|~$>0Oz$!7(%
|
|
|
69cc7b |
zL?>*bW>kHpVmqd^ubfRh+&oe_SodZmwH2x%&kSw-s&5^TNhhA!Cbg?iGuue4SImJy
|
|
|
69cc7b |
zHaVAl*7SKb9j$7|mS|@T-T1uKA;}C8PLQmkOX*67wUxEUS*Oe%!>RA(FpY7Yc6yd%
|
|
|
69cc7b |
zDR@tqrz7`kN6K5ZCtL_5m&-wlOksxx1r|3!Nd@mc+DOrTS%T@lEHx;~sPeBA`n}*G
|
|
|
69cc7b |
zYUfMyM1&_6To(#j
|
|
|
69cc7b |
z(K}oBc}0UVcp4W5ZpAn7^3}@sMo#Omqh?Q@rE(td*$VH$B<&+P8ulzli_XdQyOgEH
|
|
|
69cc7b |
zq6Z?p^`_Z)ByHO1sq*2=_4mdJH?70|kdM~LpV1oq$@>FvW#^)pIatDQr=Hg`K;&db
|
|
|
69cc7b |
zC@B=3b?Ur07MGDyhLia`YAft=X<$0@+{s+auLwSCMEMdlNShc(R1S&|4>%nz=UiV3
|
|
|
69cc7b |
z=&6aMa+1@$2O2ac6q}*-tZ>DUJy+XEyJ1Xq)Ui@gVEsl&bfP*Nbm+~kU4x{qil!pt
|
|
|
69cc7b |
z9f!PAp_Y}Y7iX}1`u?+;G(44sqMuV^*_mKai$;Vm{25x)73m!X%|^?8lt;a#ALbtv
|
|
|
69cc7b |
z^rO@AYq|KYIU;ETF$Y;V+W*;Oad^UU+f#8g0oZf=wWabuX_;Hw0HDBs(xUmzwLoBi
|
|
|
69cc7b |
z1<-**0t5vEY#sjLk`%vDwzaW!w7r|{|56WXV`FU#fB>!kmwFCR0MyappG`ycn|T6E
|
|
|
69cc7b |
zO@Y?HTl?DllX-rpX=`s|VGnfpAFlbkhj@37KWF;8+S^_B0R})o=0FE1yS
|
|
|
69cc7b |
zpA#=&PdE@bG<}=jpx86^!K^Y{d4sf3I1W
|
|
|
69cc7b |
zE8n+i@R%~u_sLn-Y_SM7u*34^1ZSsfS!hzI53Kz2GMVe0A
|
|
|
69cc7b |
z90{v5K5Cobx0A!_s*Xa(cn~Q8I$86e5Exp)FxOIpe$9$@J);!~|0GzDRf!3xRc{Ke
|
|
|
69cc7b |
zrH%0wi^Ndu3xN7l)hjE&xf74n1lqE9R=SOw#{Az38}GA34NotGV7*&6Txu%c)%RcY
|
|
|
69cc7b |
zNU(I
|
|
|
69cc7b |
z&n!n#Zj(3ve@xzpZ_TG9ts%}PuPnpyUv|7r>PzAjtU5UHg3bg2M{2dLs+ilANqjSC
|
|
|
69cc7b |
zMSPfFQ~UBfnPlv&E3=NB&LcC~hh*G%P{_a!Hmscj*~wnhUoP#jB8@jcnU3GS{GQ-l
|
|
|
69cc7b |
zxeCzY4}2FSb_g&l!0i}g)7e&aBUX%lPlYV6dqGluC@3fv>-}||e`{+H;dHya|D9`1
|
|
|
69cc7b |
zMRfjkX=dS9OYj17eY_%Ts3HI@K~3O
|
|
|
69cc7b |
zXpMKw=^8$W=x
|
|
|
69cc7b |
zbmSZS(-rs;20j|m1MDe>z=WduZWpZy4lL!DHfLxgD~m0{-x2T3nOe(Fg>`Gr(Lc?3
|
|
|
69cc7b |
z50MDr@0-52HvL6@w18C={;Kuw-QAxmO1Gzf*X#X(^1~N?tx(@}&3=l|?M#2^q5Zq!
|
|
|
69cc7b |
zulu~a0`^bYLi@Fx{qK6eZVK*pfj?#bwn%>4?f!F5`0rZ3#_>Cs{VAISf89R((EPhN
|
|
|
69cc7b |
z|5MY7{GX!!Uyc1!>tC((pX03Gp!{Tkzel;_fuAz@8
|
|
|
69cc7b |
z{HHhyzrp#HHU3i^|KH&J$|8S{bH@fhrQtU?e`S^b6zSwQNPlISzel>`nV-Tz`QL5*
|
|
|
69cc7b |
zlXd=u^267D4XJ-!#K2pW|B9ZsEc9a$|Iqw3dfbKFpOSlPqTdE!RRxsWyaxdR|MmsE
|
|
|
69cc7b |
LZ9yGT-;Mqsc2j`C
|
|
|
69cc7b |
|
|
|
69cc7b |
literal 0
|
|
|
69cc7b |
HcmV?d00001
|
|
|
69cc7b |
|
|
|
69cc7b |
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
|
|
|
69cc7b |
index e513aaa..19f1695 100644
|
|
|
69cc7b |
--- a/sw/qa/extras/odfexport/odfexport.cxx
|
|
|
69cc7b |
+++ b/sw/qa/extras/odfexport/odfexport.cxx
|
|
|
69cc7b |
@@ -758,6 +758,12 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust, "textframe-vertadjust.odt")
|
|
|
69cc7b |
CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
|
|
|
69cc7b |
}
|
|
|
69cc7b |
|
|
|
69cc7b |
+DECLARE_ODFEXPORT_TEST(testTdf111891_frameVertStyle, "tdf111891_frameVertStyle.odt")
|
|
|
69cc7b |
+{
|
|
|
69cc7b |
+ uno::Reference<beans::XPropertySet> xFrame(getShape(1), uno::UNO_QUERY);
|
|
|
69cc7b |
+ CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
|
|
|
69cc7b |
+}
|
|
|
69cc7b |
+
|
|
|
69cc7b |
DECLARE_ODFEXPORT_TEST(testShapeRelsize, "shape-relsize.odt")
|
|
|
69cc7b |
{
|
|
|
69cc7b |
uno::Reference<drawing::XShape> xShape = getShape(1);
|
|
|
69cc7b |
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
|
|
|
69cc7b |
index ad6dd78..db6fc57 100644
|
|
|
69cc7b |
--- a/sw/source/core/unocore/unostyle.cxx
|
|
|
69cc7b |
+++ b/sw/source/core/unocore/unostyle.cxx
|
|
|
69cc7b |
@@ -1803,8 +1803,13 @@ void SwXStyle::SetPropertyValue<RES_PAGEDESC>(const SfxItemPropertySimpleEntry&
|
|
|
69cc7b |
}
|
|
|
69cc7b |
}
|
|
|
69cc7b |
template<>
|
|
|
69cc7b |
-void SwXStyle::SetPropertyValue<RES_TEXT_VERT_ADJUST>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
|
|
|
69cc7b |
+void SwXStyle::SetPropertyValue<RES_TEXT_VERT_ADJUST>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
|
|
|
69cc7b |
{
|
|
|
69cc7b |
+ if(m_rEntry.m_eFamily != SfxStyleFamily::Page)
|
|
|
69cc7b |
+ {
|
|
|
69cc7b |
+ SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, rValue, o_rStyleBase);
|
|
|
69cc7b |
+ return;
|
|
|
69cc7b |
+ }
|
|
|
69cc7b |
if(!m_pDoc || !rValue.has<drawing::TextVerticalAdjust>() || !o_rStyleBase.GetOldPageDesc())
|
|
|
69cc7b |
return;
|
|
|
69cc7b |
SwPageDesc* pPageDesc = m_pDoc->FindPageDesc(o_rStyleBase.GetOldPageDesc()->GetName());
|
|
|
69cc7b |
--
|
|
|
69cc7b |
2.9.5
|
|
|
69cc7b |
|