From 25ca25ee25278536c56a2ac4a63af91100ce4d2e Mon Sep 17 00:00:00 2001 From: "Attila Bakos (NISZ)" Date: Tue, 8 Dec 2020 16:40:48 +0100 Subject: [PATCH] tdf#138739 sw: fix regression of first paragraph MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First paragraph of the document lost its formatting from commit 056933bc55608d0ca061539ae124d7b9386cdb62. (tdf#137802 sw: fix crash on deleting last paragraph). This reverts commit 056933bc55608d0ca061539ae124d7b9386cdb62. Change-Id: I7d42c9a22b456ce3faa9cf08c6c73a2878636c8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107427 Tested-by: László Németh Reviewed-by: László Németh --- sw/qa/extras/ooxmlexport/data/tdf138739.docx | Bin 0 -> 16780 bytes sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 8 ++++++++ sw/source/core/doc/textboxhelper.cxx | 19 ++----------------- 3 files changed, 10 insertions(+), 17 deletions(-) create mode 100755 sw/qa/extras/ooxmlexport/data/tdf138739.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf138739.docx b/sw/qa/extras/ooxmlexport/data/tdf138739.docx new file mode 100755 index 0000000000000000000000000000000000000000..7b5bb302bfa195654c448cb180792a6c7105a4ca GIT binary patch literal 16780 zcmeIZgL`FLwmzIxtcq>hwr$(CZC7lgV%w=Wsi0!pw#_f+boV`{tNZu;1NW{x&)R#< zIp48o)-%SKgL0BUz(@d~0N?-s0Qdl&clQhWfB*mqAOHY}0N`IV1#NAdjBT8BmE7%& z9kprPtgZ0!fWMIC0DSpe|9{v2;y2KcIAYUF2PgcH^b8xpiZ`k5eoy>%=&h<3`A1Uq*kLI`5xw&$XEhwG9FkcaU?)Y&=ErZAm9^0e)+=X zyE(lC&Qer+uNU|Zm1tmNaQ!210!ADlkjmW#1|N zdtDxA#}n~*c+0QyJTRKX4CI$s&?61S@wOx?lB&!&rGm+z^}XGXx>*Db@3Z~D1V1rT zowSNdC4m*}5B{%_mOyUq;RDT_I0i&L%m7W}S>TeXUOG|RDek0V;;n}C^mgu%^FI&? zra=X6PP4{pYuQo6v+_5&rbR-1BRe#gG_t0K*meo`SP^LT4x6`mIqx7gr`;d>$T*NM?Egs z-8lW-y15z(F`3K2%6cP)&Pj1UcL~uh70h~V2oUL_(t_#yB#(4R;c*<&t%@&B6CQZC@}LG2Us#<_(5Gt zX2!Kqg-*ntLZ+F2sXJbc&9EmW&Bwvb$Hzw3OgKbjr7eg!gaEKTF-%m(HG_CBB>&HW z>FdVF{0j{DZ~j?cOn$NeD=sh*V*Ex3OyY5D$Rgb}+i0EDWgwi?G^lnW_Z&=&(+Z2| zfOSE&vw1& zbu4%Q+r1kMgzScU&d*Sd$H#5g+Wnx`SxT58KtCR!O_+xy3h(ZrR)|3$&+N^g^DBBS zKvL}wxWyhA9K1!;QQ%g6qD&8ilNvFOyu#&|m^F}RspqYnrY9d1C$OyPJ&Rv*h`9o3?K@D zX;`$&RVo9B?qHe@Xqm;ve=WrNNt=Xubt3?c$%~~k5FQ#&(d(M7DYals?Z;M8gazy@Ua04T$hzAb(Y^ggaB2&hO_ znMRq2pnnFI8k`ZcC%yDR;CRHOGM*>r1QL;>6Y^(@O~Sa%3ECLxKu>of}&E|PRgI>a=>^n)l-%L!jQTYQ-HcO1+W zaG1W%)H2>_CHzVuh*+qHjO3Had%P}zWfmrmg{J+s_0H?+F%+Wj8kbI1MDEXsRU#vr z!Fhea=2ij4m;8dYj1+<2eczIQeP1^v+&U@?*x%+aWYMIq3m17bHVwIGPc%^qE-ah#jpp_y z#OKwtLPhlWWAS%Ofi8M5pvf43nh71#{)Ic!mD={hpf4LGLpWT>fF>T1MsgTwh6xy9WcjOb zJydXivZZVkpH-OHiw)9%MWgB`*-)=_R{#RB-un5=K9iN6^{|+OD39FO`R}{qb*!kz zh01Iyp|_pLYSFc8pjtMJq9P|BZ5s#WA9E>}8`wIiu}>=x(;ap$9`=>>8sYdz1 z#=I})#=8#cq)fnLfb5>($0Q7%%XSw{bWg?~bQ`WQ3W2vgw{|C&S0VutVY^j~yCJkLjTBBCJY2SOK zp!KC|=N*3IIg4+uL5R|t@WE6I9KUx*0wezoT&f#Cax-09f&s)xtmAUXfK7Gkb&4Vl z`{@v(_Iqh`h|#sQKU~aOADIjW%B3Wky<&7u;w3<%HmS^YQ7B0X+Dn1b!i^n?!)+OA z(q)C}73sxEup~7tcl)OmP>f6eZ4f?JDgFq(N#fGI0g|rVvp=6s=Lc)xKC!T4m~gXh z(kiLGiH6M={Xi5R);^Mj)e#sDHxAr#E7tm&dg|(+;)_6b!FPFJ{kB+G!B`Yi7g^4+ ztznAGCLcS6j{-aZX10RUq(6ti1SAc%Y}_=Yu1MiRv&Dfe zCs<31d4SSYjm3?#&+TJ;(4Y-=H$b#SdYq(&ptzWkO6F98yo85vJvTRcp1x_3vKph1 zUf+Q-=3R;t(4fwL;f&kZz+4UoKE7#tF*JN$KNo|H@#=2P^qin2wq%l4Y%CrvCQC0Z zAAu0Li3|>ahRb2b0Seo=6}reAEy3u5gBgq)<`Y>nKPzOCDF1 z2Xxa9rvtqu%MdhYp{!7&kTvd@W&pf3r_boCEcgwlRrhX5L`dE!+(@2i{$ab`f;k=@ z2iBZairfNHKGVaocCh*KrWfg1Uyzr=y%Mi0Rs3t%VeBMq*sB3Za05QBBfzfp7c114 z65P0O==(fG+11-(_tmnN(jFol+mvrR*hrnx3d|ET%!W}*L4qqXeG~A3IzP_&9}tAK ztOXJ_V0j0v!}Vrib#&18U^-soItZq*LScFV(`g_{g@ih>?7nHgezTMf$d(NZiYQM+ zH3%|)MR~xKzmp>z+7w75Olq3RWv|pRA=^ zVHTLH5F4GNs_NzgTGGVOx(sXx&a16#hK>jCMOv0#+Tq!h9UZ)dwy?ZCUa3%3+k~zylsJ_wDsQV+I;}&bX(Qc^=2xKt<0;H zJT*=glo^-OtpexaK|a*-o=Tu_-@PPH8#ZV3+hmRg&5dibE5s}scDryjM~;WAYK>X6 z(+b=#fD@bzAN0nn8_W`s5mnp+K$Hg#A4sjtWUOhEnt7th*{)YEXgeqH46W_mmo;hL zhTga57N)gfw5d|o)k0<1TW>vUTZ_=#H(*a`H&r_YihV!)$!EabOOmXevJCAASxn8* zDfuYALSKEpmTtI$J*82e%`xq&hyc)3rJ4d871>xgFga^pwG@Rq5~V7QnThJm5`Vs4 zUB8sormn}AuG6w3mcI~jo_t+mBxfilaPcCQPUB%D5*9t~P{;14jNeRPpqx8czyTLx zM0Y+{JQ@xbZw-S(z}MQEXv)xE_CCiqOD5f};G)?}G+HIojJi61b}|B5EAwT3k%=S- znLf8xvRrqE5j1F2=RE%&4}I3SReyH!l`rXG>|QW5`_$Q?Me~$h<@?!AnAk=f?6uy( zeZ5A>g$Il;+ZQ_-AY%>OrZO}-E2-0lrO5i4gr6ZcjX)AZ^Sy31v!2g%Ps>{k6_S;%>!+FdQBN1t9I7mB#00Xlsecf zbxBn0o9nfz5p&ivn6VjqB0zkt>GKE9&Tv7cB2Dej)ra*g`o#!Hf< zSJ&rfse5GUtwTQ#<+`ZY+mtKAZwh)4a(dgu*?CiQ$XVJ(Zd;bg*)9C=FH%Gc(QM)Gc ze(mD5v5MHxuLDuLbLLEWBx&f48Cg}~*GQ-Lpt8c>e+IpMCU<4^J`Z;avVpV40(REX z>SEea)iGUc!Ewg8R6?v&Z-zU8i({g`dMMNESg+o7GMc6Rz;bNBSD!20dlgI2dXywE zNwFsB!rxM>w2Y1+5s3R0xxA@Lq$9V(cx+wmzEsoxFs@I!m~&=!Qq!i1$8>_-I$aT5 zz+Wv)8}kT<{~NQqGKT|4>d>`7RbH=!_W8zCnNiWA$PiG;JlPW3c~nQkJi4Rhqaud- z#VXtE!y6Opmb1TBSTtRR&76qb9N4Hr`9Om7##We*0cQbcg(6JY4(QRM*`#&UQSD7zl1wC0 z_{L-JR5TDaPm}>HD3RGTUQ4=~0Ww zn@!izqftnW4(l3xPb(q&Nf)M5YdYg6i01p-C>|CeY@qoh5xYW-DE0*AF{*kbc+;_P#nX1ID&6UkD%uOLHESj#zF%~f=atgtI#Ov_sbP}i@1ANc6R*p`{&tBpxg$W>NNqU z^F`{N>#Q9(RSSCSzb>Q@bc3K{Hyy^s)^l)r^?4uOprRlUuiK$DhaZOW{dp+<3O1be zVSs+MMfZHLv%48Bnb*G%c|+a%5%{xW=i;m$;z|XEEdxM8+koiYvML65w$3!PZePrN)wn(>b1db#I6r;^nMu`i@*Qs)uFYG-rd?y zwf*YRrPvrW(wi<^Nv`*?r-_fx{KtRBVCRkM~^cGT1@<8 zQt!v5LshEdgdfYwL{GSDY=biq~kfge#Eutt^m+G-A+8OriH|%(Du>NQmYT&$|a`spk z(XL<<=M^Rc5S_|)6-uQPl^$dYw%khAaeT+YKIsig)Jcz!Zxg2;9fmPIu}V28xa~KO zZyPaLwX`}vFd3bMf(p3I-5YO|VdH)t07~~JyVh@THgDmV+9Bu-AWmPC2zjJ5@xE>n ztSi8WL40`@ve`;TB~P+ZrkD;jrkc1(B&uQEB^ZD#BB%iVf(x{fs(d_m>_I%hbR`#H zsOM?OR=~sWJvP0P&2Yi+D3Le|#e*1{&Rk0d&4M;}D=1?W3gHx_J_5uJ$a|j9HY^A& z34%#oZNZ~s{9;guXJ7$g9ad$^!>%m@7kL~a6BHOwGjD07vq=4j37{C!V$-~GG!N+m z>gSD1HReQah}jXP;W=CnJRB0y&N*k&sJ|omx`1+-apuz2YQ6FfL=fZvUF^EfzdbbZf83#I3!Czw}{PYnWo*5U}9=0aotI!#`YLR zXk_}pcDLu9h~k*3Umc{R4?gUzz8|~m6JN_H*&s%gCb~YhFG9cPb>a9vy!NQtv{UW) zejL?r_`FTSC>d|oSL422?M~I(@_gKcf_;6A?ha&Vmo+4qa(0OP>INOc4jk+6#vSex zWS(X~3PCJWQ)HjhMo~ApK$^NYRcmK$;CY$shqC!a2WO)ei6`=>nmpL01(Ier_qcin zRI#*bV?`b6fcPN_&4BSL;D9L2QdaAu%OLsgH50Y9nGhB819}ivC=ov75jPLPPkxsS zg^_B{SyZj-T!ChC3&Ue4@$X+NtkU7NbLoE?Z!5rUTR)jxpjbHW8+1uVTM;RNn9w8# zsoS(i4nhvfMA?rH4_T@S(-6aw_BLbDAPaF2MdsV^6*x_;!XZkom7{sYF`jx_A*_hy z9u5V!hp^KUx;~X4Zm~HZOC^*Xok(l3_c6P4ngX-1R`4OXeN|DG2DflfBD!{NriAy&`*}lX&7s4SRqr>~e^7`|T`u zK_qq=1mQx#(FVdOlt+yjNk|FXZZSNxqdf`@(qd%X<}qSfULSZdUXck=5Q8bUM4|(P zDpdXHZYAsHTW($B{;dLpS;f6uEOm7fZ3YM?Bh*;13x%09qnh&Ka_|g9xp6mg;asFe z#580=*7PXh1Ia8*?{jg`vIjRJOjrOqM8gIn=uAzf`!}N?p!h+tl@2qpu}5o==A($6 z<7pP=6-6;kVliX;DB|s+DNgCcB4`u&X=hH=XsTM%L$n5q`3#(E`{nBpyVU^w%rCs9 zn#d;l)7M@}8P~%G*{q9M$&JSffz7OLfs0;p=c2Qyro^#P<3EB(L{$;l(RFC2V)Wn5GYoR z!!y#|bLk9Fr@jbxH{OlB=20x6oH=F36Aij^zN@l);YN~f6F&zJ%z#bjp2(sHch2oB zC;d)kt@GeUhnP53O;Is>D_I>dHdA_;UcFplNd2vxRn=#%$WEI78480HnI|L5_T?2I zFJ|#pC=3sN!Way;K$0F4hVQ_NKA}k67~#FraFz-| z%joGxrs!8yRTRkvg&#wyOTE16UUpzc7rk$0qlrxSacy?wXHp-506b|zfj#=P*s%Jm^u2-#Sh-xx$?!S#p z*U#B#CRI}0jfq36on%;nC9Aw$U~|&@*OwTqpw=8@Jne6%`OALaK*K(*nHIVfk6r!Q z18^fT8)Qq;V@o@7$%1AU=oVG7>4tz+^Oa}A_hqcuJGYiTrwEL%$GN9WyoOl>MZTb% z+C*#vJdEAXG8c`(PC4Tn{@wCW4T2PbpoBmeyO23nOhB}VRDj4;UOqT_Y2u`Tb%i+o zyrsg{`G{tT5NrVo@A%9x5pAf@q0ixN#X~cg`%b}v;n3Jhp)Mah!TJf8I;VFj#?hhAZy_2Z$`{PqZF381 z_mTr~0Nh2v?_+E6IZDPcI9T1%_fZ*qM|sCBEvk5=jYT2iUd$mwws=QUEW4m@>k@%M z=H`m7BWTogr`EU0(Wv%Y=uU(fuBOwdKeCJSTi&ZVge;F|nHv|3<2!gFf$0b_ZCTAES$ki>S|7=R|*M#ZvKUc7s{wj%`+?3juGi(C7yq23% zsN<5ydRwPYJJL>dV%(at*I~75Oh_3B;*Wfqt%`=|+i=~OqjYNjRyep3woGtH9q%?( zMPf!f1^Gj}5UlM>SI>4IGyUa)Kzw>GYa7_g{Y3*g$G3sZBaKmt5yub=^j)yq(Z$9` z)!M}*b$GMEIsc?Lm6s}*OavH7;odJy0`8}tp~UL)5y$W(5Hd165_RfaBSqAixLfVP z9~$GuGgeL+A^Gy@p-XFPTH+I?5_5FQ<@wCMwU2Xig9|h+hpPs;fiaBmEX}S#z z06>Q~0KgxL;7{Ao(aGJ)_)j5k&(c<1;XnzwFs*!o)oD#{&G8Z(;kczrZvxu~*kf{P zQLzd>)YC-wg*&Xq^=7ZFrykT)X*CbadQ+P&SDkLcerev&jc0Q!QXhBo;92%3hAf&Q!9unPj$bL}Vz_gm7Vk+6_YQG_uJDxE}(F3D-gWc2-Fw zd7MDl=sH4Ee+m6AIB3 zlYfbJPWQF0dreH9qY&4tlxaa^gqF|fIm6AAm%@klo_QSD2xEL`WL8YoQlg1Ozn%ai z3uc&h;%>k2_|Vf~GOCs>?7+tpV`}8y`IB(ECPAN;)q$f5@b@D|@n3|$7R^*~SU<>J zcoQDIoa~gW(MKGZn)->nE1IU94h9RoRa=-ajPDhN% z9(V5<#D!(M%A>qqJJT1NSD{;Uz560JLZvI;x^MY~vE(gEnl5m8C|@%`BtNutyvQk`2UUikzJJdMk&}V+!aLZC~`wAQC%g zit6eJ{E!>#;*t~>DAXXpOWvSadfudX^+mSYU~O{m~41)>LE>{@qgT8^2-lG#+(AX=rCFUd*~0Qxq4guJA1bSp^3Zc|GWBqJB2TVK(sJ7*`=r zBy^~7$%1NLg=n6NP$lerIh&T{VI(gWE;mOmO))1WqPYujX;~4YZx5}6xlA%{WyNeT zpPH#HdYbzkv;U3Yxl zq8|@m%ClHTM~*g_uy|(IuDeIla&3)s$9c;NtHSR?F*~KqHbZFP6VnYmV&4`7jWJuc zlB_qqlwGhAxJ>6IOUAi$=PKPgPdK@r7`bq6tW*ZxF>1beSoT03RzkRIk(i&?4}>4o z_J$v{b>g%|Zo9J)7rXfyQC*XS1UxAS^mzTs(d%TAqpSV`-6dEIis_Rf1H~(MS7jjX#r2irjYyP-?4qZ9$Jy0^t>0PVoa-kFUNnAW-{kb z0GSZGKZbZBE{gft2caO{Hu5O-ju%k;Okx8o<{r&)-?BK*rc1y(S=yW@o;=~;&PFJ) zo$4riFh7qd!&&A+a)sv2m=UruVa~v{)EOZzcEA;FW>VV9tztBn00J@g%gau_X5rVA z6~cxr4%NGq8$8^B`=eptZ?wN#e?Kj|mY8eeXSG8>|84-)EeF zs~0e%hIX>!E>lTY2p24mM0U+5#N0+7xCxUoFynAJ2zV1tOB)F@UGBaslb9WO6>E2x zA+LHYRz)|2Tb%@aK9=YwZ4yB5F@u!I@J=l5yrd1{#MsAW1=N0eIV-9zLMc6+Go~a5 zzN0y%(ak>w4Q}j0ElSrccVEkQpHF>u>Xbgd`)G&lDW}imBsngAT&ox+);1enYz;&o za-T24cYxt><}HXB!HB|$yGUHr{`wpiTY^8Ff*c2LnSvbH5urr8V9?+XA2DOrL)H_$ z)%m&zZAOe3-}te=JRu z=Wj`n#|N=i`sdIbub2}nMdTnl@<7`sL@N@K{2yEU=MVj{AA$eeVwq$(P$cAzy-4sC zjYu#OYQ6yE|LpA_kUt(7D8OAA{%7|>svk_K4A!hW7dsOk8W$%QzDL7I$DVIs8_u)( zzDmjzoaG<1C_MJ>NDc2?S8{upZ+KQ1j8!u7nlzmYt;Yipv&f^iJLemKb4Nh9V@5vo zxm9Uj9_2U0>}2*z%10Im`Qu$@=Vngg^yb`WnV;tgdzjp2nGY#+Rhp~59f1S8!Z0>& zdP}-3m}x_WO0P1DEPT<2a*Y~o; zR`IBj?X+fJa#VD(=lh}&jctV*T-BJuxA|4#y+o2mHMk1G^^!jD9P=wM;P(}{>Ezxc`~ zwGlnF$bP4zSZgcT5h%wPhnpP@Gsg7I`1$YKgW&{hwSV9Yxv_W=B+jDJ-NA|f1kUCCV zdH4?&i92h;Hx1Rdj*zk+ugMOm)2Z0TDg$S;3Z5$}-LNJ#%PIo$+2$25evdm8QNViU zIzB~`7#(m?2rq+7(YD{-S#%e>FlN+qAI>jI!RV|`zaN`IXzVaDXQ=_UjrAVJti1_! zX?L$4=ru-TF>0o3t~oI_6nfro)r<^`d&uer#<=(P>IqD9 zwWQrPvVzy8Vw$huD6coGEV0$9CXGZ+Nue~#7Z0eY=RX(eDr5jzT8~n#=Ci=&(T=>h z%w{PT(L`C-k(|JE72t%~&y_UMTyPDOZShLT zICY$t2{zm_$I0y3;jPqCd!+kzEpM*yc0RSq=}l#rCuHpoRvLD32dPjWV$&X=WGxt8 zA8#<{m7!7bU8YMq>iDdnyr^`;5s|Sqh7_zAnm078eYoOPIrDkZdHriC~*;@3G@8CXh zeRex7?&{kY4H4VBd78)L=km=3saZ+xdT}gxC8e{u7^nEQmjySso>_-E4Z5rn4kW9& zSxJws>xXgTti**eiPUd_Iw<# zjUz`0b+9RD6zAjz~2XNj4f_HUDy9~YON8-7%)C#S2>@v zpJmwpaB59H8;O+k4Xlj+2wwe6*0x=yLkhVdJ>yktwcQE2lvmQIL@KbhriGlTlD6yC zuo7(o+S|BTgxI5O2&&YCBg0y$J{zz&`fNToyvgvThHR1Y z*-QQ1^MAjDqv9~z=byFy4X z=!{oh*t&52rwS1yV*Ta%Oo{1cV}Icx4wK`u0&!Tjjv6@)dQ-+syr zzQLTYmMk8%-}|$_edz~`Cp9+$1iI_;7R~n|P6$8YA`wWh9X@hPni3RIOpoPawxxdH zA5Y_daN-9}15{|%h)*Xq(;kULFUH`WBKBC9YVVrNvB)K2z0RuVY^r$^|M;mM*t6lN z!nWw5f~#rDd~u%@T)pn9lI!@R{uv?Ll!-tfe^8z{1{7zzX=l>Ts#k-{sX}dk)PVu6 zdB0|69e}(Ep6RP!%UKr$uBC!bG3SBMgs)Mr29gQWdDRqqtBvY(Jt7xPw?{0SDLGR-2!Z9d;sKJxdWTkud4Bzw)F zl~}e4%4KG@Sy?pCjMqWDrgBE3D8h*$?AUL^PWD{JN~i=KMj8t;xgTw8E6^IVCbv?i z?h=WDH&e)!vX8(X*zBO1J>e22lo}nQ-us*imM>^|aIvDCgK#!EUEa`*h^*pE1zrnm zMD$L-mep%n!fv3^&(Wrf&gd+BrKD+XZ^vx^s}Aal!|;>-)InySItczV;ry9pmUFPR zbEGx2b@)?|K3jkOFU$P->Vo1oB>L!(LN7oza(6qWr)x_K&+LY6l;A4J)`M@Ype)~G ze>!_(eeXxDuhcwn+T7cE$ck~4iI-`vgJjXmnxqh9A|M0kcP5`@5S-}eY8UdqkxHtV zhGdxa6P$T{rP?FeTJFuC1Fb;a445y_>Xi;rS zgkUE%1T1-3VU)ckgO=X&&1EF@D;3 zdTDTX$*b!3K)G|!#|5-dCxzH~H)pF=sB53?ovt|F{~DsKnW!^x_?#L3(#bj%^H&2!V zn9`Q5nehr&rh1lD??#fBpKy)!BVH`j*U*(t5-T2Q7sH{yth4)x{^*9(+6Rk#!tQGK zleWVVoJM1eudz>KC4T}jlxJBCXDe(fl-U!YMCg%YR8`j4Uj7w>Vr`%*Y~OcDnX6nv z;sZD8+23#aTwUT&cZ2${*OPz~ilAvLB=9~honGot3c^w&_k&2PRCBlf1f3Za98=zK z_val*dut9j;*@HQg%BLW6y%fFS1aJHb6ma)@>kL?H~1U0%}RI2WJWF zhwTipvkyNODc0W!#0Rg`H{^p_g$WDagMk47#@rJ0I9)SYS}GND`eLrV-@h&F)@PXW zADHTsMjOEThWLKk7XN8=s8_F(gn#lW>F4YpR>!~TO1eKdHA+F!784(?^FbBw+)}Mt zp|PAfE}f!Sq|!(<%7c)uw$xP}*wFU%0&20y{zTAb)C+chZmshx_fjCNNduI|1RJs5 zTuGER?cvUG=d+MFpLye{C=`^3AD?Z1s7$L$6pqj1l)osDzYrm&#vY1O;GxDqz;ZWU z9~FZYu&xNNSY)m)Bk7z^SKd@W?7T^L6?H#@r|4^XHV=2U^qB6AkzG>nt#rJ25FW1B_>mM9588Th2*8}=mWkZ|71m`wTq2{+7;M29u`UnrxRj&4&U##w0Mz7-~mUTeAzM)xopu3VMS*(4ZBX~X z#6svnshCc~56Pr7Q@?+Axsl&% zhJGjUd(QYT5@GoNB=PqQ^6&89b5Vc6?TG&c|DVj%@8I9PrN6*XjQ<4x<~#jP;dig$ zFABm;|D^D5KE&_%f47zXLVxDaS%1?8e<*|B;s1Wj{T+_T@i+KC553>fzbl`=@NHaw fL;qp6{i%xNBtbse3jhH6^AGToL!Ej4c>4bUuf(kP literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index c91488efb93b..b06f90fe9622 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -425,6 +425,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle, "tdf98000_changePageStyle CPPUNIT_ASSERT_MESSAGE("Different page1/page2 styles", sPageOneStyle != sPageTwoStyle); } +DECLARE_OOXMLEXPORT_TEST(testTdf138739, "tdf138739.docx") +{ + uno::Reference xParaProps(getParagraph(1), uno::UNO_QUERY); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Font type name does not match!", OUString("Comic Sans MS"), + xParaProps->getPropertyValue("CharFontName").get()); +} + DECLARE_OOXMLEXPORT_TEST(testTdf135216_evenOddFooter, "tdf135216_evenOddFooter.odt") { uno::Reference xModel(mxComponent, uno::UNO_QUERY); diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index cbf1384bd27c..0e2aa715cbd8 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -83,23 +83,8 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape, bool bCopyText) pShape->GetDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY); uno::Reference xTextContentAppend(xTextDocument->getText(), uno::UNO_QUERY); - try - { - SdrObject* pSourceSDRShape = pShape->FindRealSdrObject(); - uno::Reference XSourceShape(pSourceSDRShape->getUnoShape(), - uno::UNO_QUERY_THROW); - xTextContentAppend->insertTextContentWithProperties( - xTextFrame, uno::Sequence(), XSourceShape->getAnchor()); - } - catch (uno::Exception&) - { - // Before the textframe was appended now it is inserted to the begin of the doc in order - // to prevent crash when someone removes the para where the textframe anchored: - uno::Reference xCursor = xTextDocument->getText()->createTextCursor(); - xCursor->gotoStart(false); - xTextContentAppend->insertTextContentWithProperties( - xTextFrame, uno::Sequence(), xCursor->getStart()); - } + xTextContentAppend->appendTextContent(xTextFrame, uno::Sequence()); + // Link FLY and DRAW formats, so it becomes a text box (needed for syncProperty calls). uno::Reference xRealTextFrame(xTextFrame, uno::UNO_QUERY); auto pTextFrame = dynamic_cast(xRealTextFrame.get());