From 2a3e528bb9df4a1a2564ca5236be62dfdaba77e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Fri, 7 Oct 2022 12:37:53 +0200 Subject: [PATCH] tdf#136617 DOCX import: fix empty table paragraphs with direct formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Table paragraph styles applied on paragraphs without runs, i.e. on empty paragraphs, despite their direct formatting, resulting e.g. different font size, and after that different paragraph i.e. cell height, breaking the original table layout. Regression from commit bf3124cdf61b40c94ba117a76f1b63dabdfd528e "tdf#135187 DOCX import: fix table style at character formatting". Also clean-up commit 498d2b82187ec3ff58f076e0d15741e64c0505ba "tdf#131546 DOCX import: fix performance regression at tables". Change-Id: I41f8da61d49902c8c1683bd01632cce6d58aebd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141052 Tested-by: Jenkins Reviewed-by: László Németh --- sw/qa/extras/ooxmlexport/data/tdf136617.docx | Bin 0 -> 20185 bytes sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 12 ++++++++++++ .../source/dmapper/DomainMapperTableHandler.cxx | 12 ++++-------- .../source/dmapper/DomainMapper_Impl.cxx | 2 +- writerfilter/source/dmapper/PropertyMap.hxx | 1 - 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf136617.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf136617.docx b/sw/qa/extras/ooxmlexport/data/tdf136617.docx new file mode 100644 index 0000000000000000000000000000000000000000..e7b35aa295cb2d8e6bd16098471dbd7d7f6d8049 GIT binary patch literal 20185 zcmeHvWmH|swl3}jcMT4~-3b~Tf_rca?he7--QC^Y-Ccrv@Zb(_ce+n^I;Za&_x*We z+;Pv|W7i%_zN%VPU(GqIYR)Aq0Sbl+1OWsE1O)UJXr_6NxEUA-hyex&2n7fVL|xF* z!p^|L?vsMEm4U4$t&_PKVKx{DMJ5mk;Qs%7{uj4EZ@iR5&wE7wGw;{8$BN13XhOLr z2p+hKvRy|Gj?=WK7%lR3uWMp65L2e!EKblQOqcBwqh$L1Gi;x$F#^S0l`B8;>SM7V z#5r7g^YCgQjH|@UvXh27%2uM0u%_YShY~0O%Zbd$cxyigteLVyrZpy3j*VdWJEkrGOmg(~5*G>5}eE=H8tTOGn#bwQN~)n!Z>x%Jdn zBtz>HCMX?ulv+Fa7Vjg-HWyy;;4MT-vpTlaEKD^Q(z%Gr@KyycRe7t1TJfl7{8HD! zh@6D+;k!D-Hs4s|z4;xfUYL{mrxx}d#;gXJd8;t(vup&DS~h87wF7=3_%XPSG(YvP zSVGyak2=iLWr)zq5Yy`@v&|o|Ro=Sq>&u6Fp3>|r9!XdtPF zK{_QX!IeN+gr~1k9&Zc%xE=^zQ#|ce+O9sqI$oV+y@tPBCrZCKzwq2Srt{qgC4J$A zVg-~S`VM+_;d#BcZd4{dw&?|FCK$zY>c%0Us2DP9hM>`!i>(!_fL;r8r@~uLl5`< z%;(u>s_o;~F3cQhI=#td%q2)Dbumel~eL_^xf+w&cqV56{$2w7V zsf2EJ3t&x%C?{t1NNRG@trZt;6FrzRlNjdaO-0pRA&Ys0+x_vH$FV$M4Ed@Om}nv+ zy4R{Tdle328X3b(DX*!q&FJY!Q=@cCVX(iqP93`BbQJUj`B6h>K?l)2x*2L9tG(<8 z?_u$=p1oDA{j_O`ld8#o2~d3hK0Yjg^9YOpSL6U15*G*x*wNBPpYHcTqHn2ZZw}Co zzp2H44H#g6ZUo%@zxz|GG-Ax4K~%XbVvxBoCqXlIh#R|Y%PI~4T0#QP%=yHGa(Aj zcU|6=_T+YflE^pr%?EBm)cr=;BFE{uSI+Qi_lpkN-y}@ZltlAN^b0Oz6u;n-4hc2C z4M@bZ76~CjvG^GIVl&g_*=VlH%E7(tR@SwF1+D5s)rpj2gGOj=al}kU^mgK?U^@~* z{Ij*OwsHgqDE~E&h1#KZMMnw8{bS^XHjE$!KIS5^8LUV`25>z%|Mi$!Mdy?U9`zMs zihwA}{nwm1g53F(z->?}9I&zSK9Vb?r=$>kU1I3uq5D-_Ylu^UL(iT=ctjI82oAXS ztU;O5k>lN6J@qSJp5&7>+VM)iEN9B>iqYLb8Eu|l$e?jWnM}fof3_-8I?={-F+LN( ze}*3Q_(!4&U>bbqfdB&H^#KAx0`Tt#QGcfBaon=SHY-45!(QRRt&&IMW>k%LTOXQx zX@M=(w&hbUDG>*Oh-KUya1l{1mCtkr2&}n>g`Y=r2SfU6h^&dkKv{ahWmPI3(*>F&LlFE>;@7HJ1Q)Ot9V8N z_MjBbFq@Ii{7wA1H_qZ3ExS{SQ$kk;sd8_KltXe0C89KoMM6Tv^{=PiDygd7mxWZ? zYZ4Hce{k?F$UXa-n8$hL~FJ zC}b9X`8|&l^Z_DG!`*>QwFy&4-c>d=e5Vt5Xh4%3SG3*-(op;B} zUJVD|0LQ z)*7;P6tEVDeKUze(|#cekyPrYIufzdhk~}K;VmLxAgI$ZiMLbB*XF-mvkYBN9;FZ` z7}*A)8l@lYGNe}-6i2LPNXR#=o7@tNeu2e#j}|&Z5rdL)kcgU6)|q~ephXZ>9hO%o z-ZF+;ua=S6@xZR99!R-uY3t1wAvr-g+h8iVSVXO7Z+xi<)*(Il@@SMDJ^O4}!vJ5Y zloIrL2+~%!|KgRKJkfvKgo0rHY~umz)_ZDDBiMD<5zSu2_4x_aKW6BDVPd`Rd9~3q z$*--RpgE=fjCAKPEs;(Fd%}1`b6^#&oD;+0`|1;I?DKeMy2_Gm$lY761>5iLFb>1? ztM;efQB8R-IQBqc$`eS&U}2d^%%{re%-$lCP}uy$zn}Q;93=dILf=))+>rwW#Ov#^ z!m`B{J>qj572kVF!h~W%;AN%9O1atc+K6}C?2)9sQF<^Z3l%3~0&-A?;0}))3GDa; zuHg~;l2Jkk#3S`a?L0|@N2ac0uvjonFfL!X;PMr}7lf}8**UV+^s_C0=HI}v!Soc{ zaL~^JhMC1bPo0TEJE@$*S--mJY!#nQa`cKk8#~-!!`_yndb7FtPJn|%v|1EI4tsclmrrU*5d9SLM9E`M5CWbf zs2;VDUL%8fvXU~NaH-NYD;rQ_wmENlA2~T|)79XudYXGfal(H3Uc>)>)RBwx2`h6s zEKHm`04HM4Jpl*Dmv*n8L$8EoujIp*rpOJF=p?idxQbmo&-EHgvUlti-D{@kUSJRz z6e5q)YbWuoZP}!Buust}j|i=Wq zNIE3}%+u7A;S`>k47<$4wdDd2LQF@&pVhygMInf_Od@GyRlW6sXVBY%AIO<@*8JXc ziNrZZA?-BPeJf+c-pS=Pfe|6@GDq`KyX9~yUfgP(l5_}zuM%0gQp0}s%PA|jDs`U+ zr;$MAwZ|L0isUXdk$9s=Qy93T16|^)T7|$$1s>NZJptgH9wg#h?x|JgA>%}->QZ&n z3M$}dE~BZMmne1C&#I5x9Y2Wj>!iU7vu;+uHh(+G1u(wPIhKjI|_rHZn%;wxRO~{;xNSFeJNhPNu6?hk)No@Pg#M!fii(YC-AodJJWbU&qcm1|t<*V5X!qW@id2%V>|s)2H2dtKFd?YrKO#2ekt0aMUarNQdG->7q> zgJc-L=8aUkAEwJGC8I}Et}FD$Lr-SLjWlss`aRLXdpko?zCHxW1)sJI3(e^8mP?0g zc)9O1u!>vDy|6LBxU$O;k7K!$Je4j{M){UVY+B#}gGOSb_+dgz?7jyUmwn zr#4pQ#EKEif9ziSj&6<$K=)?++`WdDmUad;8FawKe9@cvjMAw)NS z+}|>WkDnP&6vmTBlWExj>fOx1P{@XgxtEghl9oi{AO}WT6aG0a(-{67 zn^P8*Bo69{!1VCvZe!rLuAP1}Z*ou+RL~j%yFQAfArt7=N+jq!&hq3^v(S*pw-*J{ zpk(sDOR%+FfpPx5cPpNSD1~n|4YJSmcxe&BQ~&5)S&uYKKOWp7q=8UgB|?wjFnNZ+WxEsL_r%Q8j1MXcb{p+|ER91+bQk!AMM2dOXo8Dr*r>@cdq`2)tePS zx1#_i0>236KSu7DMGigUz}dTNyvVblEXpbLxU0xQMawCNTVM@6Z*|Wh*2t>^$2-Yl zQ8W`;OhfLD`|b15o^7q*Ox=0wGC9;SK~#ES`~Epv;nx@5F^?R;;AI31UP?~-0DNV( z4*bL1K{KGKVbZ!RN~%^i=>BkYNo2N!RJ9Yk(|rYr(#uqN|Ig-3Za5-3kA|iBqa31j zWW_{puGyP2L`JBK-ZlcS>8K$dEqQ1U+6sTA2Orl^7vpyOiWlGO5o-t`Dah@)?fnS4 z(Y@<6MM+gA?$T=(JLOA~7V3dTbR65NIVdtC$GE#3y2uEOU26l*w*7H1W4conF7mJ? zqc9iqW{#}6r93>Poan;_>b*Nw-nUp!nb2-%G!sO!s|YECi{R^{28qpj~qb{|u=y_~itcJ%}ySV@x)^#>zkl{OIsnZC%(oZ}`@=4YP%c zwD{&kgQW~>!%mrbg0d%KBz;k!Xw={mS9jQR+8b7w=W#QmI?c#O+|&?*eXESmw{!lF ztBo>qr6(vN4~KmJuQL1(75yI>{y$cR|6lB{KVLELkP(16L!NelSFSJ zHwT{|9vc+VjDWO!FlgWVJ6Iby3D}%TNfvE4$&O0J?V#i8dkph`9Aq28^#V>G>K&v^+OCp@1 zr(4&5`wVQoSv~MxK)hu84Fi_`EUops92^$}E;5UwYG5s@EO(SBwU3z)le7tj>@e4g z*cN*{`i_)AX;dx%Gy8J+u+ik54On>8dfZ2}vWt;k3fzxT*bGjgQQsL1D})$|BEEFk zF_Q=2(3FFYjsr=MmkUyJg4sjbyJ5#Ittst(LKnBq9a=V)d2rXBbKiqea#WYLtZb1Q z{X7oGYtXk{PzEuw2BY9xhfwLpFaIUegH+#r8r+BK2GYkt8q+WdQo>3sA38}WEUSyM ze(8$zt~Sb6_jHNF~>4?9%j=y^|@1CpgwjH7B~=G za?AB|$Cje(+@|9`%*6XKPt3%*6D_nZX%%vQa*||!62xRds%zG_p06u19#Ngn`SMC$ z=+GQcA1oI5JWGpJzA5}h7vKLjUHV(}ey58kK22Szz&KyW8iSPGU( zAGh>LJeA?PI1_)qj#m4yzys)3w?V`g-&myqJYB}YLd`8D5w}tR0p?$@v}{JR8`x zjSHQjcO#A(;{x|omUC~_IJL#tc??x)x5e0-Ehy_KyFF7ldecnBr$R9%8nZBkf4$sU zygUkCdRp(+`kU&f<6ydrMT;P4z@~Pkkwu#4?Ysb&0{4E1i@aV0`#~4OztJVFi;{Ke ziUUBGM-PsUrlNn*Wjn3lH@chx=rZ(!E|Nd!^7#i{x_+ZeQ>p#G(?#xqit7hmXbyMR zB>{Aqq9e@^b$N0;a{NczfPPhw5(Ho&=HdVWq5Vs~*cls`8_@kof9Q~7RS8R!54au5 zhmM#hcu#?N(NK_m;qWwI*}byXxM$&xkQ1k+hW*g(idLlxMO0-j6mph43g%Jo5B)rn zYZYkX?qHrLj$PXHBDx|KGSLZIFYlh$Bhsqqw3>04?1X%CxlNqwE)@}?diQ~)y5k*d z*0~xs-xgURYxko}Uyup8B-HagZ4j-=Aq7E$JP28A#$!;%StwFX2N+OKT*i`Avh5J{ z!{if{f`Jf#t|uxU&KapkY^1F{sFQ+q}G2V&C&cgDd1SGRmQNXcc z&Rq#g>jyyF`Kpe9ascz4#@7EYSulTr{NV0Hfkyep3irtYAktQF9RUo+=X}g zFt*C*5lz|KguZct^XCAI{NltD?BQ#Yq)QG>DqWdxo!LTFJ-I-hxI0y4Wv=V`J>Cm_ z14Ijdy$Y2#v{&ULiBqdf1z<=Vs+iQ}bVqt2ByxTeaYmn*|2xXeAxZF-U36H)8pX zr-`w*^uw23EHxmkrd_9*EpdInv6&ln%hB>rv7Er81$j7i+}GrmzJW&d1$}7e=&&4r zz29psO`m8dooKG)@RmXN>MzxL1z4B}#Vdv;UdTOIM;?WBsWc|@FJ#{-K!UTiMyEwx z42{}2L@Cbhfhr)(Hze_8G{O^)wSiWKtvTK)W7~Mns;=9+l7luby>W`9sfeRX0mos2 z9rJUbGL~XeQC$4$Hv?T_(215e7it3J(qGg zb(PUK%v#g=6#NV8uNVGSE8aS(AbdsYXofn|7jAJW7sI;gY>R2}b%%03G)P5}rWhj> zIgIKYND_t*3n}m?0W}PrQ(;Ooy5>1I=ymiFHpW9%qHcBi2CQSZcPdEMnBW7(o&8%t zK5LwcUFlxpPKt>dGbq4lrViSM${t$ammT*zb6-@kH(SXMkkix>yT%$PyGF$i(P}tW z*C$csFO2lXIl^9z^1qGxfu5>m2Jqs7f{Ac`P{+rh+M4v64t(GNhJ+-By%LZ`S0nAc zqFYo`wqZU}$3l>owbK0v$t>h8P#_;gsQ+o#q1{`R<}BFRU?=o~SHAGw%rOVy2j6S^ z>+;W!Jg8DFVy93(DG13t6KM=k_F3&EO=(MDo=Kh&M?{u=yF`AC-ol@NN9|h0c(-LO*NYitZbNhlRmJZ$8-G?6n#!Enb-+*6W{fM zjM&)NazQmFUZbgRY5p6RZBAk>14fKFhr_4K$Z$cUS!1Q$(nz!nPVzN&OH0q!lRZo} zjn9kopHHF4W^oksz_%4_ivY-0qtRs<`VCayUytvZs|ZWA0UZ<7Ecu6&jJCbceF9dp9EeVMtf$%sGOi8HCj7u<+z<=*~mw`EMM= z^fAd;gY{aYpMF(x^8j3Zh%KJHh{QOP19}iZzthjW2)*mrv+wj1t^P7i*dsTE3i{E;!)P}T2I(( z?r=Db77qn{qLUUddNPfA^GM+Lm3lvj5y{j>VQMxLLLnebPv-$ z6e+S4_V&6{>dgrp#ZcXgewIyAr39=-o}|8g&Oow!_~k5X zvO&Z&a&|oafxSwJHqZ@Q)z-Xutby1BQRGDN1s7V-v%OXXJIc!gG%JwyI50wRT`hwm z6S}S+#cwc0=UwyzN#)ITsMFi(>MreArRU}j;C6D2(m5u6gP;rHUzgrNmoN7xdAvYXQ;~5ub+4%eh z1*1bq>G2vUd;o7Uwv<8+GZ`Wiz97_gYLGlkb}ml5=>@>%T4 z0-lRP=_!7f4lMV(w*11Y4&PDeRnx|;i|N-O5C=VT_hiPB29eRYkD`ld8YhWwYG)dL*vg?`mCK41m|!Y zQUixj9pb)5csb6l^2EP~gB9ALftKy!JEfz7eJ_IU$9?hijOF?EFnTh) zo{#J3rUlj^+SR>oLEF&QeJqk`%s*>ayvh9Bs6BC$4`njEM81i4;@HzJ93%V7L9ze2 zmIRBoXFVp7HEj(SyI7^^?&7E1DQ@#K2))8r0*^<6e-xX1@O$Y9@IXLLu0TM)3DzHO z8Mb!LX1`D5kJCnMwwsasZ;OVxDr?2jnd;3(@MZ8OD3_URkB2qf`qP;{2l`Uu`uKK_ z++9GZ?jco=!tQ|QUuXe$hP-Ftuj21r(l-c^^K7(xg=eM==6ilZyxicDVj_!<8M@j% zCCL<{Ac|i}muz2a^*lF4*5?o->J}D|A&X#6d3xH5@Vq;Cv5)7oNd`xb)UVk7u3tTR zId_znMy)ZOs881yOm;EmC#n}cl5lV$EjitydrgFT9=u~V&OSomc;n!RK#oR+Cx8?J z4tt=Egw7ykW8M)XM;k;m6mJ$cSNr(3)-_6`M8TJNWG7Qk>q56X8iI)jC^ONoXt0;a zlM+(?S~Ms3-cI=y6lQd9j;jYdy{_A z{S=97nSCyuc$|O*h$pB~XT}Fd3y) zL7nQo)2`M>dalnMS_l<6+U{sy==y{QB^)*QdK;0?3FCy`<_dKnE+*EVg18$aGwf9& zgJHJX$ol#jK1C`0TlFWo>jEX(mVf`wzC% z)}ebU-Kbqd!p0#2#EZ8yQ)?5e?IMlV4Rp{JD<|)~a2#E`9k(qe&HzUTD`71>t}WIL z{rnV@L%K3nvH8$>=CqsTx+LzgoTHhG#Pmlt%I zKta))U#`~{p{j|fVNHcOh+F29)KxTUvRC}|rCgA&Gt^@ZS%X(#D>hpl}6sD z#hvyi>-E>$l4TEU^baJ@N4lLH*$1YMe5}dEN(Y<&-Y;>SvqDw^ z|J5(UWv@ALKP`JMmp{9Wtd)YT7O)R^agJ1v-su`|xTZfDc8%DTG3%hzH1lCk{no~9 zV7~Oc`s=8;R*Ujmo~!7P@8dGq?M@m~3h@SxIbvtv`&;QEFM$irRKqGvq#XsCjG`B3 zTXWI+k_+NAz2EcN+cWXqNJ^$ao40&PJ)Uk(g(Wc&o=ym9EqFbkEPBP`l1z1Vnba1fOCy*pa$Hsp#*!d86AhV@NhBt)C|te>5bS&B zMiG2f6dyUO+?ho=Pwp+Tnc3u5XQW#jdD_-t%XRLEiY>YnXcw~I1~*J)9Sy!eW5&%m z+(lg2fX?gz|*3B@Yza#+JEi+C_E4 zWt`*W%bo|1c-oo>W?f+oN7OY*>qfp6l@E3!ciJuIF62|ysqnSF=J*y38fVe!@gG2G zbW$oH)J)UrsUNSt$LBhxeX*Lw;FAh7f^N@gr!WoWN;!ee?XP|Z7V(f>NE)}n3^z9i z@-0m#xoQ~!C1MpnhlmTDn4HU?vivxZ_ltYhdXm}_gP457f}5*uO_O_D5PmF&CykKv zTDyIh$(@vDg3WfUKJ&MoV}uT?xnaf|XWUeamBf<*eo(ctAC6Ivp<-pfG{wli z1*cI6d=HC81h|4jpDLThBV9PTCR`Y~MWi6g|ND6W;w{LJ+vcn-Em<6qsd6*@V33Tn z1i;h^T{_qW3McW&6^zdS2y3LDuOWUxrxN<@R*EbTTkz6HQ+jN?HLw)IaO?JLI=RQU&c(l0R!7 z*nU?^`|)eLAzxp{b*+b<=UrY&vHYh|^(Lv=7b}I;cU+(E+MtXCR>0HP@K29i^e}zL zI8Yu?>vpS~hvq&7z1O^Za$EBZh!7*V&ykpGLwrc4^df+(1KU@4^B}NR3nskA|0y>m zUVFiLGQnL+q7n}Oid3^~zGw1@&sVKLQ8*z0F%>iwn zng-f9un09ZVbdC@C<}tj&qaFKUk`#W1zS6^2ywJvXRm0$vpN2GiG_r{30r$b6aM3P zxjzM)vJVy3iK%F3Gd6N%xjz`WGH7TEprEBW#JPP_cl5kn)7Sub+ZD1=`d*qr|F^Up zIR0@ulVciV|&qCJxHm#d);9Cx1LpqiNB?+#ku%si{WY?CxL5VH9jN8sLcmXO94h zz9UPy+M&(glImt`Wt!_hlO;_+sm&UHOMb3Iy@CYSZ5bpzWxYpx(v#IoWA-6iV;GKM z_63`0Nr=~jPr}FhO92hO4`TKth3TS-JiKDJ4b56Atc54q5}R_YXi9wP`X&dVYf}Xj z#Hpow%oEDOBJW$`3B>1~Rb<{jAD9X(UPZ%JJb-G_S7FQQcfl_|Fc(xtB{~+g~R(edZYZsMpChd4lbBS{{ zG4jc?=4%0`lnOA{$#^VX$$-D=Udt2D-Qh!>`MAkw9;UY0EFUwAO*y2H;7kIY4jE&} zt3*|C4ep#7^3ZE3>ZFS;q2=mtI1_2OH#!A4q0`oSxTX8b-CX3P$H>K{y`u6 z<@(B~gfsIDpAb#i)oO3_KYYmVkRjks7n$H4_SgGryDlKnqg*qRu7wGag)>3+_n#+u~1LWeD#^n>0%64WhzP zSJQpAm+Tz0PGU{dqMRwI87ue-;?Hb8Y6M9_44J99hxOfszB$+<9%yk*E(Xcn3X6X2 zWZ|M_ED~>vT9h0di!~pAiRd`@eAR5nDkZn;f!37pD3GXc>S4Y8MzLi}A9|?6ok+NK z`8t3|>tBp@1o!r3o8YpFf#mr?@~xfHsIW@{k9$FbHhbAR2R~SB7cR2OazhM`4^MJi zTHEKor9m3u{T}~uYt;bePk-)%TG*TG8rT39 zoqpQ~ZB<$d|4NVQUNP$#NOWyIDBy)CWjOmqPKu?h*x><~jG-6XvRcZkqarO#2P@XA z7uLTe)m8d*tnW4g$GZ#{CI~akykh?=dM>mCl4k!+$HJ1PvAP^^GRP=J=m|~i&34be z%g_1| z!O7^!)OlSZ8U4*!ED6ZA6zgD3z1dx93V5WI^u}k+TbnixDCnV%Xnw6?pSk{;b&fL1 z%f$~yj~Zid!Owe3?EQB`0XUdAin#-h&Z-m7l&j|heN(P}K_!(ej6}hw=H1Hhp?cdd z(;58%VHKf@zT2F-TVdqSU&vIQtSoRv2}p}XtxFwqaGLcN?2W(!y!Fyf6Q?ldZaOnmtFHivX zhw%YnN_zITc9!NU=4OAyDw)_BnE%+;`%j<}pq2jh37x1421K?&Y&>tQbs1ZxuE-7} z6-ZFpaf!ca#{M8CsW+lxYO>zGm;cW08%5CTGIR?oCdj% zPr~ILbZ*fQ!ECXm*3=W=k^g-VHJq1|Q~<8L0W=@Vzct_gQ_Gb`bin{Z;DkI$k5}_u z5Gl>`2-Agpshqw?=P$EH9>6>}o`s6F4S2Cj&%se!V5<$pi3cax7C4t=yarVhzV1*J-q)ahF?#VImC z|3()+Ie>^m5;)d=U_r>ii>9aUp9k-dnD=j=8uAVBMz-ba;O)c*72M(%?nEix4 zI2KaMk<{qa6*>xom=7X@jveEDPtb)3uumyYV8=|F9+7+hsJqyuTJIkLbdv#)@lP|) z5b)*+1sz?pAAC!VnX*WsNA*7=KLNNcg&btw3e*&H{aRzy}03G zjZ_-Rj`fZlwS4S(VfS!z`Dky4jGjBiA!ZmWBw$;U@DLfZ-gk4FF0_%jR`b<3Dn=T} zSkn7VwGFV^&N(!5}aN_mF!4)33wN+-y#Lx|> zo5k5cWJjAuA}8WZeye^8AlVt&VIEk0c9@g&=I=?^_j(UgCsEHx(`LZOzKd1GMJ*!i zpw$p^mlB9RHtLJduO@!&gvSfBYsJ1qshOs$Is$Zb{~kl`yZXXh`doB&{HyP?rXTjkjT3QH2)*DRuqlBEZib z1Yd)(VvcknoaM!Zbo?}!wh_e6`UsLu40#{ORHC<7wIM#~15@5-`S2u-z}I%1I%62H3_bDFtN zlH_2n#nB8`xgrwX2~CVX@1Bui2oJG`HK%%#!UZNQOKD^&6hdZ3Rhv)rbET*_nU6T+_&aV< zIxzquptgX>Z>};BB0STR{8AFe6(He0a<%Bz48Q~jM zA{KEVUTgm%WrZ&|jropBXFK>r{z76r=c^w1wr_VlQ5kHSq`p6%qj?G18t3&&mXsTB z8ZCP}Ni94ph6nYafAEOl!+Lg@d=ee+{0Et9u-QdtVw7OI`&?jN&P)ffWHm>M{2hGw z#X&p~22froC!4IGEz>t{vXyHigo@c~LHE}nPC7l1XJJZ=AC>!z%Dh9$rRLlt)OIgB zM^Fi$Xo~kUXBhNi$=s&nPYYZj`L+2^y{{gXo2R_Xq9GQptfs_KknSuYSF%P0S4GqA z-4ITyS6H7}O>6 zudZ?IE~fB9J0k7?UM#;GJ-{F|05S55AQ;fmH2xGe}9+Czkt8}Ujjzi zPj6QF75Mj;O#BQ)0eJNO5OV*;D<^)<>DRXa{FPTL^gp~4;8*ysfdzlTDFER_KPvK5 znCGwPUqj3OLPG-d`VaI^QH1|}^bX43&_4|EU(vrtKK)g87r@2!r<(tWgZdTyU)OvD z<8NjEh@JTr{a?3QA=cl@{>PgC>h1qm%>w}bxqr6WpT69`mj0{r_h0x%yg%?iyMq4; z|J51zFZe#dqv1#Kzq$thn#HfKVSi xParaProperties( xParagraph, uno::UNO_QUERY_THROW ); if ( xParaProperties->getPropertyState(sPropertyName) == css::beans::PropertyState_DEFAULT_VALUE ) { + // don't overwrite empty paragraph with table style, if it has a direct paragraph formatting + if ( bIsParaLevel && xParagraph->getString().getLength() == 0 ) + continue; + if ( eId != PROP_FILL_COLOR ) { // apply style setting when the paragraph doesn't modify it diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 191b7fec353c..dc42f0198cdf 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2462,7 +2462,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con xParaCursor->gotoStartOfParagraph(false); if (m_nTableDepth > 0) { - TableParagraph aPending{xParaCursor, xCur, pParaContext, xParaProps, std::set()}; + TableParagraph aPending{xParaCursor, xCur, pParaContext, xParaProps}; getTableManager().getCurrentParagraphs()->push_back(aPending); } diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 0678440810b0..701546e2fb93 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -606,7 +606,6 @@ struct TableParagraph css::uno::Reference m_rEndParagraph; PropertyMapPtr m_pPropertyMap; css::uno::Reference m_rPropertySet; - std::set m_aParaOverrideApplied; }; typedef std::shared_ptr< std::vector > TableParagraphVectorPtr;