From d043c9e3be791993348afaba6effdc3731f7c33d Mon Sep 17 00:00:00 2001 From: Nikhil Walvekar Date: Mon, 17 Feb 2014 20:46:18 +0530 Subject: [PATCH] fdo#73596 Added support to import and export \r,\h Index flags. This supports \r flag run-in type index. If \r is specified then we don't have to write \e flag (separator char). \h is Alphabetic separator, where indexes are grouped as per starting character. Change-Id: I690b29cef3d24b2a71b01f1deef0e418162d71aa Reviewed-on: https://gerrit.libreoffice.org/8099 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/qa/extras/inc/swmodeltestbase.hxx | 17 ++++++++++++++ .../data/fdo73596_AlphaSeparator.docx | Bin 0 -> 16099 bytes .../ooxmlexport/data/fdo73596_RunInStyle.docx | Bin 0 -> 15886 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 21 ++++++++++++++++++ sw/source/filter/ww8/ww8atr.cxx | 2 ++ .../source/dmapper/DomainMapper_Impl.cxx | 13 ++++++++++- 6 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/fdo73596_AlphaSeparator.docx create mode 100644 sw/qa/extras/ooxmlexport/data/fdo73596_RunInStyle.docx diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 5be397a922d6..cb15d695ac8f 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -580,6 +580,23 @@ protected: nNumberOfNodes, xmlXPathNodeSetGetLength(pXmlNodes)); } + + /** + * Assert that rXPath exists, and returns exactly nNumberOfNodes nodes. + * Useful for checking that we do _not_ export some node (nNumberOfNodes == 0). + */ + void assertXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath, const OUString& rContent) + { + xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, rXPath); + + CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("XPath '" + rXPath + "' not found").getStr(), + 1, xmlXPathNodeSetGetLength(pXmlNodes)); + + xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0]; + OUString contents = OUString::createFromAscii((const char*)((pXmlNode->children[0]).content)); + CPPUNIT_ASSERT_EQUAL_MESSAGE("XPath contents do not match",rContent,contents); + } + /** * Assert that rXPath exists, and has exactly nNumberOfChildNodes child nodes. * Useful for checking that we do have a no child nodes to a specific node (nNumberOfChildNodes == 0). diff --git a/sw/qa/extras/ooxmlexport/data/fdo73596_AlphaSeparator.docx b/sw/qa/extras/ooxmlexport/data/fdo73596_AlphaSeparator.docx new file mode 100644 index 0000000000000000000000000000000000000000..892bc553b3bf75c3c9f0f817371cc3c91efb51cf GIT binary patch literal 16099 zcmeHuWprH0u5O!|nK@>rn3xo@ra z`<}g4cW=8(U#Zm6mQ*Dv%7B5R10Vs=004jlK;1`ZmJI>`ph5xwXaHzX9T5k6S2KH8 z1640aGZ#GuPdi)U0&q~OJOC(g{C}_i#S&;#9kE|!Lhi&m6oBr)L_H;pEU3*E`G&6o z=JrJ&$J!Ka4|3A;@iEp^!Vzu2*?5=KAGa$cE<0oGBzuA*ej3~$(uo-r$CH5OYg+ML zQ_EO)B)rtU^zv3dy0@Sc>+_va{gOma^cO;zI?~9^BGFFJkG0S!yc*x)vq|+!ile1p z)nwv7NE9+ELn&-ge+(6orQFO{w~<-49qLAsN7Y1MJ~c8aRD;DRWYgBU1C>}qihYv-Ti+_}T7$nDzZy@Y1<~pLK6HmyE^bP3QCuX< zVaXU47n#e&BC2{P`Fq^U1SZ z7E<`0Q(}&!udCD6>Wg{zy$G8T{T;oSP!VV+wYbRN#q>xo{qS~0u;L{4h2V5N@9ymx zFO*bZc|*< z-~Vwirm&C|lr_imkr%SYNNYZCDa%k|)5g=TISNWqYgi{U&;mhXvewGpVS$l1AvvEn znz^E2ry*2`oS)R3wYE?WHT5+et}W9PMNWcoB`n95Rl)qV=&M0g zYzQ4pK1{^a)qA&WFl~J#*X07Qp&A|{5-mDRAMZzzpaw=uexQ5%yNw{<#e=W`zmWh3 z0Pq3OARZ3Rri}kG6jKKiH#?vY{OSDuV>BQ@4+tFnzx%38>Xq+j0xFGUhe!&K9H*g( zi8*DY`GdSMWG`mbt7K|UB;qCMS86BxZ`{@ z!5w2OtmIOQIzG5p;SQ9_%%bdV4~uVx$qUj@2q9iNC1o=tot|ZiN;(q0(2Wt9d?67XBrE}EoxCORnd)(Xos!{d;9Q;9BS=>E3Gh-FE)EQ|JvQ{Fr9ViY5 zL3H_=D=D5G-->Z2~B~|Y!5~N00lVWm)8AR-%hl( z99G{V`x+R&g5@79NbD3-3sUlg^nzK?-AZ?>kCfLYJ?5y9H*}G$_mqxKspAHn`GAStyH~R+sp5X!d3Xp)>MA z?QWX!N)r0zU+obOy7{U{4Ms6dDqu-pK|(szzwCo2(?Yo9*82{GqDO^daew05^m zgDe+1PR#e#7@KzDkpx+8g+Lth=o*>sfhK*1-6)A6Q10Sr*rsU`@m8LPpvKdc29g(n zzLU#$`KZGh%YlJ5h#)~m4l75`*sUxDm(9B->z-9N={}?Cj{4!PTeDYc>#XALd}Uy^88AMiZ0krn`Mmvqkc?p%YO!Lmar8 zAqM{3Tpx1-iE;1ax*Gngp4-Lqmd2Y~K5=3hSPw`W(LVNO9- z=uQ1Zc$;LukXtzCW@Oek(O#ar_cWha&hB63toc?7>gF@6^y zy67z%F9)CESw^N0Bdb(iyGd!H$y^UJR`lXQt^mK8bH)^d#D=8-a5Z)ZB{g~ji?TicA{5Ywoz8swwl^QVapG>KVmw}LNjX@|ex9E(4Q8c;}KarT+t zi5z~=tt&Yb(U@aCv<*_3o<9f;k0z zSu!p4+nTkmT6V)%<*VH2XC?&jBy~|pG1}&6n_f_(T_#MBhRA!^byS?fHWM@}iRu|O z%OfK{6B2b(>z)#t`AW+r_9d(omJdU8?17aPFUXY6VIMj^fo%KUz``1Ip(X`S z+W(1y3u4P`U z;3!v3J>*|H$Ob*LqcXShUnv2|c*$p)sc{vELqahVRMQ#m6|bN<^Ek|S*~Ul)LXZUJ zGgqF)u$_9%FlDA;M-olg;SZ?LH1L<(9Pf?8K*x0#Uy z=~jy2bc)7C*Vy7!+Y-+?NTv{Pxg)JU=0%5?Yb2lCL#mkAj@h>f6|D?YHeg5I9Q!^F z1cG6{ZGZO7fwT87*x0mmM(B>3Y+^v&K?m{e9Z7fG5*_4Jsa{2qd8D?*wGON6S*Q=- zZPr`D=Fq()PJ%W-EV)P>H^x1|wP$I#Zo*@@#~atK)s$Uo(t({6w6G|tWw2JM+kBhq z{Cp&K8N9;8zt2)crPQJ@@C0}4r*8WVUe4z7bJCh!g-H$gvMxGFINK6)U%1PgFx!1` zbfaMc8Z-+=rykbSVVTkxy%`qxx=Z{2+*PBV2mB4SB7rDQ8c&)Cw4aSwrC@0PTzrlGU~D?y^U>bnD%9jdB=$o+;s@e_JvN>Z?d9Q<>?TB>I~tTK$p`ZW=laxcC&kq6 z)2t7-4SuU>K98^>TJi8oN597g1fgEhi7-Jm1F`=%3xZxsS`;B9*4Q`_S^k!O|F30 z5K=CIz}?Z^cK=r>0d3*Qa=Yx{JvGMe=aZ=+qC$aO->b_nSo5A*gRc+$l-*BHUhK#- z7H=k_7(YDSoQy=(@IODdOJH2c1xT3P#Se-WWbHzqUSXrNsyk6ok~wu@^h3{HMoy3? zzwOPGfq2f1#Q!ltZJyzQ&&B<@X^Q}4uMpPL$9W3H6FDNH03+L@UHgPu%~Cr z-J5Cc! zgu0*pojaEbUn2p3Cp`th7p$UGdbn5h&P-Q<=E7AHTcXonQmbh{72qQyzuBu;N3-5F zR#F#*9!aSBr6Yigk*xVnh_la0JA`1GoW?{T9tybt`_xGdVsprqSMtBvd5`>MTVaqvp1$vBIwIw(%~goq%oxm|Y12dL>{wv;Sbm>eDRd(06~ zb$vwD*uouQ<-FHtMTIjG5GkZvgZm3`s*9?=Pv6mc&)I$x39rIOt zr1p{~`<~tA?TMi{sGY}g;TruQ9M%yj&bGfP|IE9o$5Q+3d6e6>{Qe@$dIkL->}mbzb^>K7VSmBt&3P1+VUkR z&r=Yj(Dg`<%rn@sm)BX9Z5`l}X}gR`?_G8ppMkd6Q~zk0JA!Est4tE)MH>OtrZ#Gy z%+pQtW{*)a#Tol`O7+Vl%o=|s_zD=mE&^P%Ye^#?gX-se*kY9HM^IcS6&_;kEnln> zlG3ffl_#uS#n)yo3#;_TP?4gQk0hw*H)I$v!Z&$z8HYR}ntZG6bW*7(EGTNI8YSu{ zC|u;Wr8ZmT8>@WiLZw;Oi76mKJUD)5-l;-`ikw_~?_FrL>TXx??>_PnWsT=0>x9XP zB&~KM*I6Q&x0mZVq#k%XXrb^i+ce;MsRJ5j)Tc*hUf9Ln9;n;UE@TgmP3XS8*y$K# z(qt2*ULzrShPn};d2inBeu&^Ue4GD?^v*LsLTE`))u28GY6fBkF*eVsK8PcojoN0V z(rre4jPn@o%oVPSGP;U_C#rkO>ZE|nWtpqhGhuL&?qq2tmY$8>^Tsr?Z~CpkF!oUT zl<6L$)_YeZ{7#5X_&2grXtEbM(uRlmP;Zck@98BPT)zU-$$!W;5&22S2EhP;a+p75 zn=WRqu2%LIECm zsoaaKRXBAaS;;%LftY3UhDEc+#q{IKlf^R=Ra_HWXf_ev^Ne`h)3?qUoE1DV5V@W=<$r<*}_>r zFi5EKwo6@U#OBKQfE33*uh+Ri>|4!z7#v3MHWT<_w>jXgZByiv6#!s>-AE=v61G-l zC00w@|AN8vts?pTLQ3QzWG1-lcp{ZMfSl|$MJyFyi*8hTV9^f^YN6*f9S+v8kdXF+ zBmG2a>;$ZwmKK952l;acEJGIAOlh5{1}yv5sXA;01>8H$7wS{`T2&DgALQHy27JGA z-q&7XVni*^qn@Lj&!5E>tRKo1H|ZN$4-13e{os-{Am8q^j)W;1lr)=)wk5fX^rct? z^|OvCzL0)r{wfOY03jIMe$U!*7S=$j6KD%(_V9t>n5WK6^|W+B*$*AN<$FWgKz>AZ z4%1UDOjvhuV?KhE^A*F?=Ep8fc{|a1vs66;1=1`w`qZRhJ#AY~6-nPLdaQHGg!ZCg z%5$yiL^WqtGnLB7CwrD}^VY3e@NwVF_!m8*cFdXgP9NEqcD-^dOKi^~;RVA4i^Co+ zXJUrCf6NyPaLr7%P(IP`G?iF>auGqV^wc^Y!lMDzN7E$T)hV(*2236hGT}3S3eh0& z=U37Z%@d6 zr43dc6mpwWk@n&s$zA-rW^Q$3t-zy%Puyn`$Jp@uv{AnLOk->s$*GC}EQHwr>?hB|9l?`D^>m!C!F|pB z{u)_K%WOqe+rWMGZjBj>-%&iKDm>85v^X^R5#d7T-0LaH?HcJHjXof2C=45D@bo?$0^Dor&Ui#3?EYv-9B(SkW9QsyUUIr8 z%yLT?4c)eqI>kY9RMVYe3THyr(Ra4?U6ii!*}bWKb2K)!`P`td$E!qY)RWDvlhbE0 zKVb@s?pXhcEMeE|5O>_yVn3>l@ELWo?#p230d2J8G{yd+luwiQn@3DKfQ z#8TtlXS_D@V`7;BGv~D3wEL8&yU&GmZX6oq*Erq)SP*Iwuz(K&qSP+ic+xW`BBR3_ zj2b)Dott-7>WMcA^y#Z;;YUdE_p*UyJlN=Di^4%Ub^f9X1K2T>gcfFUCDnwPL2G3) zi4Dt8B$bpCbo?^=gFJ)%DXJ82_)Q77;?2YZg8c`;<$HoXpwJB2+?={GqhuCvri6+B z0NSXKvC&8{P7sv|bd&yO*ZYvi%_HN~UMv+2H<@r@v{z#u0aDSRoNX&JK;5U%KDHX^arh=XsaA4$*fshM442MSYLqqfL z?;)VTFPqM^Yf=KkQ02N)06C&2Iup}UB9+c0yB2^ZuhMUZ#D$I;g_LYnZ$n&-!fwKH z+RzV%-*C5KwyJ@!HC=fpIv`F>^Id+Tr6#bZ1F?S$jD*&FuAtOOoZb@GV$Qe-ctZ}n zA*vgtTnlC1^=r-bmgtL{j8C?bRa0b3wpQMlo=6N8?HGO|U*RC=ygv!=jeM0)-JTL0x{U`F zdWNm1PGydAKHpRysST7`EhMJqY0CoWaHi||5i1&FfL&C8sa5Bqt?WU*5kww%{>`*s zwbw#N7$Npsq$uFpjuVr)-!|rxT-927@s_=_*#7DsG6hFfaG{Wh}mPU$b;k4m`3c=$ji_fbnULH2o~_ zW?pMu)DWjUbXmeozKMCX%|12YhdjVYiE}pw@GZ0hMQ}Zy6SS1ii!;boVgs7a#(p|m z`;7y5e8<4Pk^xxC2p)*(1VZHLrH8oKdXh4tz?!?@1~j@2)cgn@a1sJEFS6QQdX5Ce z-Wk=fo<9KbF2wonr#1?p*P-SWa|@iIS^QL4#A7ezm3EJT=C~B ztQ9sUh}RQ1LB}%j*gmHI~w^Vimn%L$SHqPI$y$}P;PV-<>feTHIPFnziBsSy2 znVS5RN^R-?<^5)N9e#!YIDciUkc;(Cb{Br+1&jiR*YAgR?$W#Legv*%U`5F7Qan%7 z`=fAaW(SJq0%EzLRk?`a&*c;2q*nnMB6r{dl{8O?$pSJREcQQ0oSn}yj|I3e;AGhi zAy);5U(0eyplc7{BUKPAdjfi;G<(*1yxWRkTrp<$XG!Qm;Na+y5w-)^zmpwo60G%} z<&y|bE7}q=F~qrckE(DNiwAG-3R3p=6D>|!%mY-iC`GJqcM)8XQdUDuy%R0*LHQaM zv9;ZIc1&C2ArXWNYG@rm68Z9*r;(GJufs<(gt4%simH^lzCn{Q!Utt7rM9jBON~WJxe-l}N0NM${cqMQo}{xZiw^p1H_?K%t8MYgANH#H)+Q(}B<}(bZJK_j9ju zk7smLLtDq5yJWN;yj*z*^=^1Yi@YbVeNon}Cs*l<5E8IUgvAJMLuYRGyO}NjCzx|l z0!J@yu@+BuWgoM=Pr~<%VVd(nI@h*~H}}Ve&p9f06m*_Atct2hueQ-p`9jp4L`Z7^6#vjFu@T&7>6raC9{8JL;D!}!w4;V*L0grzP zfd|DVZZ574cA9p!|2{3Yay7I2wMY2hqhg?x{&NLS^+tj+!$WShZ}B9rru)8&R#70z!4y%HvvBeTK9yD)d(1QszcQI6j$6y4iR_!3 zo`dU)o#3rexrhTX(F5e%eTMYqD+fZ5$DP<2CetVp%F4PXm2Thr@#L0ajyNjF4nxo8 z%!P>M4mT;{obuo;>+RW1e+BEJ6sv&#Lw@AIxDRUC<8jspzlXhT(urK* z1a4wtdBy_6{pto=7iR3DUTsm|2W>l1cuozPh$nc4q(`A$N`vMsjetlF-#1t+$;-2b zp3W>zF3d1uk=j+J#2XcccoA>=?}J2xiIoP9wC!hvSHQ$pf}~TkL?KA!dJn1CE=dgr zi?JQnkkLnomCCfuYI@THzF6jo^}3#e3y9?(i}nu8`&6R(q4e$Wd79iJRIVvQoDYm{ zhH8~FCNWC+W*BULK%$vcKG^P40Hby=k`fXm7g`u!m}v5~KFA@S zpqbeiDRzazWqw9v>Av3{CqRr!kg4j8s+*2Gk77pYZp+eO&uHD72Hl<174TyBs|Z1u z9^Y{oSet4KWq5IGa3`8$9AiWXAm+^NPj!O>-J3ArOE%23%Sb zMwn*6a7Gp&wB7hx3c_H(Ikz_^BTAFW)8m>VfhK@Br}f|f7Y*`&G?8e}ncB5$*Tmzy zHp75{4a#P*@jdU$0Tld;u5sQcC&+IKCD;%~ZBM7n$an;wh`Dc?!fLL;q46ChAfPZ- zMlI~d1racyUa5)szV_!(*=!%fdnmqk3R+%&Vx3mhQDq10)w>e7VKJXE>@>DR!*AHz zFrQXKT)fkWOJ6D#rC2Y^fR(*aTQqX*qBOmZ7DsQIv;>zsjuww@oU{xU1>S%IZ{Bve ziT8I`vErVs@sM34w0u)y>zgO0xTzW!&ObP(Ag&>s-zy%x-=Tc**>PBiWvFy(x=q-7 z-#%sqv?KC*{#cFjWmm2sy^&KbGz)@(6v?>qKy@-YV-}i zlB?(jb&jyrrO&*{-tCW|U^wj)h$>zaADBUQCqwH$fahE!RvdViVOwCZHrJ@YSOGyt zlWpC~^1p<6$lB>ktMQTjvYA`}wuknEGvrwC9-HX#dCWZX_G0E+{EW@$xiyrY6f?frR%^`X^^X|xFyN;a6^uT@Z4+H8yhxtsYEQoST-tG+d7|%Lu z4KSSykMo+by1;y<1>u{Q>w6hX?7Y#mT#y5WT@{*WlM*!Y{-{1S+9uWWt;!y?mQJnz ztdQoTbF}f|1dU=V8nNaak{6o)1BnBuqQI^k;G6u$De-dxCrH!;0>wx5kt{%PoTL7= zOdbtz)Y6*a62t3cX{k4r+3T1c(ypAK5l^Yq1~~dB58GY2o<51U35xwRWwHMAe+3Qe zfDwF-=L9L`@oEnGA+Z5Y$HAGLtxe$oikw9#{R{g71(EZF++qBINd6~YQ07l??~mf8 zdv8+w2iz4AD##r`G5PyoLh<2(vP@Kg%+{6?UA_Tai)?`B`3`3R=5jh#g&xR&qq6X% z<*O1oLBi#bC=^qGbKBZ4No}M@3uJe|P}xGUk7W7x-N?r%%H)z6))A=o(*XYw@_i-) zIPz{dUl2bED2_m}Ukv}8!Hx3VJ^p1l%YR@$G*P7jC?(@r5g659+~c_?a_$c!Q9Aq- zx7_8MyxL9`vbn?#7)@KK`C936GQ*$z5yOv90?GO$5CMI3J1u2E)PKpnEy;sN(hn#) zV;7N;GBx02bw~N&Wtch>k7#vYEeO+gWUE-8PH z{pyfa*k>X5IYO?~5J3~fRrEAq6saT4BL1Sqn_$VAh7iNceuQdnTwzGyJb&DUankZ^ zo@bV__x3QFa^SW)At(;Jh65vbpH8(*PQ-DUl#Sl}Vw*-kFl3rM{FR+`QkVZh9DS`D z-RN$4D6~=5?j$bMI3=Tf14g|kvovIs1!MVu(o+zheVGE#mtP*;Iw!vLm3%`SEa%C)@%|eepUr^7g-JWr#SQhyr#PbL4iXhJ;Kz4w6O@5X#(jjwGKiV$W?|CFe@YY4yxtn^SatJxUD5Hw0`;|k z?uy32Eg$jY7zEpwSn3Yi;gfGh>bs>3>kOb*T-sq7=uROTAAvJ{c)s_sHT5E*-58(Y zd7<+Od3-${z^B2pVd;-fe} z?5Gdzbx#rw6kn0g2~K}t2tbC4BVBpoUF9ajOSuZabl(~{0d zvG7Ak>qmX5U3CUrxje1RvohTReS>T8>&yd>M+k4fIGe_SvR7^UZyeM-Z<*sh2p&hi zC{?|`jePjWqH0-EnPO$2=mLSlMFHjkz^c7pGGjDxa5noH0|HB{LH=7M3IJp$>M8US zV~3o}Js~07(l=f;SZNiQYcMd^iGL;NYmZ%02DR0DzMgTf(D^Yc^ENEZMSpm|y$$x0 zVWq8V>`r(d0No*2)ht#&Qp__5^f(>0(i(lY6fA20#}nOG?!A}*%2`V$`9K6-spaHj z{HmN;>cP~Sd~=RV#JvGE6YKq_nPg4Yml5e67!r*Z$RThS_}d;u1<^(cSbmc0K~*q8 zM|h06yzBud^shuUU@EHuNbsWx4XM?$U9?)ePaHwj= zTN-_-vt)T&Qrzu$$hiSadJ!>Ow<+Y6vo3%RCyIt@5KIn})I!{RwC5&0>`ipM`+n1K zt@L*LMUEG67=QO;aoPcBdw;j%vSHowXy7+1z!%!z?D+r7gzKg1VJ8{srRC|>q2(u} zM5ArJB?to!}kkqM&b-lmT#e6#JkM0mjm>7_D4h1L{(rq;V)HAk-fo21ano zS|bMD-9wal3AQ#q6|8+mC2pqD6A+-MXXTow5NKuNWUmq39Pa6n6`*FNreqc9q^ct> zM773Ni>`0@66QS^n+8m`{$Y`c8{VvIKx-=p=H#fr5x?>+b6{_hs*$nnFLUci8vEIf zB6bV$fCPG5S1K_h8jjy$5AQlFmhc`Rr-G@(4~}Rz@3)CUO$*oWpF^Ai5N;FEhetZ& z<$s>1S%!m}$;>oml}0scS(j|68aW>Owx3JBm9flZ7E?MR1n|oAd%j%Kh+!v0<#ouL z>3CChtCv#Jqmz#_Zc7P|iFeF)b$9%!%=~Psx_w*SV|=Vhb%tmrdxnQ)rA0>9c2<(X zSF>xj@6M6mO*p@heR>oz*8Z8ozSAvhQi}m_F{v#kFj16YTYvdkQs#_qX>jU-#p;BL zpz^{~ygyBy{7c6}EBiuSld!vwdg47a!x3#iTck|M?#hVbVR{`gOXX=sIn2aSLD)Lk8IP#~8Lzgjr>RSehTG#F*SiUfy%J<0JX`nxL%%eTWNDgH*$k>A zRqHd8spwLZ5=~UTdtu+ACk2l54hAYLCGvq2sZLw)Vm!#2xXMe?)zZ6#_Itbw11F6T z{OZDG*nV%^#(vW+y0_}172VtwDe|K=yFY3UG|`|y!B=Nu9EX$(m70mbOj6QGjYanY zL8^@n=OEnlHE1}|3LnKi^s^vwB6hegC)qif6E|67_RM8!3=_&*EuxGBCr!f_U~2t$ zg~!Unlm`XsLM8Bp{vTcN0M=pu=_EUPx>p*E8Tr?K16^zLatdj^YcsL(chbNIfR(#D z-neO>taYV=!%8`^{<|^qjJOQH)(1g@POzxL=`wTu3fREn-jFht8ph-0m~!$ACTs-| z?j|UuikC~{j8*t73(2ylz@?Z%vy5_Fxa0eg^`acW_zI5Or;Rq0$dT;J7!42tMC ztua>&r`KwF1{DsWQ%aWjIUzjtJi+m?&zZeg34ykH$wc%Y3e9#%ShSF-AM*sfEOqb9 zG6w{pbIee2XFKQ$70`~r)K;<{JcVm$8c+Mt!zTvQz+D;?eInwFoe%kqGk614`xZGSiKYy!Zcf@Eh3tb{3^t2Z$DCJH+%kPE-QVh7KHg56@&%XX ztnUsOXIL1fR5bC~ULJhAn%Bz}Oa7EPsI{~!5q{r!cNcITc!jJeG9KPHD7QiSz;2?{ zG(FOiS6?jsRhTlN&(W~jsxc7i;|6!_@aW!UXfID-Reskcnh`%swfB?3%t~1iW0$Ig zLLfv<-jz6MxPw%z)*K?wWC>jjzO>2_;^)K}l^%~vfRe5Y2k6T;VS<5gv2EhR%~kNq zBwSRZtH(N%<}fcK-i0ZmEE@0UX<80($8#a^>P35&J3^A!y%imVzB0pPggr%lA}^-n z!b7owyF@N>C~T1e{TP0p!d6QGCQ2p;J~;{V0?nd#CU31g?yY;9HyuLv?SpHlS*}kS zN}^p>N1BjKl&OI=UJwW#5p%e7A&Gr?%y+aV<;cQk=sYg-x^rPlDH^R({pmqa) z;(r+i2q-=9!ST;6um4em|9t*K1FWLVUjhEwUiTlupP%zUYx`5P-S32d?K%20;XSYb z_5am@^gGh;eI$QiIRKCT|JGIVJNfT5uYZt(0=rUvk^f!+`#Z$%wMBnGtYiHf;?I>v zzmxx7rSJ#&46qLO7YF}Xv+z64Uw7yKKmhh47qWlX_ zKOdmK6aO{4`hyezIA;7aBY(}cen$3} zeh<6;fJkTiw+Q|cg#AwcyQ}_#zKG-B^uIao-x2=mxc;CA0G2raB!PdsF+~{&pymAB Ql1Bop0gdlF_s_rn4^4o!t^fc4 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/data/fdo73596_RunInStyle.docx b/sw/qa/extras/ooxmlexport/data/fdo73596_RunInStyle.docx new file mode 100644 index 0000000000000000000000000000000000000000..8f1863b4670c1b5f05e3dae2716f681eb480f577 GIT binary patch literal 15886 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 DCk1kr literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 06b6fa5193e8..f88543882ebf 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2348,6 +2348,27 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73541,"fdo73541.docx") assertXPath(pXmlDoc, "/w:settings/w:mirrorMargins"); } +DECLARE_OOXMLEXPORT_TEST(testfdo73596_RunInStyle,"fdo73596_RunInStyle.docx") +{ + // INDEX should be preserved. + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPathContent(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:instrText[1]"," INDEX \\e \""); +} + +DECLARE_OOXMLEXPORT_TEST(testfdo73596_AlphaSeparator,"fdo73596_AlphaSeparator.docx") +{ + // INDEX flag \h "A" should be preserved. + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + xmlNodeSetPtr pXmlNodes = getXPathNode(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:instrText[1]"); + xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0]; + OUString contents = OUString::createFromAscii((const char*)((pXmlNode->children[0]).content)); + CPPUNIT_ASSERT(contents.match(" INDEX \\h \"A\" \\e \"")); +} + DECLARE_OOXMLEXPORT_TEST(testFDO74106, "FDO74106.docx") { xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 5263dcf3a9d1..0109d87b97aa 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -2102,7 +2102,9 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if (nsSwTOIOptions::TOI_ALPHA_DELIMITTER & pTOX->GetOptions()) sStr += "\\h \"A\" "; + if (!pTOX->GetTOXForm().IsCommaSeparated()) { + // In case of Run-in style no separators are added. OUString aFillTxt; for (sal_uInt8 n = 1; n <= 3; ++n) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 25daf87712a5..35010980a67a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2944,20 +2944,31 @@ void DomainMapper_Impl::handleIndex uno::Reference< beans::XPropertySet > xTOC; m_bStartTOC = true; m_bStartIndex = true; + OUString sValue; + if (m_xTextFactory.is()) xTOC.set( m_xTextFactory->createInstance( sTOCServiceName), uno::UNO_QUERY_THROW); if (xTOC.is()) + { xTOC->setPropertyValue(rPropNameSupplier.GetName( PROP_TITLE ), uno::makeAny(OUString())); + if( lcl_FindInCommand( pContext->GetCommand(), 'r', sValue )) + { + xTOC->setPropertyValue("IsCommaSeparated", uno::makeAny(true)); + } + if( lcl_FindInCommand( pContext->GetCommand(), 'h', sValue )) + { + xTOC->setPropertyValue("UseAlphabeticalSeparators", uno::makeAny(true)); + } + } pContext->SetTOC( xTOC ); uno::Reference< text::XTextContent > xToInsert( xTOC, uno::UNO_QUERY ); appendTextContent(xToInsert, uno::Sequence< beans::PropertyValue >() ); - OUString sValue; if( lcl_FindInCommand( pContext->GetCommand(), 'c', sValue )) { sValue = sValue.replaceAll("\"", "");