|
 |
a977ad |
From 2a34d8f44d3f45af7bf2394a93817a6ede75baba Mon Sep 17 00:00:00 2001
|
|
|
a977ad |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
a977ad |
Date: Fri, 6 Mar 2020 10:11:48 +0000
|
|
|
a977ad |
Subject: [PATCH] rhbz#1810732 crash/assert inserting document with initial
|
|
|
a977ad |
graphic
|
|
|
a977ad |
|
|
|
a977ad |
Change-Id: Idae665c926856922a25a1228ed34f3cae96e4bdd
|
|
|
a977ad |
---
|
|
|
a977ad |
sw/qa/extras/uiwriter/data/rhbz1810732.docx | Bin 0 -> 12107 bytes
|
|
|
a977ad |
sw/qa/extras/uiwriter/uiwriter.cxx | 21 ++++++++++++++++++
|
|
|
a977ad |
writerfilter/source/dmapper/DomainMapper.cxx | 4 +++-
|
|
|
a977ad |
.../source/dmapper/DomainMapper_Impl.cxx | 4 ++++
|
|
|
a977ad |
.../source/dmapper/DomainMapper_Impl.hxx | 1 +
|
|
|
a977ad |
5 files changed, 29 insertions(+), 1 deletion(-)
|
|
|
a977ad |
create mode 100644 sw/qa/extras/uiwriter/data/rhbz1810732.docx
|
|
|
a977ad |
|
|
|
a977ad |
diff --git a/sw/qa/extras/uiwriter/data/rhbz1810732.docx b/sw/qa/extras/uiwriter/data/rhbz1810732.docx
|
|
|
a977ad |
new file mode 100644
|
|
|
a977ad |
index 0000000000000000000000000000000000000000..2bf1d574d4911c4d042b56ae0333d3d088c5cb12
|
|
|
a977ad |
GIT binary patch
|
|
|
a977ad |
literal 12107
|
|
|
a977ad |
zcmaia19+Xy)^=>$XwcY3<D_Y9n>)5`HnwfEu^Y8fW81dB
|
|
|
a977ad |
z&&;!C*0W~a_sB|sf}sIHK|ujQ_!!9o{bsOlpLOhvEbQs&-rp-GyT5=kB0;RVXX&T7
|
|
|
a977ad |
zJ2xr`8`ialjHi9}^obrlfk>15T&TXfA`8
|
|
|
a977ad |
zr+3(sz2<mZ-xe&@WU6CYRUmw^r(ZcNJqRNjbLW%%<Foc|DoLQ-l>LSJFe5xxgX
|
|
|
a977ad |
zdJEu$;rYnNYEsRz!mqx8y4Wcz=4CcAQ&@u*2mYh_fMR1D$8dpWk*~0?(WU0VeSEP5
|
|
|
a977ad |
z^P184!zs~;yUAY6k8Xu%2|6wqa0#c(e1mk<WlaS`1hu)>3*n+sy#1The89%yW%p1n
|
|
|
a977ad |
zZ`4?-NO)Y
|
|
|
a977ad |
zXt&4#=eb(7cE+1?MCz1VvOG^NwU}a+CSL1VL^-?>&_o6pd3p59C)J4^GG5T)J%d<7
|
|
|
a977ad |
z0`fKJbnlcysrYu;vxiNPfq`ZFLz3*uF6h;(jrUvMAY>^uRpbtH+crUG*6VpC?co{{
|
|
|
a977ad |
zmbp$Uwl=4h+l-CKb12Fvw)KHcPXv{e7VJPPv@?cPP#Thj_-7LbGn!eVvPcD%t{GZ!
|
|
|
a977ad |
zwr`9U1
|
|
|
a977ad |
zI5yxgZfMz6zBan65OCSW1#%0&!r9quqAl&!CdmR>E8?y5vi!QhU%0p(|HN5W%bTii
|
|
|
a977ad |
z9jYvMTVKm)fT8U`oDa2#cK5Sn;{MdtF}+TwH~czJ_1>r?G7lD-7l@z2EqHevf(_o8
|
|
|
a977ad |
zP6|<vn$v8AHG$c~dSL>cTy8Bl{b)y;5Q6_j0pf%O{%K(kC?OM}3Kz68+x=zi3kO0J
|
|
|
a977ad |
zJbmWLVJTQ*V}2^@Kn}QdKxMXEwl8C80Adug=GJtu-ZgrD-eq0x;>u~GHU;&4#<{o(
|
|
|
a977ad |
z&P`ugTfRmejLsEn5|f?+rPL$-o}hdhf*oJwy$M~SlusUWIu9<<1Ua$g=I7W!9D03N
|
|
|
a977ad |
zZ-NNx3_0e}2u;dJ_l#4=W7p)UB9&bcV9rIpqbBTKpzH6*r3GK<@Ed+Go(&m#aDH=v
|
|
|
a977ad |
zzZ0unOS>Zv5x|Sv-!gM^@
|
|
|
a977ad |
zhoS`5`&j|J0UaHX!h=yxt@!|Z6a!_Bcn|~;rY!x0S&p0$>~z6KKi6~(ipDa;on@Am
|
|
|
a977ad |
zn6^;D0lFavKb|~AoYQX
|
|
|
a977ad |
z(L(d~hB{X~SB
|
|
|
a977ad |
zcvc|1tZj9-Lg-P3bV^{!c)a=EsFA>u#(n(3vrk*uKsUGFW|;j+rEx+6;jZG6_b^hu
|
|
|
a977ad |
z1m+b!aC8fjSGRE>#bJJnAWc0C_9U
|
|
|
a977ad |
z5dXSs
|
|
|
a977ad |
zI9eK6IlKqwvF5Vf1_wsRYLV={S!38hC)Ogjp&8fymBX}!4AszR|B@uM285->2=xfk
|
|
|
a977ad |
zjv1kTmQ9vnlp!w2e!lMj9FiR}jRY50=jz1y>Mb8nA#^H|wrnCiOP#rCh#_&fDI1Py
|
|
|
a977ad |
z=Za3}C5s|dx(J6JHnu6VyeXgN)A1t!sis;|oE%AZFw6(OKGsA4`Kx$XxHBa@C$%cg
|
|
|
a977ad |
zN+1oqD&AD|FFti%f5iG4B-iZ2>wLNqaR^VwO-hXMEt2+BJEf`ujiB{|bW&BI&i>>b
|
|
|
a977ad |
z5h2Tqg@-s6z<|`On&Yrbygf#2E|5sRc!O0KfbF9JjyV*~{;0{;VL6^Hk7w-`6N!q_
|
|
|
a977ad |
zuAlyS#8!GFUA3IKj2y6AVU6IaRfK(QHroT686hY2Wso{fC5dI&y-
|
|
|
a977ad |
zWjCf|%Fia-hSIv@J@HrZ-nA(T13W}jC@`V`Qs)KmzMg0i=KHiVZ+6Y+rBF4&ahBvY
|
|
|
a977ad |
z!|df+fX>wR{fF
|
|
|
a977ad |
zy}YhyiG}o1?ahTzq=L;9ArywerWE^;992VG4a4Q_!xm#K5kSimU`Xbn^B6Ns+=T`X
|
|
|
a977ad |
z@SFEsYfyaTx@B;%c0)|SUHQ`5U$I>fTF74MC_f^lA!QHq9%Kjg@^q
|
|
|
a977ad |
z;rLVreNYc^2e>(2d3jwiU!{Jv{Pkl|q%Iqf8I7x4TmubD_*oHu1Dm?P=qQ#nG&eFX
|
|
|
a977ad |
zK*}39kc>m+Bh_7cbQTnTWIul$YyVvO2RFq4<4EcqfuAr`z_&&BOXfc(eKBhDC7CO*
|
|
|
a977ad |
zFD3B&F|{}{kFOI}GBYhx(R0XZJ1e4pFn%ZbdU;M|RJMy%h591(1IT{356zFL(1ass
|
|
|
a977ad |
zc}f=QB3Zc;Ikb-vx<A-VHx~@!pfil0MH7k-T>6vHNtt@|wG~Hh%%owE0+bFX0%VvT
|
|
|
a977ad |
z&J2TpQ
|
|
|
a977ad |
zX3;L
|
|
|
a977ad |
zX&os~fNE^}rzu(QF_VL7MNi@yu2>G)n07KotQ%W8JGd$3F(s=@3sRr1C(SR!Vv4%8
|
|
|
a977ad |
z+4P7;v9esVyN%;X5zqBn-yFd)U_5rPa>rsseSfm{-691e!ejzeiIqI7e^q!RH{QTz
|
|
|
a977ad |
znQx<YPN#2_Gr5g{NsosEssqt=e$u$Bn$V&q<EHAOPP(tGY9^*jMDWGpe=T$3NII>W
|
|
|
a977ad |
zD6$ZQAuh|*;@+wg@jOGDU1%4p{5J09RaYY8RYxqz(C41cn_X?2!(eDczOd@j!`5`z
|
|
|
a977ad |
zWCaI1Q`7p@9j>wZAUh;vVgGmp&FOpfQ{}8RFCACmy2GQG9*jmR2&REBGs}S5uSTnv
|
|
|
a977ad |
z+pO1259l2{8R(rB9pbj{D5G3Sy1OVxntts8>0hTEM@dRLwdV_)stZ>Sui(oTUj_B~
|
|
|
a977ad |
zYDOm)U5$a$Ey(IPDo?G`)!d@@7Y1o=aDUM7es>y6*;Zs43Drw+=TSB8B|ny}9_2Kc
|
|
|
a977ad |
z#~%4gFtX74#Yz=_thS}Hy?;6hqbg40aXHAF9ORjTeYKdvH8URkf$jrRwc=Cz^>Xv#
|
|
|
a977ad |
zc{+Oy?kS-ZM4e?XS2ElTw@I}<1os1+lfLQ>K4RjxOiu>Yoy?k}2qUp5BifUJ
|
|
|
a977ad |
zD^^P@rwY_f`9vOq2(PXQh*2mE(H+GY(Yh2MI)KNHGw0{8fCsIyWk=78Y3^}ISA!Sl
|
|
|
a977ad |
zUbyj$F3rK
|
|
|
a977ad |
zEI-Td7o8V^Ly1UBm&;Pt#*2*xSG!1X3DxC%&VfBEL)kWkIG35~pYmc(G0+0*ko&|N
|
|
|
a977ad |
zUe!~ps!-;@CJQ{_##HCNGj$-(Fq0FjROzBi8Et^qE;uzug8m$)nbZ+H^Xxt#jn=2m
|
|
|
a977ad |
zLz_(X_8Bk?^MNv4tDIs)7w(WBO#uNRjxxCj942P~;Q_1pBJdKU|0#FAHK6Z<53M*|
|
|
|
a977ad |
zDzo3V?^N(jyr@2&s!x^|VyXc+nlIp5QG+WMP@K%KpV*6o9T23rENn#E=NAIC#%5$B
|
|
|
a977ad |
z&=U}Z7?xvJK1r*pabXExuLq)U7BbYtF0zRqmyH58Jvr@P2(L@&p6kt+IxR?rJET&c
|
|
|
a977ad |
zC+nvPr<*IO1~`@tJ3ELer=Q7wY=6FFtE9#I2ryYy5w@Ev^;wOBf;ZX2*)R<+BeA5)
|
|
|
a977ad |
zZ(8+xorSw1=Ew#IJY#z_tuk5`y{)N)&dtCl>DBYr8;q!m)Dy33ZxI--SeK{SHsFa9
|
|
|
a977ad |
z6v&eE#rFGFa4S<6tzLjT@#4N};c`Po@9ax3jlRM?*M@yYx_SoSq~)iBROjr^f={bV
|
|
|
a977ad |
z>=n%Lt-DQjC1ZRkAMEp5kgfnP{Y`9(bOd8buPf?i*0xzotEc{vrOC@Ru~GFw%U3IB
|
|
|
a977ad |
zCEJdNrWbBwb63y4H<K-Z^veg%sw^9A>#jPWbt(!xR6Jw^L1gJ#S$$JSDUJ_}bg01H
|
|
|
a977ad |
zsDp!RS-B6C&&iB6D*+DzALf_&?IGx#{l)SRhQyq`1*7WQ_DAT6LAWo1{7u|{_;~9h
|
|
|
a977ad |
zm~1=R?iVKF^&DD%Q>qB_-kz&Q1LZin-q!0k_VgMIh$b?0&9wOX<^1Z=|9;OtWkp4E
|
|
|
a977ad |
zpd>msfTdrYgkHv)12qzgQ93Nu8+cMv4jU0jLCU-5G+2p!ZCFe?Zx;u|*HqN17^
|
|
|
a977ad |
z`Xh2L<Bl^Yf?m48omB=LF8BVAV9e|O+0XPZi0`EU4@>9~0~8R@q~d?uZv3khFg4OM
|
|
|
a977ad |
z{6{IUtg>je$bs}$3J~43g_17XqU6}caHSRUPe9l<p0bFj2~)^R$R|GE;>Xr{0FXG^
|
|
|
a977ad |
z!HypUHjH*`T!QfMJ6&5#!PJ>7n`5!1r41sI^Qm_2V%EJ0t)%G~m=Xump~%#NW=GeW
|
|
|
a977ad |
z;yPFA0V(ESKPU64dLt7{a>&X;I7>LDhl_hMWt9p_DL9OlVVw!MdJ7sHaYQnvN=j1#
|
|
|
a977ad |
zz6tJ!sqP(!plMd3TT+o*vV?5f=BE&02(pq@{eZB%UwRn%VsW%!plq4&)4YO$8G@r&
|
|
|
a977ad |
zSheYc<_&|mM_&-W^r;+Son57PYu%O?(X5_bxM_#)Q7=az1J?}?%o^D_@Jcx;>tZgg
|
|
|
a977ad |
z7u<2XvQ)c3*&btSMTnP$*>_cV>
|
|
|
a977ad |
zh_-TjQJWzeyq5s4sq+oG#ZpPahIiTx&|jCDou(#kmQxOkcDTY{DX-Q7$1Tl
|
|
|
a977ad |
z%z>+T&mbFXKb_&v4vprP8Bbu1kTIL8v!y0_=V6nX&vtGLW~0WF_8PKaafv;)p0Rjn
|
|
|
a977ad |
zWv(C#kQ$jPGa1YMq*?dd?nEc?CcoNC+Of4s{!Z;5vMjM!Mq`JDZc-)D&k!2xTegwZ
|
|
|
a977ad |
znHuF)5S|pr
|
|
|
a977ad |
zSW@d^NAMib_jn`htd4|&Hpks&n?CheFyRbn-Fhvuwv~dnDhw>bh!Cm~q#9P>JPJss
|
|
|
a977ad |
zAQ7ZN
|
|
|
a977ad |
z!%Z6#(M!&N`;;cm3ukeRVATR_f_OawY$nB`W-6Z)++}j!f7z_l28xF`2$fqMdEUQ$
|
|
|
a977ad |
z=iw5B9JoyCfB7RwRgS^z6*{QLdiJ5{X6)YSkQVF$TG)ASJ8T8eXP*QaL0ZBe!XXs<
|
|
|
a977ad |
z;KO;Wh;WZkvOj%{@Qbwuj5YNYE_B}y^4RELJUc6qnPXXQ58HcOyoJhPd&S4a1}tQ=
|
|
|
a977ad |
z{v!+aci-_#->k^S$_BO@UIlc!NH}w%dFxObJ{(+0c5
|
|
|
a977ad |
zSFS5wW@5QRJI)}DGak_+Zy7xw*+f??%t^u=c-W5ZVIkFnO!VkuB^e=LpkRY_8czdg
|
|
|
a977ad |
z#~i{kj=>q(n#Q|IPL=zGUE+gF)MI>~WiO7y9Ire5Ur7nY^q)Eqmb((NP#^Zf@r!b>
|
|
|
a977ad |
zoFd!z_lCYSYH*UgV%lGzzXyCZ(35lBTYZs>@ZSO+<)8J1v9*<hqMp8m(R+c>9y=o4
|
|
|
a977ad |
z%YY<u>k+uk>$m_eC^rS;tC~Y+dhZj;4G_H`xkwIp;k8=$0_CSD`zzy^+kT9PN5@N*
|
|
|
a977ad |
zL>*3Y1>KHoD4)ORIdQ2n+B$7_(VddRZ_)1@0rs0%;z<9Gwh`*n58?4A9H%g9-{-cz
|
|
|
a977ad |
z)KpG@$awhE0TK`~^jm^54m{@Ay3GxxPiBhM5|=4qx3-4JHT5^k!dO1JK3h%n=ZW)!
|
|
|
a977ad |
zGCFp#veIA{9SA3JSC{O;s~OhxNVmDcRw9nGf(-~s!WKrWkt=0ECXT*5;XIsan^GJ+
|
|
|
a977ad |
zJgo>4QNR<BItD!ZRNgjT8Ar3?rd>x12Fdwb+KP?73b)IK<`6cj8f2Fi`GuC{XL@#w
|
|
|
a977ad |
zX}~M7;k!dc=@!GWa0E^0;T9|0II4D9J3IWEJ@(to*(NCa=277NU{M50|LL!)j<0N9
|
|
|
a977ad |
zi47PCC<W}lc^&VcUjJWS>i632e>ti+DYG~K2i|f9CVSFy1B9Rw>nH;)!rg(C2wr71
|
|
|
a977ad |
zP$u(PnxaA!O8FVIOz%ZgZ+S)YF3y-Ek8m>xBQRtQIT?Npv-qEYdHk}L;pR{*yTBI{
|
|
|
a977ad |
zUk^KlJXG78(B_vhyiIqX-X!%jra7>g#9
|
|
|
a977ad |
zM)!Jt!@Est5dlUgl1r+1AK1^GD{9X_&jCNyN6n-g^3LFii>yOzKKrqEtVMOhTK+=A
|
|
|
a977ad |
zfMRFNE#@^nv8p67i(~-Vs-OUgUfdZdw1@7yhD{lb$XsCre-3+Ux6;r4)h5-1rxSlA
|
|
|
a977ad |
z%=hI=uZXI2`sS9Tw
|
|
|
a977ad |
zVSmP9e_$?xwksDbG&0T0GX+9`o#3Rq)%X&>@Zj^eyFmnH30QPnO!qN=|EOiBb0{U`
|
|
|
a977ad |
zErO!Ktu<kAwqq&g*+5}MB`T>k`7s317)4x#mKcykBgwvDe0>B8m`mNA
|
|
|
a977ad |
zNn^|7cIZ89^~k4CMn(G!3g^CD$8vCcayPEESyJw$P6
|
|
|
a977ad |
zhv#p*H8lL2lIg0##p~sM(uLT@m~D91=GwmSSxi}B)va$X4mP6htM2WitKo-dH-9+@
|
|
|
a977ad |
zhwYGd<IO?5Z>#G+I|%)sE6c&u$kK@ZulK(Qy<>G5>qR!S&Qk@XmZq0eE|KLAPDjQP
|
|
|
a977ad |
zQxKtxIb!OCWNh&i(GK#fK{p(_UDZ}|MqO6iaEmbYU3AMuLo<4ZK3;*mUm8V*VwX6E
|
|
|
a977ad |
zTHuGe6A4yNpEoz%Ni%Sp2;AZDk%=j97nQfo<^}tj?n54=7hCxDbO35iR$exsIx2MM
|
|
|
a977ad |
zP#{)1+TSfll&G4usl;&yRkgQ)&-E-u1B21qV2W5!?y&M*$`xso(#Q}MRs}!Zd|qr}
|
|
|
a977ad |
zCs0Vs_Qe1!KLP#dzs2&n`vM|9WkHT`BwGPJ<zwUGpbAZRU6(#ghZ>?+ves&u(8~vl
|
|
|
a977ad |
zuQ$`!6@ko05dD3aN@Ptw0)j!|-tS>uM=+Y$@GD$J$$(%0^DlWp*#e!_=Ej6^%}CZ=
|
|
|
a977ad |
zAGdbxCKYj0b)RZWp=hf4F1Jpl{p1D76L1bO^QI+=*`#jD9}N~~qD4~x3mRW@aT{LT
|
|
|
a977ad |
zB`WsAv}rOMUTCYWyQTRfr!
|
|
|
a977ad |
zy9OFQmI?6XLzSzTLwp)=1}9~?(`)NunpeJnoG3jJ&-_AQYy(^%ts{8we&&o+e_eyQ
|
|
|
a977ad |
z>_w)uN=pXOm5zt?<1);>t)Y>)k9=7?o^BUgA7RBc#`zm6qCk#zg;qUo?{!u^{9ZiH
|
|
|
a977ad |
zkJC(a2C^-WxbL%9y`HXSbvi!VjCh>P>hQikZ(q*pc;9@#9YeuNh{BeQ`s|Q|m*;un
|
|
|
a977ad |
z`wTl**wxFbyJ$#pp_kS{QWM3>5Co?wc}eVCl)Rq&t!N2k2NL8Up?jHFWP;bGUw9(<
|
|
|
a977ad |
z@n%cT_qa8^4gs^Uj=NF?2usrAd$p06M&d|Y)VW*_8sm`3i4=$`#xJB5TFD4r2u>gT
|
|
|
a977ad |
z4b;FEI^?HlBv9CRkfsva<}HIj0{LIvzu@MCzQB@`h*~KilG~ciacB4X
|
|
|
a977ad |
zhoSXZVa^~KGu~owQmu7FeuQx^wCRD-_k^ULWx;bV*VWJW1G9zNEN1^8kJIH}Qhn*m
|
|
|
a977ad |
zjYXA{LVMd+-xZ8cgT~7;=RE&w#AJ0NSPRqL7r5D
|
|
|
a977ad |
zndPXcP8hLVPMkniKK?`aR*MY2^9TKOFZLG6T8X_zf#(EEf4M!}B+I<)Xdw-w(*+v&
|
|
|
a977ad |
z(SF+8k^YbucJ4lm%sY3mnL#7}W(%Yw_>FWN;ZnDB6%B?~eg~YCEViBRh*f7-jD->S
|
|
|
a977ad |
z#grt@hD+k4ckBnfpM{~tb0YdFDQwnl^}GSlAW&j!(LP`*gbLdP%^X0_=+qbogMl;i
|
|
|
a977ad |
z+%U}nm-Fc#b*}x0+x)YU+HI<lR|w)!@=(gOK7|du5e`D8kDA>*@v)6$z169SosG5)
|
|
|
a977ad |
z=9p%hWPVlVS_L&dE;;kc8kp^U_T}u9)gm!$#)kO{z
|
|
|
a977ad |
zwNFZ6{_-UmfMIp>(PX`4(PP014eA`p%Y(8}^K^UBgjLqO9{ChHPxa(ZMYxnG2K%Q*
|
|
|
a977ad |
zBkJPbMob?9=mdg!4pR+-IY*5>taM97Tv570iM@lh0{tWeskdF!mW%Qh({L>YDpW~h
|
|
|
a977ad |
zwF8L&u|GEXPS(t&SssDO5I~duxi@G=J>k~W^eS1JgNXoDgO)5q;On(;pJC)Csz{$N
|
|
|
a977ad |
zH
|
|
|
a977ad |
zEN&!2p+~5A&=@9m@WQtN;
|
|
|
a977ad |
zFRld4uhFAyQ8*;*>kMA8D?f0{v5>?BAwb|-G{|I7c*$~r1qS763Jhw04I3_>N25v|
|
|
|
a977ad |
zVU-Z?5jeJuwsHRa6$*E6c=}gNLo_#iW2j#}kP(?on6YAJ&eW^-@$+HX%}dd0S89+E
|
|
|
a977ad |
zP2?0-QbQ}-!t+4jg4axjrlW{yS>)y15V-2M&))nbMLouSOqvs|4Zy3x!lFVp#jMok
|
|
|
a977ad |
zmn4LK=*~u>np}`(TIwgAn=Z&7MGp04%1kn@ulDr-GcwjI^TzEljQf$-JDRA8)VeM-
|
|
|
a977ad |
zXB)6+&zUcfkjsX_QC+#TOarKehLj&-zkgXfdHSw{1a$@eva|Z0fZYnVYw#g}fU1fA
|
|
|
a977ad |
zTYf?OXMVAFaJ4Y{EB$V3N!c%QptPS>>7HkP{?(+JCrS3xWs@rEBPu7WNk{-qB_+Rv
|
|
|
a977ad |
zY)yNo7jSgEFe{M&`67vlM~Dd09%P#pPc>!N{q}5;(Z+LjNeE}!UH4<-sT{@yh4C%w
|
|
|
a977ad |
z>*MltYs_hAM0E&h`b6lfWZ>&zu=n$Y3vumk0E|qd$;O8527RrC
|
|
|
a977ad |
zRy(Im5@}r0zUN^~(FD~tF}h%?4ta%iE3YZ7_~_H5
|
|
|
a977ad |
zsi7SK4R3Yw0$-!O$rv(m!kIGX$(1m}a~kQ5BQ@uN+r;($Yu-)D6f(Q|TD})Z&Y6(l
|
|
|
a977ad |
zto`)zILYFXD|2;C43&pjbd!`b0{RfBO_vRwSklab8hQx~!j$4f*$=f*AIKAWWF
|
|
|
a977ad |
zS!_PK)4Nwk7@2ew-?&Cv6x}J{DMetXnOe9M6|~U2e58IN8tOZB7><>w(Md#d(n*w4
|
|
|
a977ad |
zKISz#?T}HLki0S4h`U<8$}^j$G6fvRH7s;aIy!k-pELp;Ll04m6uK@AwK{n9_Cn%F
|
|
|
a977ad |
zF}oUUG(ESSJzmeU?37&X_Yp>g_fTpL=xk8rQVoxUSs;sDRe>9=f=4!Pdu#8jQqlx@
|
|
|
a977ad |
z{Mg$4saq^Wj67j2L#$
|
|
|
a977ad |
zcHIYm<ToJA{))Uuin{zj?shG8b(n_ri=DCDT3>Os?{1r%iJ)ig@M}~(keow3I8
|
|
|
a977ad |
zEq?@_C9vRzDJ&AOm<CWVp(XH>dp)?#ZZ`(;#B8?IDksFr22IZ6v43GfWwhrhwfK
|
|
|
a977ad |
z7iCzPib|jxpTK>$MC?`^mZfPxqMcJG;?zD1+~uNO1JMTzpklzm>94$~+f$aWH#rZL
|
|
|
a977ad |
zhY`znvjG7P-Ekp>EBKzn(w5#M?fYQ?jHGRVrj@?i@X<87deakscujFW<5zMFqEg68
|
|
|
a977ad |
zAx`6^tzKVq&4tKU={%Qqni5~wp6o>yFjWDF_Clg~P&lDIb~C~o@9}ugZ3Cg#;K+sG
|
|
|
a977ad |
zXF^sp!tz`HhcB0EJ1ztJtZ#%My=%|ZJy*?8Z}kh@3O`n`tT&4FQJS#6syBqn*3=_b
|
|
|
a977ad |
z5R*M~A0Up)Obj3|dra|zx(vU}HMGHiwY
|
|
|
a977ad |
ze2jIh%O6m*PxF#$6c2rXJ<%e?$EG~P-5Q0feRsqUU*+SJ9h4-<E$eTdiw>q|TW`SH
|
|
|
a977ad |
z_GQ5rN1N`L|MMZa$4ieYJ2A{a3$)zXj8sTqlU436#Tz0Hof|3EMTm&>Ty)Ifh#zVL
|
|
|
a977ad |
zo*$_nSD!eP9ZV3#8Y+Nvh2dL2l68n5@d^^SOdByqri%~_>3I
|
|
|
a977ad |
zNlqC__&iAUx8Luykww~wVS-$Q(0JbdaoK>c`3>>jHWHM08!?if3+SKFxeebBZygG~
|
|
|
a977ad |
z!QVT4hyT{_KZk|{CC~;8mHY1_I%*U`{=dfy6+pBC1Sa=(L;rjCLHySZ0>^by#U_iH
|
|
|
a977ad |
zIJ(DX)hEH09^TfUx~v_f6@~?y<8lFAb^%U(g|`^q8&BQLR!1i-5FyNpJQDhqP4hgU
|
|
|
a977ad |
z)$2KyL*ANhI>olFTC+BOIoGP3borwPpysvuH*K*u%B`)QR~3h*w?s1Wr~E2AiU!lr
|
|
|
a977ad |
zRUBYSij$tSve&zcgC)wp08Nhq<JhB@>Sa$Ma|U?l-z9$5#(!+l%t&3RA1n*=aId40
|
|
|
a977ad |
z(iiQlm}X?D{n@M&KL|y5;L4L{pE>F0&NOCP%I1%${DPWjjLJ0zBN(RLwtQ)pgVJE9
|
|
|
a977ad |
zn~J9O#IMjewqc%bF(n5|LajMC4pYEK6{D1HI%mN|J;sa|!aPC@wR~;)l++Ne)|64^
|
|
|
a977ad |
z+CD59NZiVs@B9$`DTZ`Cy~Oh=sn*ZwPTkO>WH%ikECSnpy*g!i0pK@WebIH_tdvjS
|
|
|
a977ad |
zrZGlzZ@i)efhF6li9vl#$A>&7Ci6P%V);e_+d;}*XQ+|ABV^lv8PE*`p{IQ#e=_|c
|
|
|
a977ad |
zhADOVvnbGyZ7G>m-bj7!@F3aJT6R2mQRIqhm6RIGdwa)%pd2LuzFf(tKs=*VG<;7=
|
|
|
a977ad |
zd^4l$5(BiIgu?+Ht8Fa6jcS^B$Bt0v3rpJuk3E6A_P3KcdukH~C)P*MU_JA0XoeyX
|
|
|
a977ad |
zStSa5!YK~#Mv8a?`-%XP&OvS{%+|&iU~`SupXqYx4w~N%pDdQZ^IDc1wZ0v8AfITe
|
|
|
a977ad |
zmNl4Cvbj~3U#~!!pCIoJW^gi7+7nLc7Y<7q9+Oi^+P3tbek9-(N}-bvfc&D;#0_8T
|
|
|
a977ad |
zAay$x$Mm{)<-{DVn
|
|
|
a977ad |
z$Fq<RisY6w(0g6qa1a!awd*JbK75T*1;cG|cM?>ZlA|=?5}X%xlO8|*lT{-hk(Mcr
|
|
|
a977ad |
z1Zy;v_YY9Fm7Rhlr|Vjdk&e~H+9$00pk~a&X{rLj!ChmwR_$Saw8UaWu8$(^yn>rg
|
|
|
a977ad |
zs}ePYRlGuNHwR~qKR!Gd4x%dp3^dy_ADu5dg
|
|
|
a977ad |
zdq#ACzil^WZaYRlH~b9OS(&>uE>B{==~toqLPLc@C?QHo?b2E@L5W&Q{7hFXZx0!D
|
|
|
a977ad |
z1GCdahq|>F?z`+T<~hWTvJQ`Id|sS~t0(_7g?bao*J8L-n@YC+skXA2$K8rDTZZY!
|
|
|
a977ad |
z+<Nw<I$pEk&oEH?jVFBsCMMMW(+lI|@u%srFxczBJr@Og1^?O)=u=7$y&Wf>xh8jg
|
|
|
a977ad |
zCg~G?>61_Uiq1&ioQCSrXLp1jcQ?8Ah+~gqv#D!;+}|I@W|UU2rQzh+W|AG-duEG|
|
|
|
a977ad |
zpEyTaN?*x5HW(J2?q$4SyA@fcLqoPt;j%Egm#%cD^MH!o!fAUN;k79TAmCGCWeNlw
|
|
|
a977ad |
zj24%VAF>jf_md$^k%$$F?G89NGjJ)vynMQb5=D>tiiFSQ<gj-Kho`>nHn)$kS}F!A
|
|
|
a977ad |
znY81LJw>KsmgTE3am|3GYj>QU#Fn1?QismirMU?*%frnP{5D$TegxxBgw5nv-JFJ3
|
|
|
a977ad |
zcZi|InyovR-JGOX=#|08F}5%1=P+BTnUK5DSt^4kh>O-L
|
|
|
a977ad |
zT03%~exBg>YdBGsp0#wqLgRR0Z}1D<UUwwfd-@`!_u>W|sPmnq
|
|
|
a977ad |
z8QQT6Ig09S$7tzaV{g0TL{^-tl$g2YkDf<=d0$n}=9on(vFyDf^w@z7k65$KY0NjN
|
|
|
a977ad |
z#n#dCX)<4D+!?ILx6Mu{)MSXRbmog+a1WVZCbXA^)jw56VD~;_k8MTNG|k$Yu#cBI
|
|
|
a977ad |
z6*ge^B|cun-JN;AZ!Xt4P{D~{fPm~Q|J&yBU43}t!es5NZS3jwY;4}ios5_ftDbi%
|
|
|
a977ad |
z@;Pi!Ujh#V9+6YjvzYqV2Ugl;;#mR|l~BuhP`}P9O8Iz4XZzi+V-4ReJWm$3z&@Fp
|
|
|
a977ad |
ze_;}5j`fLA1}G$L<+)+ge@2nTB2zcdCdGs@{Bb%rqX9|48bFF7Ng?jPryLJ4&;L;n
|
|
|
a977ad |
z#}YNe|2m_K!c*#aJ)4Y2!}X|(=to_7wv8wQ%&)m?emjy%={ud`+6%YNGc_&EEn8)Q
|
|
|
a977ad |
zU3K3sovM$EifTt#$F1eH6boORyG&}9VQ
|
|
|
a977ad |
zx4o*PJ?baIiQb&^@)5;I*G+87HJPO|bM@6!6ce98=Qa5qm#g^F??$Xp-TZ>0CmrZq
|
|
|
a977ad |
z@2}T&$c9{zHn=<qhzPlN;7rHiU>pr!fSm=)T-70Q#}?^yeSv*<_onvV8si&Jg!o_2
|
|
|
a977ad |
zeWCvDZUaYq2W!iBk2g$7S@#fOL7qK+66tLhEK@RHz_DcIKC13Z;?DaO+rSUBoNBb{
|
|
|
a977ad |
z>CoWDG9N$HEAhfdg!F^&aF|oBAZ3m53<8QH9yNy9E2P`1)v2g!0^$-+#cv9WMbY2&
|
|
|
a977ad |
z0<E2jxP&Rf>^r#)zW*c^r@w4m?2Ibn5la(upe!p}V;O=h8aN3H>Xxd4Rd&=kR%{+y
|
|
|
a977ad |
zuG2Odf`e;a+`YLW-RD;B_EomY9kL0|Hrud;Y90t3wP<5CACOs{z>-5^>;0f!n~hvb
|
|
|
a977ad |
z!Iw#y*>(MEc)WSK8{b}AOPP*nyVd2mNS+imGQN7b&|So6OXM~Lk!s9W0HXUMfsN3R
|
|
|
a977ad |
z9OIM&2QC>tAiUK!FVnpdvxsV7)lpsFE88`=16nR)e)Yo2X1tfa;#-_XjGho-#8-C*
|
|
|
a977ad |
zAsZ0|+-qGMJ79_O1$OsE|5@wAr#EsA5{i%UOo;z&0?PhRHuGQW-N4%JFYY}<{x9ym
|
|
|
a977ad |
z?GpX1^oa|~rTU^-l5LlRf+9j>HLy|`)K_EC1b8L*2pG-dwO!1>9_vUSLv%zx62P4p
|
|
|
a977ad |
z1R;})0EsSN7fb|q)28pmhKVSMohpry%_hNO`KZFFfNjpgb0F&52qL)_kw277HU3s|
|
|
|
a977ad |
z>sicUn3;VjivGI9(o#56(9#!HE29pQ*>?_K*)1
|
|
|
a977ad |
zETHZmN722i4%@<pNq9AiXheG?*DbRD+3mU;ir!+8&1_2h;6di>@L;`!kQJ>~107WO
|
|
|
a977ad |
zLV*N(il6qZ3)@iWTa2r?_34a+F!?zt!X`^Z(V<~#!K@mS`^b6LZN@qhd#XjrPHvn_
|
|
|
a977ad |
zz5ypzVPNe^bpA(gV7jVe8fU9RFhiHlJu-rW6E!&lm6HoxU=LfovUF6h#)p7s_vVRg
|
|
|
a977ad |
z`YJv87M;(r9mO)OGe1tAL6h-!E<(dAs?p)juri+|FTmgDhXfuVr1v&I+y7^PXb8Ot
|
|
|
a977ad |
zBX8%fbQE1}jO?}E1Ef7cO5yF16m
|
|
|
a977ad |
zmH|OI3`Co2>Zs$iF3n=fqBh>K9_TPY*_G!@uq{{^fKD;x`&eD@7FT8j<h+GZmq>D%
|
|
|
a977ad |
zCV|RI8m=H-8NYmz87K@%U}LPCM*|sSeESs2;I@s6NU}0Pyo|?L$oF}CGzaa+J+IIa
|
|
|
a977ad |
zTFh-*hs7OmMFIr_v+m;W4A63uC3Ui`ygh*%+|y)-!}5x3oRug8T2GP;rAxq2*j%uO
|
|
|
a977ad |
z%VF%G%dzA>sUMfDs5yic%$`XSlKHg-Ka%p=@@eHGT5?j>-{^|%zj&T@?dKxFH5=Q9
|
|
|
a977ad |
z#
|
|
|
a977ad |
z=4la+>x^K;vB=tcb4kPRy9C_A?z#Q=+?DgO3Tt}a?tn8PL4!hBB*|y4RK)e4n_Z|h
|
|
|
a977ad |
zJwDeP{A_95RofGHGdr_3mak_umWABKov4u5fS0IEnfK|-`GGI%^)`LdkniaP7z7RI
|
|
|
a977ad |
z@1wuJpLu;h`up$p+d<$zfxjQfd(T9F8}VCLe;$zi6aBls{;pE|ZS8MT&|m1^Wu8Cb
|
|
|
a977ad |
zzpHis-Z>5YKj6Pf@_(X#SDoG!y}u3rZ7ly7`fvK)pZMR!mv?RIZ;N|t?l1g*P^$iH
|
|
|
a977ad |
z>35al-`z0!mTvxP>38YoPx$X7)Vq}Nw;iMX1OBJ5@n;jiZ#CZ8s=rMN_n#y97kBk1
|
|
|
a977ad |
z`1i#5@6%99_W$lp{zU)&)PGN|e;fA4-_U=j+CLlk{jv1#-b
|
|
|
a977ad |
g&qW0U^#6I1$x48~F@8Wm@NX}kw^Vgc{r>HL0BA|4WdHyG
|
|
|
a977ad |
|
|
|
a977ad |
literal 0
|
|
|
a977ad |
HcmV?d00001
|
|
|
a977ad |
|
|
|
a977ad |
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
|
|
|
a977ad |
index 0a646fd..93339d7 100644
|
|
|
a977ad |
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
|
|
|
a977ad |
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
|
|
|
a977ad |
@@ -319,6 +319,7 @@ public:
|
|
|
a977ad |
void testCreateDocxAnnotation();
|
|
|
a977ad |
void testTdf107976();
|
|
|
a977ad |
void testTdf108524();
|
|
|
a977ad |
+ void testRhbz1810732();
|
|
|
a977ad |
#if HAVE_MORE_FONTS
|
|
|
a977ad |
void testTableInSection();
|
|
|
a977ad |
void testTableInNestedSection();
|
|
|
a977ad |
@@ -527,6 +528,7 @@ public:
|
|
|
a977ad |
CPPUNIT_TEST(testCreateDocxAnnotation);
|
|
|
a977ad |
CPPUNIT_TEST(testTdf107976);
|
|
|
a977ad |
CPPUNIT_TEST(testTdf108524);
|
|
|
a977ad |
+ CPPUNIT_TEST(testRhbz1810732);
|
|
|
a977ad |
#if HAVE_MORE_FONTS
|
|
|
a977ad |
CPPUNIT_TEST(testTableInSection);
|
|
|
a977ad |
CPPUNIT_TEST(testTableInNestedSection);
|
|
|
a977ad |
@@ -6041,6 +6043,25 @@ void SwUiWriterTest::testTdf113877_Standard_style()
|
|
|
a977ad |
CPPUNIT_ASSERT_EQUAL(listId1, listId3);
|
|
|
a977ad |
}
|
|
|
a977ad |
|
|
|
a977ad |
+// just care that this does crash/assert
|
|
|
a977ad |
+void SwUiWriterTest::testRhbz1810732()
|
|
|
a977ad |
+{
|
|
|
a977ad |
+ load(DATA_DIRECTORY, "tdf113877_blank.odt");
|
|
|
a977ad |
+
|
|
|
a977ad |
+ // set a page cursor into the end of the document
|
|
|
a977ad |
+ uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
|
|
|
a977ad |
+ uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
|
|
|
a977ad |
+ uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
|
|
|
a977ad |
+ xCursor->jumpToEndOfPage();
|
|
|
a977ad |
+
|
|
|
a977ad |
+ // insert the same document at current cursor position
|
|
|
a977ad |
+ {
|
|
|
a977ad |
+ const OUString insertFileid = m_directories.getURLFromSrc(DATA_DIRECTORY) + "rhbz1810732.docx";
|
|
|
a977ad |
+ uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence({ { "Name", uno::makeAny(insertFileid) } }));
|
|
|
a977ad |
+ dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
|
|
|
a977ad |
+ }
|
|
|
a977ad |
+}
|
|
|
a977ad |
+
|
|
|
a977ad |
void SwUiWriterTest::testTdf108524()
|
|
|
a977ad |
{
|
|
|
a977ad |
createDoc("tdf108524.odt");
|
|
|
a977ad |
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
|
|
|
a977ad |
index 81193ea..4edc51a 100644
|
|
|
a977ad |
--- a/writerfilter/source/dmapper/DomainMapper.cxx
|
|
|
a977ad |
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
|
|
|
a977ad |
@@ -3744,7 +3744,9 @@ uno::Reference < lang::XMultiServiceFactory > const & DomainMapper::GetTextFacto
|
|
|
a977ad |
|
|
|
a977ad |
uno::Reference< text::XTextRange > DomainMapper::GetCurrentTextRange()
|
|
|
a977ad |
{
|
|
|
a977ad |
- return m_pImpl->GetTopTextAppend()->getEnd();
|
|
|
a977ad |
+ if (m_pImpl->HasTopText())
|
|
|
a977ad |
+ return m_pImpl->GetTopTextAppend()->getEnd();
|
|
|
a977ad |
+ return m_pImpl->m_xInsertTextRange;
|
|
|
a977ad |
}
|
|
|
a977ad |
|
|
|
a977ad |
OUString DomainMapper::getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate )
|
|
|
a977ad |
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
|
|
|
a977ad |
index 15c6ae130ecd..743c07de9959 100644
|
|
|
a977ad |
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
|
|
|
a977ad |
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
|
|
|
a977ad |
@@ -667,6 +667,10 @@ PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId)
|
|
|
a977ad |
return pRet;
|
|
|
a977ad |
}
|
|
|
a977ad |
|
|
|
a977ad |
+bool DomainMapper_Impl::HasTopText() const
|
|
|
a977ad |
+{
|
|
|
a977ad |
+ return !m_aTextAppendStack.empty();
|
|
|
a977ad |
+}
|
|
|
a977ad |
|
|
|
a977ad |
uno::Reference< text::XTextAppend > const & DomainMapper_Impl::GetTopTextAppend()
|
|
|
a977ad |
{
|
|
|
a977ad |
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
|
|
|
a977ad |
index 456ab3df371e..fac34be0adac 100644
|
|
|
a977ad |
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
|
|
|
a977ad |
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
|
|
|
a977ad |
@@ -684,6 +684,7 @@ public:
|
|
|
a977ad |
}
|
|
|
a977ad |
PropertyMapPtr GetTopContextOfType(ContextType eId);
|
|
|
a977ad |
|
|
|
a977ad |
+ bool HasTopText() const;
|
|
|
a977ad |
css::uno::Reference<css::text::XTextAppend> const & GetTopTextAppend();
|
|
|
a977ad |
FieldContextPtr const & GetTopFieldContext();
|
|
|
a977ad |
|
|
|
a977ad |
--
|
|
|
a977ad |
2.24.1
|
|
|
a977ad |
|