From 4883da6fd25e4645a3b30cb58212a2f666dae75a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 17 Sep 2019 11:30:26 +0200 Subject: [PATCH] Related: tdf#124600 DOCX import: ignore left wrap on left-aligned shapes The DOC import does the same in SwWW8ImplReader::AdjustLRWrapForWordMargins(). This fixes one sub-problem of the bugdoc, so now the shape anchored in the header has a correct position. This made it necessary to re-visit the tdf#115719 testcases, which are minimal reproducers. The original document had from-left alignment (instead of align-to-left), but this did not matter before. Bring the test documents closer to the original large document, so the tests still pass and don't depend on LO mis-handling the above mentioned left-aligned situation. (The interesting property of tdf115719.docx, where Word 2010 and Word 2013 handles the document differently is preserved after this change.) Change-Id: I973c13df47b0867e2c4756f0c448495257b7c9d5 Reviewed-on: https://gerrit.libreoffice.org/79049 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/qa/extras/ooxmlexport/data/tdf115719.docx | Bin 18335 -> 18338 bytes sw/qa/extras/ooxmlimport/data/tdf115719b.docx | Bin 19861 -> 19839 bytes sw/qa/extras/ooxmlimport/data/tdf124600.docx | Bin 0 -> 15667 bytes sw/qa/extras/ooxmlimport/ooxmlimport2.cxx | 11 +++++++++++ writerfilter/source/dmapper/GraphicImport.cxx | 11 ++++++++++- 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlimport/data/tdf124600.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf115719.docx b/sw/qa/extras/ooxmlexport/data/tdf115719.docx index f98f8b4a05dcdab87709ada1ab3f46a8b6c51b46..4eda09a98fa2cf66b5e408be521f1e741ec44e76 100644 GIT binary patch delta 8996 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 K2FpYM0001r_*yXl delta 9052 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 OlX^!Y2FOGJ0001^5L|Hp diff --git a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx index 8c552baf76c13d59167bdbda89aba484b669cb3e..4cb13228443ae15ba499b5ac33985a00b77cafbc 100644 GIT binary patch delta 9246 zcmV+(B;nhYn*slt0kHE34FriWPn7p$h(#j+0P~Uw9e-G*e_dFme_eHW3jhHG=mP)% z1Y`gJ0PI?6ld4Rz{yx9La3by(Zyz>M@IC!bfNUy?;O>_RRz=xl$6r4M*xh!wy`1H} zGcmV~P^l%K%F4>h%1ZM4KXTV;q-Ge|zIWe5zQN6g>FK^M00)-HakITwnE4HELeq+}CJ+V0xg@@l$MrUQ8Jy=ZR- zPt*8WG|;$z07>7QMCv-t$0b18zqSTUsAk~r3Gg%Q8#R&Z)SSPMh`^s%krLvO;xjBf zAM=3|SGB#TfqzOgSHeZ`9|J&N0tCBXTO2<0li&%>{x!6LcYMSuH}(%;T^9LzYSFJT zGk@Ew0oZ}A-W%*ZKU6gba0HgD0i@n2)w=oT-x>{IbTr>6%Ezh@G_oErT!wPrgkcWH zQ50`JR57NdCQe+okO%@}c(W#}38&#hsVYZ-ssk}3^$=i66hHXpm)G-wNbMdB3zkw}0s_Gkbf^mzL>mF+86{crBEw#`CA4?_1DS zH|Ryb?_kL&CpJS*jm^IA#lV0)Ljmpmy${yDp_r${4o#pbKwX;GovOhuR^)ko*%I_r zPv84t!?2@xe&1~4T@;*BWr==P62bX}v@!TnRGx~F?FNoH^}*PnR2%Bl6ij=!2Y=E+ zail}EiB7xO(9FH<8Nd=(9UWgknnwMo7Jd>ByuRr;0Jqst9mmfkaBwfnN%41+1^x*s3g51^(Was4)rcOQOS#zjeP?s zn3}}?`~2iq=)T>d>H-A#fqz|k*1go}AK8viQ~Zb<03LwzmN$L3Q9j%^L$Hb8nO{Ys zreYL-Fzy5FyJLGkXFJY&NNUgV8o+ZUaTNcEtq;+vUak!e*@k1gwQmA{EdElLSkL&V zTddm7``t>pINtjT8GWRUajxa>43SkGZa5G(dj2*S=*3 z75i-*|8E(Q2;*gnsQ+g9{UQ0C%KwvvQe%pep|v+^_~7@O((5-7a15 zs&Kj6h1V_GbxVESx^Ko0kNvoE+dpu;DBuin_S>#NJ++$iH~c~99fztw)-hb~t!%2O?{u3?Tl_z#C zwIA^F>XuhsI_gz^5j%ix1`obNkD-T`0SOLV-ZfP}zKTHvw*HE-?`bb8Zw8I*jr)Ch zk^5&}&heiS0;64^y_E&{`=v5QVYG~)7iCQA;S$?Zwa9mp*!-gwe>?hE-*tK?DBGGP*)G}SP53{380Lrfccv>t0Z9HbyLYV_N{ZXEv&e|O$YAGvF~1y zKFH|~h}%8`OQbrza@@BX?;fJJh==$SQG4HuoROzoV`W(3dRzAy0f zah{LFEq|ZmbAF#5a0%t%nX;PrXQ)ef37P5nksI@qUFVd@C$XbY6(Ahpn~ojgX-ql{ zGR$aZkV)g=NC*Tc2s`A+GK52s&)m?SS(|ffG4oc_O_xfn$v`zmoiRHc=Oh&{kk3?r zk~0teaKAMp zYiA@LQhh~`SOqv+NT+q?opC1Ic|ts#=TanF>}W9WGA=V)^wm7;DkqQV65Va&Dr3?_ zm+sW0C++04N$2sZdr0lWj+{V61vre>rY@e~Q)|U^Tmp!nfuL+my1RCdgn#0R)a>msUrF|9Qvssr#-4{Ndfbc?#6e=2 z!C*+6x>%NNCUA}rJFSgVh76hl`~XE9jm}|C?kcc1pRh~p(D6yjl+U4$*!3!}D5TA~ zEtyaem1xmv0vV7o*3jVwPwc6-=b>Zlwe=IffXomJ^fc?gCFcroAT#^%NmCdZ)PGHV zrraN8<5n1+MRZYUu##>HysfQ@XhFsaU$C;JLJJG-69^io+QcyVg%K{Omg&A4UB)=F2;uqgXeo9A4{n@Y?m4Ka6L9GSKs4RT3wC!>H~%A;<4ASc!V zkEDJDc-;5#P&@LY{74qZeu}gpD}S5^>p~f-u(*b4mWxhID5!LDIJJG-<~FKu)OG>8 z^eD2M*(1&3w6!Ow1FZsFZ|4U>JNwzhl6E+?Z%dfb9?iqUgn$=7#plZ8I2;B_*vDMV zG)NcP0>dLN&)#%B^4Qa^+p_zSw9FUQv;tfRI-!Rm);SPBMP>rU!g_yBaetEmJR5rx zY7$KI{&_PM*LtDDT)sP`A~$JEOD}_Yd!j6;W2Agd?PBBjun~Q@ujra-Js?I;sv?7hTY#LT3;&mP9XGj77*M96@f|et%1tdR{!VE&R05 zQ)kNrlOvu?I%a;bH!4K(Svobc(Vic`^`aaGx`s+7d6c7sP8ZflD)^|i^w^N6^tj_4 zaK=q&QG#{SB0Xf90j-}x5S7vLEE}^NMe!6>njmUl0aBwq*zulP*3dEweoGTZA9Zh> zZg~>ZfLSu^a;N0u1Aoj-E30I-<}IqF9JPJinFX=jSqGC57gvD7fKzn6t-{C#o(IZt zZFv~q$FpeLMZ&4xa>#VZxFX96vCt1xk)f1X8_uWUM(lLweTdHa`S3Irl+IyS0rrbY zbi(89Nlp)8IvceM7ug-hKIa6qgAdYRkWcoAChWl((iPD5Mt@k_6Ky`D1yls$w-*j9PWv(#^6(~lTt$r(x-#9=a5)y%xg%iD@ZL&O_2!}$3jFM*YwCDtZYX> z{(=$a=n@+!3=2%AHS3~ES^>sJ5y``B84BZ7WQUFgg(n^e9)bvl;%JeQ2Ql@DbNkVJ zQO`cKCZl9x@PEt1;K+r!rX3xD6O%_GVEbswhNth86a0$-qZr3z&xkp@+kpgew5*T^?%T8ShnMoFYT<-=MMd2{e0uP zkyc)w=I0N-dFiTIc6?X4`@og0+_T>8u<~aDmVagB=>4$4uS9Cz4Ilh$bmn7rKNXSr zIo{rl!hC|WPlX%bVeOrG%U`S_?}q(;BB1y|DDg`vKhN8*E9Hmbz@Jgc4}*W-p+~!U zD`JGe)qhLzO903 zW0`zdsTiQJ>ok$9SHI8yC-2jMy{inOClavoj|A84U)eZM**GYHbbeXIQQSy=pfTCcP(Kp5U zaazusq`#V!gJ54-IbT^h|NU7xpWKa4Q~b)xdDZJHE9bH2&$&`>!hP6Y;#CxG~coB*`j`PMF9_g|$3eCw1Im-K)({*Aaw z4}U;)7e<&JE4hag$OT~9J`P`W+M+J*Bhdv0me$+iG1;w2`(uBqbf$TT4-*Lsm3clRBc9*7iDWERM5}vFk8w9zI!tU?JIP*3Tb+WIJby>6 z7D1;1+=nNjFP(SDl9ZL5JEe@M&8~JMjfK!w156?Qorc!4_$vGAVb#?)C1iQ&KuH0lKE^ez$UW@ z3v7h6*+LFyMe3ldt&12GsfdX+*jYpRv|-yI@Iw2CE5tDFe$)2ZJPzq$BA_kB%%+)6rCdl;tT^om}JVnRZD~ z&ylQ^AGwpUxe zR<8Mt$?bNlOM*wA9P5H-Y;Y~FI7F3Dd;*IzZIufvzDT!*Enp^>g7flJuE3%^A^Cp0 z&!`izF)(OdGZ{K7-SwE-t@NR{sf}Z8%Lf3VPkh{h0BRefQ4Yf{Hr9+$jpJ=oL86O9 zCu;`N>uls3L0SP?YJca_8mU5K?fdA8?E1m+lHhX6V}!-_E$F{4CBou!Iy*1vwtkv z-)B7guqo{mSzrD_ukLEN^r?e{FFMxe38L(y`lz#}FZ%u0rGI3GAz&O!Q{=LDAU#Vd z{~^(F%6~;C`*PLBL!drkn(H3-SU4+Ji$cG`&MWM^!p`pmc7B=Qynvn5-{Js$nZW(vi1X?IeFdCX zzI1^FIPOYY9Hlj}FjF6nB(%QFMo#fFWgYfUW{3t9s2`OtH0Z3iLL2 zyym!+%4$;Ukmm9Wc`=bpd%W2q&BltRvy-u9b8}Cc8h^Wxg7~mAzzroIj-)u~Vbc29 zVLRW?_o-$Cc!>}rt1@<4psxHp7pBJ`^p?pkEVcp6iK09Pgk6I2n;-y}H4UYw#cee)xIlIYmjiKJZGz<#*`uJkcA5D!4+~wW#2T~!$t^Z+iE!~j zCu4bMF@K|+pLV9l4Qj(uD~d(CGBJ)^rfd*&&d;Vt6!&p+ZLllp#BRL?7CV@m7JOi9 zEme!EOpK16*aR3LotTV>p=Gb8TlbQnyp4c}AFZO3I0vEF+g8fHwe~Bt)5o*CaAltx z5!(Y(W9BZg0*EUzy<`gU1TPOxrs1gUPs#gES9J2%6A;QJ?UaDT9%pxZsj0T9G_GZ* zD!6W8r%GyG5}Y#!$vKUe?nylm3Y0gQFxxw!o$hApNeu$U9;p`U@4YdcF#;D~+xur=lt}25^ zwY5GmnlX{a)ly&bxV94zjB5Sb7RN4Sc8HvL)@g->EyED&W3GqCBd^uVg^I&0P=m+j zXs@G_xo1E(y(Eaz<=&dtmTpEOiW6X1FS2So^nLMJ_2g%7Dv_@A>65-L3++;&m1VPZo8&}3rcke zYfaEI;ix2|2|1NzT%cQ!ik%a`YUdI&0c$E6vP>9u!Lzntww+K+bIcgwcu;-{Y(6l} zR~(@K9N2sqXC4y#3t;nkU;2>XUw;IfU)1hCLG3GG)BiBoJYQKy?MoT{PlL@*FVFn_ zT=Tp0&i(9i%Xb4(zb6ONZ$?&+zs6=+t@~PV3)hiN-(?EdjGo5%@59$G;Prbrbp1aE zQ9taqi6Ib5Vc!i(g)kC=J}J)oKo#n{GaLg4fJ5~4OMIB8A|wP3OckO)Y=7XY7y)4e zTSbXC(CoRLFVn>R_%Z6(zvMLR-+T7T{sc*VE!_VkxqRb5f_D(lf0!VCPyruf{t1A1 zHW}VUb>D&@evp@4Y_fL<xcEe#2R0oHi(b0RP7EnN(Gc%W@|RlMMBH-G&oV7oMZxgLIv zOiYyXFQUD(3FO>asI6`m*?l*3Hhq`rTOImi+>drfL;CM*XgDK5@B2i8-x>IVX^19! zGiv}}FHDY`wC~wp05SZ7@C${=UtT!+K`{Eu7gs-m`sE1*!|-3=Z*dIpXVBJbH0%Rd z3;d3}_MSthL+CiMdw*`TeLFvs*GF69_TJ36BB?8qx+1ARfuy{(p=_OFe~$x&w~*9E z5M;QcS6&8yBbdV`yBR2MPx;);Xmz$29Dg=!sdl8v2Q{X%u8aj zk!DCyQNMSbcnQ)Sq&08Q`J2jP6`G) zI|lMGW_}G}sMQ%xsB*VpP~gnN)8zu&-bb&HPG$MPR=WH~V#`@G`JkE9F2x z6x5Zpr5&=OC4XQ6q`{!ib6svL2fqWwd_Au=G_+Q+1DwK@LFbSrMlR4`tg)o`Y4j@C}CIOzWP*TaU>HccMsF;GMO17HO*;Tnu;n%_i7 zn|50oq&0lflyc=UGHT}8f^Q|6vbG6w9M1%a37Rn~n(ZY)pCOs?Jj*39L1awSw0603 zQ!!sL?tc=TxU@5xAEwr<3073$D{HI{s2oKY+3&1XygrS`x(%TcAXE8baGsj)#$_@w zv{kb18e+=|x_78g`qBtg)pSo-HQP&F=z_r6~FfSAg8Wf+4)`(#>KwwSTBxq@vEQPNtn7IeMCHJt_rhWX|>_ zU5|WtjD@3Uhcr5{7~rkQnM}nj`C1c;qwGQR3C>t?qxj6E?+9>jgtF*w@q#6tymY0|f>&GS)ne%yymF1w=n>8`9H_~AwLL%#; zoqrxoN*FjndbpIvlST*a`L0?_89~hQY?m`@fPlzI324BaA3!_ZPDMA~#}MT124~W+ zLbAjr1(VkeehNUV+~mbfQ(_V}Mcu1?d}cvFU3K}9(5oHg6${LhXoPTtovT%&DllK6_a^bk?I1=42aBR_nHoe>! zfiIj$ZEqc;Io8-S7DNYVrr2GWj_GyRVl8GiFhigWdcafkE{D9(dlvL&!rNg1q@Rgg<$BykB33ve&rXc}jB$ zcC+tiEf3i5ytDk(#nR^2bGh7@XMfLxG`egvO@Fo1BysI(05Eo4_6Giw+i_~2{TJ@@ zb9X5y^uE~c?h6FGdsdov7mFLE9^yPJ(z|CxdiShI@17Ou-LoRSdl2D?Y-ZxeX9NP? zzViQvU`GFRAcT;YRhoY?5JD*UoZasR2q6%Pesdsnc54Cem*X!>Yac$y^M9TKJ>x<5 zjL3Sp_g8t)qgUOuOiSDC+x(4MgqPNT^Xl^Fl?uK3{ClTDAJf9eh<^eKRrhLhE zTN_Rv>;`&$yUo*}Wqr8$9lE(>@#b|SZ}gUM53|u;8=SE3Ixltbsaa`Xp5Wc@(CtNp zyZbu0yL`L9eo{Agzr(lp)p5Ta@$6!Lo;(f_?my4I*moHEUb8?!c8LS)_OCh3E}|ai`kCM zM047D(5OpLN;fVE5?Ck9Cda)v2{t4F&qtH41)Swh0CqVOB7fU;$nSY(lo)1!9iaJk z1L;~}Ov6betdeYHg438^L#@GWb7^RLGq~Di@(jXL&Z6h+hMOpat~c1UW(z`BaE&N( zX5KAL&(@ka1XLoi2o2>&3n;8;Q!-bXtghrnD6dT40wREwhxtSn5_ zar9D8YOVFcWYHSv8lPyVRVxsPipz8FbQlw0)ljfdLkid_n48Rq@tWl^Hj*-M@c)}& z%f)=Di#Ew_y)Zb6bP1`TT!OLQHrqqC?0{{gQ&P?YfqycNn~hDdfbYh+vYJbMw;O0( zehfv6&F6zxQzVGkQi3*x9%vqj?DpzmISCDp&cbzN32@7x^dg>k+mVZLjkVjXwR&IT zYI8Dl2_@Z`Dxym+CD0>3piH`8G-%CYRY!ukPA!RQ+ASxgDe?0Wt4^kKP^OxIZ;@3Q z;gvKsXMcz~F<>w-iNk{L4dX34l8Hj5%Jra!U?S?EQfy?IFj+ydVZD+K7TISNSOkEi zTAeiaO%m#G67uRr?Jst`H&@Fr+gDKsPsb%sfzGzEp|vs)ABD`E5{i$d984RnP-|ek zSyb`DTvF^wbO1qLjnx)e8ggcPcC=vH=^8#!fq(t~wOz}SqA(QQ&sR*%mPNutu@^H{ zDiB*|Zm zXQ;>#&*{M49~9Tvv*~t%6hcYka!WJdeRgZ)NsK!U+e@^T7iG7Mm1}WMp%tpZEJLkO8Jmh{(~`RyPBb#Dz@>B@h^VhRd$0pZ zK*+Z_;~WU%EsR{v@?e~Wp3dZ)wn;or$bU?Dta;>W)$(m4r-hP5l)PBsHFVx$-txH0 zn9#UCQ`ETdDu<%5#g|&~RFUDd{8X@=4_*2w`14H&*Ci`{ZA zsq_hIu-0(B-xZ|aU}0`v6xjfEX;ydTX+JL{9OOp-Mo9Q^0zQ(hpBEAi?(zd2et)S# zs=j${zF0?*_O$$?q0 z8HVd@`1{`}Eh4K>~NQ~QJZAN4D2(|{{z%Wrwv75Yh1+`wa5 zbnyO-O<42qmwc*g|Uaj!fl4lj<1c{Nc8h>af{k}nP1hu1X!hiU6Zm)IRSZ->`Oud&oYw%GZT}= zOc0Y(Od0{mlWt5u0>3zu@i-Qf#Y`#!`Z<&FOgsUhlP*m@0Z5Z=O(F)6N&o-=04P!z AkpKVy delta 9245 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 diff --git a/sw/qa/extras/ooxmlimport/data/tdf124600.docx b/sw/qa/extras/ooxmlimport/data/tdf124600.docx new file mode 100644 index 0000000000000000000000000000000000000000..d5dfa313665e2e54c7f811b4351d2c825533b1f8 GIT binary patch literal 15667 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, xText), 1), "CharFontNameAsian")); } +DECLARE_OOXMLIMPORT_TEST(testTdf124600, "tdf124600.docx") +{ + uno::Reference xShape = getShape(1); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 0 + // - Actual : 318 + // i.e. the shape had an unexpected left margin, but not in Word. + CPPUNIT_ASSERT_EQUAL(static_cast(0), + getProperty(xShape, "HoriOrientPosition")); +} + DECLARE_OOXMLIMPORT_TEST(testTdf120548, "tdf120548.docx") { // Without the accompanying fix in place, this test would have failed with 'Expected: 00ff0000; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index bf80052e33dd..c148d7989e0d 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -975,7 +975,6 @@ void GraphicImport::ProcessShapeOptions(Value const & rValue) switch( m_pImpl->nShapeOptionType ) { case NS_ooxml::LN_CT_Anchor_distL: - //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins() m_pImpl->nLeftMargin = nIntValue / 360; break; case NS_ooxml::LN_CT_Anchor_distT: @@ -1070,6 +1069,16 @@ void GraphicImport::lcl_sprm(Sprm& rSprm) m_pImpl->nHoriRelation = pHandler->relation(); m_pImpl->nHoriOrient = pHandler->orientation(); m_pImpl->nLeftPosition = pHandler->position(); + + // Left adjustments: if horizontally aligned to left of margin, then remove the + // left wrapping. + if (m_pImpl->nHoriOrient == text::HoriOrientation::LEFT) + { + if (m_pImpl->nHoriRelation == text::RelOrientation::PAGE_PRINT_AREA) + { + m_pImpl->nLeftMargin = 0; + } + } } } }