From dbd42432c7b8f8149080bb13b103b35f2532eee8 Mon Sep 17 00:00:00 2001
From: YogeshBharate <yogesh.bharate@synerzip.com>
Date: Thu, 2 Jan 2014 15:03:02 +0530
Subject: [PATCH] fdo#69613: Code changes for TOC with flag '\x' should get
 preserved after RT.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue :
	TOC field flag '\x' was not getting preserved after RT.

Implementation :
	Provided import & export support for TOC field flag '\x'.

XML file difference :
	In document.xml,

Before:
	‒<w:r w:rsidR="00A9725D">
	‒<w:instrText xml:space="preserve">
	  TOC \o "1-3"
	</w:instrText>
	</w:r>
	‒<w:r w:rsidR="008A34F6">
	‒<w:instrText>
	  \h
	</w:instrText>
	</w:r>
	‒<w:r w:rsidR="00A9725D">
	‒<w:instrText xml:space="preserve">
	  \x
	</w:instrText>
After:
	‒<w:instrText>
	  TOC \x \o "1-3" \h
	</w:instrText>

Conflicts:
	sw/inc/tox.hxx
	sw/inc/unoprnms.hxx
	sw/source/core/unocore/unoidx.cxx
	sw/source/core/unocore/unomap.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/ui/index/cntex.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/PropertyIds.cxx
	writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
	https://gerrit.libreoffice.org/7257

Change-Id: I8f196446a3beb8deea6b7ddde50e16c9cea73cd9
---
 sw/inc/tox.hxx                                  |   1 +
 sw/inc/unomap.hxx                               |   1 +
 sw/inc/unoprnms.hxx                             |   1 +
 .../ooxmlexport/data/PreserveXfieldTOC.docx     | Bin 0 -> 18620 bytes
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx        |  10 ++++++++++
 sw/source/core/unocore/unoidx.cxx               |   3 +++
 sw/source/core/unocore/unomap.cxx               |   2 ++
 sw/source/filter/ww8/ww8atr.cxx                 |   4 ++++
 sw/source/ui/index/cntex.cxx                    |   2 ++
 .../source/dmapper/DomainMapper_Impl.cxx        |  10 ++++++----
 writerfilter/source/dmapper/PropertyIds.cxx     |   1 +
 writerfilter/source/dmapper/PropertyIds.hxx     |   1 +
 12 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 sw/qa/extras/ooxmlexport/data/PreserveXfieldTOC.docx

diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 4ded582d456c..d8bab6e882aa 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -404,6 +404,7 @@ namespace nsSwTOXElement
     const SwTOXElement TOX_TABLEADER        = 256;
     const SwTOXElement TOX_TAB_IN_TOC       = 512;
     const SwTOXElement TOX_BOOKMARK         = 1024;
+    const SwTOXElement TOX_NEWLINE          = 2048;
 }
 
 typedef sal_uInt16 SwTOIOptions;
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index f0b72598e59b..060d0ae95038 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -219,6 +219,7 @@
 #define WID_PRIMARY_KEY_READING                 1059
 #define WID_SECONDARY_KEY_READING               1060
 #define WID_TOC_BOOKMARK                        1061
+#define WID_TOC_NEWLINE                         1062
 
 // Text document
 #define WID_DOC_CHAR_COUNT                      1000
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index f4fc116db19f..85e478c59f09 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -124,6 +124,7 @@
 #define UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS "HideTabLeaderAndPageNumber"
 #define UNO_NAME_TAB_IN_TOC "TabInTOC"
 #define UNO_NAME_TOC_BOOKMARK "TOCBookmark"
+#define UNO_NAME_TOC_NEWLINE "TOCNewLine"
 
 #define UNO_NAME_CHAR_FLASH "CharFlash"
 #define UNO_NAME_CHAR_KERNING "CharKerning"
diff --git a/sw/qa/extras/ooxmlexport/data/PreserveXfieldTOC.docx b/sw/qa/extras/ooxmlexport/data/PreserveXfieldTOC.docx
new file mode 100644
index 0000000000000000000000000000000000000000..adf7fd92494d8d2b8c157eb9a177622bda55c776
GIT binary patch
literal 18620
zcmeIabyOT#w1<nkySux)ySux)y9XyYL4#`u?h;&r28R$_gS)%DPG;s#CNuA?_5QxM
z*6Qwp?!D{O?%z4*+tp{6k}N0~8W02!6c7*)G0?eO`qz43ARrt_ARtsAC=gvyM+Y}^
z2RB1CZzpqCeFiUkJE8(G5UM;N5WwgEZ~I>yfrgYZhb1PY&{OaW1d!?=G0KPnD!ScC
zia|0V{RYi&y#=v*$P=E(wNBavjAf15ESyfLgrV&FPetJ~nVP3jmP1yiCH?B`$lzf3
zvGCD4ez|KYxne;@!O9E}CH*)`%cBeea=V9MT2AiWI&_iKmek6OJ+u`j!QG_tqXx)b
zJ7ID%uPU$!b4kOJrKUtsYAWT#7Bkh8B`JlQHz|USQY>6({b^%;-^wv)$SoU5C{iYR
zp0-sS@M)@!cGjmU+RfmIA@LXAHN!W#BQ9sy!K1~~%yeAD5F46sOpA3~w1*$mi~?EO
z;gsiBJI<=a;UKl_uBt!3)#Nz3i{QF~p?=6+m6ly6bd~dRXHj5WJP@XU^+$}rYBeCL
z#9tr&_UdL*=vxBrdm~6k@0ba}M)>KR|6Hr7adyC@+G831tyf_j^Zg|!)gT8!^Or&>
z#<QzqJ2c<TLL&JXG?Hx7Q{R1MD5xDdINojL&~Q_msvJB#=ZjTuDj&fAH;=#<_!Z-W
z6m}BGKdPm1Wo_RJrgp#{Hnncu@sim1NOnRhoUk@<#sagh)3;^X-{1lPy}p71DgC3b
z6THJ|z61zZ0nn9U0e#)j#oW%7k>SVl|Ml_z#U1;XQ;$hpk^vQl3qJ*4GamBiT!JB)
zURagN_ar$44NX4+_Cy#hTI}p7Bx+S!GT6D=9Z~$28It*x_ah%fwXybW-h8H!<eIIQ
zeRDLVlJ<~pMzAHk<amv>gX1?wzIVy_d@;=B1)KHZ!ejy@7OXXedSOGIYOM))($K2$
z??!R2W6E1Q2d^|iGt!F}wc)KTPlXx>wKxpFA?S1B1i)CF&W}W*4?!9`E-;wT*hvq#
z#M)3_)8W`LO^|25GpT^#Shp^iy%u{ljE)PVgU*MJoVfIJ&jQskKy+Iu@E)w@B_!6S
z!|?Zg6b-3ov=RW!djIYtpBU2~)Bx`&f&&5J0YL$KI=YxK{?Sp)98KNr0aN3TIq|Pf
z0}PlL0iXWgy;UUlD1a~{g`ZM%elGTG4urAM`cwj~*}vE5_OUH?X}lO;ZFLpKSR3q%
zIiviJBhTwxy2ro_p(?rIdb>nsZNQ=_v{qzGllZ{u&V;5X-8q>Z15HChExH#+ww^(Z
zVIB$^!oA9z0JL_+gqF0Lpwo#tw8R~nZH=*HK5MYZ9*hC(JvGdFh=JpfJ}+eE(YBn0
z_rNk8;>)Eve%8dU#D|7Z$z)m3)Hp4tu+$wBWnn2AJ>cY82^mo8?}Nluib7cQ_&#dM
zGHia|Uw3&IyKrtB%DTI3X>yZ6qyu)})S!RI%3kME*}Loq%G52IoG8Z7B@buXLos%}
z$M2?yTexj&NRw5x5)fI-L@A<nRI7rP6O>>*N|Yd;?h0p9f!l17ee0;z4x)VbQt3H`
zVoJoRAAAQIRf!_{=@ccX7tK~a%6(|g_LAyu6)WorFgE{Nm30;E&)5J$TOa}gLI#NK
zrz(Hd;}Oo1!xG1pfA@><q_4>^=YqsBiAPogqHZi1_zjX#9{J)lNhFT+;B{v}1m+64
zrZkKj{SAsX*~Igg!gk+Ra+p|4Ic=fM7HdPD;vmyBFX8sw%v?eT28!Yyt|)%AM68K1
zREwR*{_3uF-f_N70unq|P^CUQ54q)*eb<~(AO4*OE|DV^7(E%Rg>%_7G5)$GaE23n
z=xZPUk*2NcP!vp7h${`M0EyABdj&ikiR)Na$563ImT93UzQ_fN5nCWNly4!Ih~Vy^
zopisW!KY_J;!LoKVq%Mem=$A9$D;**E3(QfC#r6QAnPaSCq5H0*@2X17_hAkdK>U%
z`jVSCr;v%?Q|`z()_}qV6IV~w4NP?l%61PYd4oESO3er9W~@@D-%58kbP5BRiiM!H
zMyWX61tp(oe6n4EU3^<ati8X>k(!$fn^*db!;bL#N4PYoQA{U`So1A(aZ^SSCD;{T
zLh^Yw63-iFLe!`xVkftTi10HhSKwh2+4dx#L`vj_TRde4Jj)<XPU2lWOXet`oe9WI
zgshFPwG^tlbiTl{B3mYo-a7bLlv9MtT%4v)VVNBqeke6j6WB5=)je~Ln~p~@1|w^E
z&})<XeT0{vkZ=ibX#$j<KM^xq<}vmy6L|$5!G4JWsp*d>e-9o^BoSj+3&ig5u&MSv
zZo~_CiRBEW(o5(*rW+$Qz!3VPA3ZHJwAgm9JCbMUMSAYx*^N9xeoh4KbjFpd^X|@9
zIkW{@Hun_VjZsy2{ll*P5{`CKz?*_|(fq~0X8*+(a<<|%2W2c19~onU&<Pwf%L<`)
zN?+fb$P>QcLB1iZA<^uE_{u8V9q)dWQh|~LPj04ZqzY`d3nVdvnnm6Xhh}n$kZeOg
zccT^-sMk8c>jvd*EGa_eGR!Xse5><}n5#j^go3U|OEo124b>?Hj#dV0hys)R2DP?>
z{Q3+JWBEFj?%iXNo2tp20m8#`BiB8QhkaN=A$<~Gfjtc@{EYynmS_T$sP)ZTKY1v#
zic<6V#<$c~?06Yj0hOS_$Yb_kV#zZfgr>*3FTdQ-+PGr+&=M-IE57=0kt2EOwny|9
z_JoRUidig_m(CFCk5pjw#mqoTSrqK2*Mgy}EXz?@ycaNaH4dbXl{9&O1HJ`kTn0zP
zt_Oa*Wy92to#xC)@XV0MXmofkOKFj{ZPeaQ!#YE<_q_@>dVEp4S|c0DLwK&J0^?<I
z68d`+7w~83g16rb2=CSj*x)uP&mhs-1c2i;$Q}9cVv0qzv7dkr@c4x}8OZ7H705?9
zfE=}Nx?Ln}-L)cosEPfgN;UWm`Z__@VY6A_bl+xdhei2XUrc{MHzE)KH?vyWd0ati
zu)6Zoau>}8SBlQ()NDR%yN*?^i#p%)bh%@ogJPdm5y9-n<klIsE;c>%$;;l4nZ<Z+
z&g|@W;kvnC0)jVlPSDJWn=K-WR_JToyd~90k|U;%6#lk;nu*mJ<SCT$Qi}5V3{nox
zaAZYL7GtvG%_3GWs)($C;!7L<_FP?HyK}%A9g~-D?A=0L_ueZVldTPCmonqzK1qcR
z&Fu1998k^$^rQ(+CyiF*&)N7WZ?QCob^HS2z~~juZK@5xH9s&|veyluzE=~Kq;hx;
zqYd!3B+c;aAbUr}UGBLuy$AX1ZgEA*QLoFCz$pJlCgJ`{l5Te<ciPU9iD0EfISdcI
zvTxbafn+X>J1VPx*!(@Rk5ile>RSb*tEBiKihUVlII=mhYC5wp%kys?=qvPToX23t
zu$XktRmIyMSP!bx<aNRyQ{Ca$IFny=8}u9)uj!?m-g9fptD>ft(~3$h)!~!dqK00D
z;`B*j)=@x7o*4w~>5_7zS?6p^Sw|!7cc?CkNhm{of5&Sz&)mNX@wKf8i+}j|M%Ltu
z9syZlUDmxsSc_j_LAsx4n`HJtUaW+;IX8_zdr4uU=%~akHLo<Y)Clj|yniu#abviG
zc;F`5iUVF@e0Ef?ED?Rug{vA)#72^}_%=C>OPR78&-+tRDzzgWkayfo5G-X{?O@Yr
zPG>3ScvAG6YHV;RhQn4v{+&LrrMy!OV}w0yEP)3^9^$j$nw3@!HLA#^HHF-cc{4ci
z3s8+Y+#?7EZqEwWrOd7}rQ?<gL+`E|AYN3I9f$84+bQ(z)TSh%i>Q0M4aWnoY>|tf
z#1ES`8D|w*dZ;R?t8s9_Q8gP9PJukv&8!hj=ffDqS{qg(Aw+alzYRWjlypjBF)yl~
zSK{da-SOwZxyeyHu5GDhCV_p6IG9Oq=iIK=?cH$Idm-4w_sfw&eDpCuB)kB7z$ey=
zIlVr7>E14ngWaR(8zkj_#jrH{)SZ^9OCxyLJ%r{6asrYT;!N`qMLDXXlOgyBh~$;h
z_?!_iOa6NvEi(b<ItB2W90U*$%3t%Sg`=aJgQJ_d>kqISRg-sIVuI^H+<U|1rfBw2
zn;Fa5$7(XaxnLzAkY=P-NfwQa+u-Gyiq~bD8|uM%p}&sm{G4B9>)<BdCNaB4A(%mm
zLs6Q9EkfnMUO3>jHTRh)@=`9X0+=4A4l{1Ks=BkXwH@RPr`-wK#461*9JA<Vbt{?2
z0JeWwPuihJczYKQEvzh2ZxX>y8q+%U=FI>I=D2Y;Z?Wg-JJ76*f*@oZQ*|TsO9uoG
zS@inq%5>sZV}s5ii3fg@kDSO5Fw;8OgivD=B0c1UQ242P#*{SUefWHw-MZurr=%*h
zI9ouAv(tFyei-oN-`-81B)-kI+3XlM8<B2TzVNlFsjc{|f(K0LWSOXppiqW=fpp+o
zanSWv+edmdp9I)s>x=-#(NuyWN}9jdkAeN;aDVFEm&X_De0EZN(ys8EJVVKf$#g=a
z)YYqOPnt1*D5L4t33k?CvZ!4|UHH@vwxN=dRB5kwX8tVni43>CAs-d6EYcxmC&@;F
zN9$e+dg$W{FG`85AD&+xd}`r1eP$%oD(s)Gw$A&|3eqKUF)XnL=VDGOE<kW`2X)gp
zS+;Cz@i-Oj^G0+KL#s61+z6RSCN`k#H$+}zQO_y_5Ef-uZcsP4O~fkq-vE+@ZP_|z
zRAxwrXUzYS$Foyz;tzR90OavMm}Tx@_P09J<rTj(A$3&uy?N{Bn4Qd^BQDRa6!eLB
z{uy|{87F$)bU{J%^*QcxR-`N{9yX1Pz<0Hs^Lu(lm7zNNai}|rn?$0w97#U+mWm_m
z#p&ts5n^PPC66V#)w_2cPFp_y=eDy&BD(-_Ad6U~afDkIU9A=Y!~yfCI5vKWqaZ<V
z62eXa(;21N@TWN1aes(|KtX=08!EOIrY6dp6SD0?)I!?gDAEcOW3D;*GePb5a$pD+
z72WKcPz%!h^+b=*hq-ltI28Jh0phSFZ*T;Ng9adulxaLOKXiEVRL~DA+{nD@@Vhuk
zbd={3!-S<h19cFx&Olk+*-{d#+@)nBq9v#KWv9qVcUkW{e~JScAPxjMv?QO<dmWp&
zq-gx}>_>mge2yRDi14U3l&F||pKF9+*qH4}H|7rm5Qic;Yp__<$6J6n_%(-0q*IkY
z0mOlYp`7&4(IZa@S3ep;Zk6aQVIl21zK#;1{PO-C*NeZecZ*gyYNa(PjD}`F>!p(!
zOwVWtJR?9HBLH!nfjr_w=q72f6amD68Sid1V)KVMPMIKbRxlQOgKickx>OIitQg%_
z;zB+G8!O?wO65~h=OV{iV+8;mzW(Rn!L%YuT>?->5#Ztq`d@>Go0Yk}Ipfb~<{#t7
zk+!1a5(ior;=Cu3o1-bE2M(lr)O>9wy*zH8Lj-|!Wa_+9fzY(HKknl9K;X}<#u4cA
z_7TRqK^XHN9@!Rn?C>Y6Ya~??`?U-bIp(7(1;|kDzdybb5SEtDoeaX^qYzUoE*d<$
zjERz+dkZDi9Ip`EFjjg?(PV+WKM!r_pnkX77<;?c7B#0XW)f`VPcrAc6rC(HmzG+D
z_*u(fhg#amVN^T@y*<i_8tD#dZ@|vFMMGCVidmj7c^zwL6(_z_aZ)Miio<1-AEG)k
z(Wl$eBu^UEGOPyz(mggob-^42-{jj(pkjA?_*Uly(r1+(v8D3#+~x*ncj#)%==VA`
zO$}9!0Sm2m!cH}IUQteJOqI8|m9)Cx{-8!S1apVitsOqX6F@bmA;lW0EMpRHDp!ZC
zQ-yAvb3B^ARj}*%MZSE=8m(0LIAdpCr&R!9Mu_Wr*SKh7>blT_o6yg>dloxx(cE^h
z4nMT1xqJ3ZTR9sZ&6)RhYRd?r5`Xd3@+<7n`}$*<JDl!08*IPuU@NKu*?O!?G5V-R
zthMh2hyc*hngT1emKm6jpgP&~BBS~ScgEB60h@Pgq=k44R@!h<t+4}96%L!Z@b=*T
zwmL^pd=N1QU+`}KZsYTJNI@Nu@iP0Y&~0_buIHnPLBc}8oPf)VDa=_f?Sa>a&y-zH
zPu}cE)0PzD(TurIH%G(K)dJ7YZIb9`@<Ed3cL@Vx1({n=$Cp@WtQyYbl%&p`=%1lx
zE~3WBlDT>^WWk?vqVTT9s4dbx@wj>V8rSiGw+mss{9PuHy^ta!3(&JX3+91OT*i6y
z)O3s`FKN=fxukn-c1%<Tj!pfv`rD#W2fI3?Vcb~}WhKuY#PFDJu@uk{q(#uCU7rFI
zV2)2z4(8p{9)e{BH1-(8@#SdcS&B$0Gc2N;tl<LEHTL0NJnZUyA>Fykr+uRFTBU|y
zMrlF`QFh*+^W;$BX}-hTe4hdz09sxmGt{GYXRfD6bLJ+6CD{=urQNub3gj=Vu-2ng
zOS95BQd}F27Db>o)gHvnNZNcS%-QR#6NW!YMq?_N0Etw9b?mGTzP9ZUzUO%cs({h@
zh(I3KrdSQpY`yoE4Hk)?6&by=UEvdIR|qw(sfi3cn)^qMLALw0-Z3gQhmnm<7|!G`
zn1+H?36J*l3z;>(>f56?ks=*Xo^^blEl_()hS|+$WDBGTNSC@_+cux7xO`vlH`}Rl
z89T`)%9zlsR-)%6mKs*hd#ilquyISMNjZzG+sTjkg$W_9d0aQi`l;z+*Oe_<n4FyQ
zyDi{R^!&xt+1@(A$osC$h>4`XLm-!F3H@AvT~$<hK6yv$`_=A1^lc>`O1VD4{02II
zRxUdXi$vKZo|UTvZAQ0tdZpg*+hB+4&lOc+Jgm*F$YW^Y5xV(x9JSoZA;Yk<Mm04Q
zZ0t}v#5ET*S@-O=Tt`L{AoiYzh0F8<u$cQK*c*Xn0@FSdk0lOS$%9|ANOTZ!;U3n#
zqGn~5bux}{op_^@z8vAe&Tp^!qB3qH^If7S@utVoQBzXNPAV_ivZrMdTsSY@3^*x-
z4|0K5%dSY8VDy?NRfobqswOR%-H&Eg>M?UdA2?kb9}9e}QH4|?p2bLg2M^Dh5(Xs8
zMoIhXf;#G>45Ox2ST9{$2hnp@Ee-79rY}2Sx>;UVFH5@Ual=mg!LQ&gmRJumPHp7;
z;CcXlS)QU0xt{0ys64}U2L;_Fxt4xz+188L_dN^Fqtj59+ZrFOa)vP+U{r`hylEpL
zTh+ffB=dIBP;4_wrMO_dPN+>iLN5zcfGvUw=)uFrxD_|>GpP0D!+b!#egwgRROKbo
zSr5Q0CN5bIUVOsbQhIIXwzPiV5H4D@_>mX|?S>Q`TI42=E`5(TOpAZ1jZQihnFU!L
zMYCAr2$`GAuEch|Y;}nrO}He}CNTv#gctkGiEpZKp%N$ewx27FcJ1vV-rYxD!pzaU
zWZejP(WIp=q*^OPi?%X-$JAY4M{Q(&X4`rkZw;XOX^qJ*(=Y7eT)P^!wBND@M#l8G
z&NkZzn6%i$sF#U}pCNAqY5Xj@Joez-hi>zmNbbDyBZcRM)C}ulA*aEo5#sWk>q0o*
zvr*eFR=7`VjBp;pp18qwQpQx0^G0_~SRWN|yDo6Ic)c4Kr#qTojH72`_qs8Q>Yd~g
z9KsrWKVi1bsO{&5h}QwW21g+$jVgDREn~Eo4@rSYbWbl?@Amz_xj5_SYP%8)2#6E@
z7w~a4cXP9Lu>6U|4Vr-KOI%3)hDNVFlb1Z-^i!2S){xn9icd3qTR_YsTcqfX7Mk){
zu0B;tD^Zxwn>Wdo8%yVA&B9Lnj!2k`ot<4{7r9P5(o$QAy^~S`y;fcEhA{emI-?Qh
z97nn5{7dWlw+FAsM@PbO>F5-YMh^(Ic6qJFIs_T^VUsBh$WbL<Qk+rXW$59AV8s?g
zCbHbPv38US;i%+L6nE`UP53&Xv0B=a!%0CV<5J|}v>q~<WG2m|=mY^0u=lJ1z9V{S
zlHn}}d<<m8NFnRTL2SoE1243=cIQlqS*uHZkyFa2NAsuF2uu91+Fe>ta$bvh?+SYD
zVZlur))+)XyC%6_a0}AZ)`ZG1J5IxjL0kt<G*q|f{Y@Q9JPiANRb<E>SwunisI*d+
zk6RK-iYC=82b&%83p-(YEOv`}>Vipxd3oX*CxPrFj+$Vo;hdI?WZGUTs3e3u6mC$M
z_bO6mWqC4jPAA`$Nvb)dSPAWi6738%`hGbGBr8KpU4l^WPKB;2$}2RW7l2I>PLq)`
zajZoZan3(mQ;A>;2m&tE{O0%eD&>=F)B6Tr-O<BHt2?iLS9*NwD!511BGY}%r58RB
zWJ$QXMcD|}8zP$uR`=vB`HcWAFZ)Sz_=B14uSZhd&&1NP#ItCQvtgSci7n)Y=NWUk
zag`)aHf>2au*mJ0Ks$?<n4jzk7~vV1R3xdEUbiX^V}cWRf~2Uo@T>DR-^^k+45=x6
ziaFGnQ)he$s=^&HTB;)4Sx|zDRe0OsM#_0ue+4uAnQ8Ss66IB|pVhK0E@h+W+TNfv
z{~UYWGZzOZ)Mq>UsBV4ULwPe1zNOoO56I31-OMLnT??ot<T(Nkd`G%N!K%_e3_t}>
zMzXM?wDd2=pyll1Tw=85W5Rh(xL1Adj-LLChI=$K%twl{)MSYD?yCpOT#T2oO@&B9
zBu6@Pq3qJgsNG28E@uAlgbV7z4npKHQGAU0TYSfK+y#@hdRJ4zzWi+8fs<HKM%Y+&
ztu_yv!QzrRrLf*TOMFQOqoXo5nB~}7m;HfAQ&YQr3K|#Fs`_q(v;jP`eAQ0_^BlHs
ztOa^9zfyykHb%3>tRMvGN;Z=$v(rs|j}FLwNa^ghtmt}T?URw7JQ7CaI)kezN>-%a
zAT=<-Iy<`^y3vYT_ge*}7fr@E+l&+PMAK49Y8pPTD*S*bbwar+EQ<5tto4o0#`FwG
z>KhqnJ0C~O$cz^gf)(yg!87El6KLG+<J#po4ZQH=(>&7ZuB;*oJ-K~uN*If!lb|+9
zKf%?m_Y<cAw(6e-OP3GsF$MFAgL**JzI4>rQ7sTA7ZQ?#8?uk~tVp(aLXI9Y-A!xV
z2GMk|P7+|~<QoQmt9fs>N_9zrE$7{lBRCwaj3HO&l-z?Cpnz}|C4*I)W2A<arqhX<
z9K~AoiW5eA7+az!;wuCn-g*EHw<t@NZG<(vxIo=A!L+uKL3QUlm5`BdiFIq&Z2Kyl
zSrE-tMyo$ol#)riUm*b#<gHmoYf6Pb8a-E=m4u@Sw&?6@yv=sDauuXHT}JO<#GxkA
zo7#518z1NWFzEUS7`^_T^X~=+zu>_F0WB#5Ryq8I?XGU#cIK{{)^1kf78d5FZa)XP
zBRyT$r6!aBLDpx$2+I3yY_4=#`l#d_o73IY_W@2hp+AGfOX^G9<Kct}a4?$mTiAEQ
zSNYz`P$-YajCUTyuGg20YaIEvy-93HQ+7-~oOoV*7yT@6b1XszBkrf}yJcB1=(VXx
z1aRBW-OffHb6+km56v?=!uYO*gpv(92VU%I#_R4b?zpb!{60^6W_Bxz(P%928rsG6
z+o0b)-Kmp}d_Q+$>wE2wJoC-~SwxRE(Bhfg<Z!np*+Dj{6st4Veo!D&9K=oKbNo)4
zKu}Mo1!kPk5p=X+%^)!fu|(GT6_$quHc^#fHuy?XfV9+lDzMzb0QODWhI07ZL1;u{
zcoLa8VZ9RP5;i60Y{q@_TolGkrZ*?-1oF0C66R5eRj4;GRa9W#`q;5dODXI{%pv#J
zddt-#3pWJJ8zhUM>LI?Mcrah4*l8hQGe@Ks+v&|C>Tf>IiP@RfXL0RO98>sk)NM7n
zX)T<gc^YUpew7xoKU}TW9)(;T=xX<l66?hvuGn*DyEYR;SOrz53wtxBX@_f3+Aep3
z;$K>QX39`NcWuC^eE``5sstsq07i6n89@aP;S^EN_Lu-salWG?FzYp_SfAJs-@}51
zC);=Bm~h|QyI{mOE?Kn&<1rwD!M|<F$J2VRVlZq6BpQF~Vg>AC37U$x@+P4-PI>I9
zzR01ykWX(z#boF6I4HASiZc<h5i>O#T#@IXWw+JA=Ai~onmud2uo6&UN`J3;|7N#*
zx7uw~?FNJ43e0Od<0<PWW?Ui+IDyq=@*t@|3CoaZ*huJ*TR&7kgj87u)KCK7m~TCa
zuPr-MreD(f?+9IsEa|5(m#9Lvb90Q*LiaCbICBRRDTLkniXys(pu3IN<4_P7tZ>oF
zl|j+f@SY42xK#w~#I#*0R5KzD*I+|+9C<-wKS-E^D^<<tP_Br}wMBF7Gk}CNXVQ<i
zR)fH#R}m=JDo4q*s<LjBuhT9WyVO#eZO7=KHIA2n%OA$*#59bTgoy!mzyLek?d}p|
zU6rghC(FE_Ev58ksWS4|rEnjKheU>w=;b&Mq}+LCy*%lR6``Z&a^xyz%}+^39*;>1
z>CyMEoa)*qP>4syFrtM#Qgv^Q6kZx4=jh<`XdFQgtR5h>AH2FKfRn4~l_+WMY<P@~
zr{DLUi0oW8LZ$JY6WnobD@WWLhI&?)#eC~`cRRE{YZ&J%fieGL56;_&wc-Fx{>mXW
z1>swNUn-u$u|Y<dqq8~9@Wj~(*Oa-;7HYGlcHR<_NsIKU@0lV)26NU^vm9d@7!6&m
z)kzb08}(atVsx9|zUh|-bs8Qe0pn*HXM8Hc@1|XEveS2PIyKIvmJUa~PYoiK$ja^C
zp9X38aJjDbKm->DUs7;fNRv75w1;@^%{;C@I=K|~mDV%D5V#9Ddqjxzj7iM(FHoZ|
z;&NMU9p%A%n+Gn(o#O%GPCC(iK^bBU(oX`eYba&cZNBU?0hSUj!g+|V99p#9s|~v>
zq2fgL(@%7X59g>o;-krkqf9x)^IN7r=LT{g2}BTDQOO5QAQw1dj~|Y7OE?*x0v<_E
zmB;v8L&|!Y&dQ2Q)QmQ%x=QxdFm=T?KFnv8ERTz~B!?54YJ9bHizSH@TB~DQ9we3A
zcHUoYM-B5s)};mZkQxYB>;thQh?3xzJkUWzJG9Wsa2tM+;01*dw`<78R~B#7z%%5u
z!cJhCBu?O=bX>Hh{nMC>_6U_5LI+<WN06xckb^CGA?KU8*mh{GySK7rYBg}P$Tk0T
z`kcTCTtaw30pw13>XGm=lo_}^3LmaI0ywBkF(jxOg(C=(z-BLe>{e{sOB>)w{R_hG
z7ZiD1z8^(OilxYnxOq#0%>ia%@t?p#271>$l*<6_tiB=w+V}UN6jqOkp5Ji-0)q?p
zF?Bc-XiE+eqC{>LjL6c#ip+62W-YrN5D$d1pGV+D7h&g<>~`@`0v`di5BB>9)*om4
zPBci5?MEnZu0>bD@&bl3fxc$9F9|=8I)bFKa$+ga|BM6yoKiX<T;t1=QmdaNJ9)iP
zm9p^FD1Su6lP1*W$0-5?kebf}qVXfPz1>GY+TphaM6@i<;PAKqldTnmX+m$*nyi){
zC!3!xuZ#k}{D{mB#C;BZJEKehzq=VU$bm1!y)L|2cWuA4no#AsX6Gif8~VjfvnUV9
z4h|2IPH#xrrX+C=|6=qCs%&6Fey}(el;4L(__b+jb`rVq8#ffbr+{sL4S1$TZ!DEI
z$5o+Qr51gtr6jZONENKU(fQ_-<7;$j(|N*DH}3lwL`TpaLE%Iz-$*G(1PHy5GRv-*
zURE>;dtZT(DVv0_H+0gGJ<wD7G3^E3))-A@U9}ytmjy|lLAcLwvFY*ee&-&Y%^?5M
zE`BNT5_7Un<rdUbjkZcVoA7y~-;JeRKy${uevWnb9J70n{Y$j&-i6FL4ZFV)EJAjb
z(a}ElOQdXb7<>v*?U<S6{IRT6;1>KW1VtqjzQ^6vyz1b~;*2V#W5Be($8;C3y*n>!
zbQ2G^Uc)SX@^N*tM5o^dtKs(6m03WLFCOnjf^~i-yrDB)__iUi@MXN~2fI>v#U<wF
zwy(tzrg_|Denw=mmG6phK_4TFn28fTMo8JVbJlTk^m4PQSn*NxT1RT=Kh<b&5fbXn
z+~4ngZ;V+eURPNv-@D@*3n@pF;rd1(BX9<MnJ@2(_`1)4cWFX)v#z!<Ib9YaTd5lB
zut1IAanO>DIcPl83C^;RQ)f9g-&vRTiQi95yQ))Y4@+HxBQ|S{77UVJL|o}CH&d!^
zyW9a=9oynQmRi~AH7a7m5pJIjwf1=`p_;5PByS37<RYphY>1_{c0#enwx0%QRL3Bu
zHCbl<7~h@~HfN6j%Qh!@+b%XBPaASD1z5fyV%C(RP-n5TDI4pinfg6MTS&RLA0?#5
zcg?jc2?Jp}^kTbZ$P#tc;zo(oR^y3^*BxGc5#dlaH0xrQU==0aN(`568f1L6b29?y
zFX&AVrQ<N(s^++k>6qQf%O^J3y9eY*b%<i^0YVXCAN&ok4|WB~m~fx^<6e9z)q^7;
z)sc*veDKR!{WB}H7y|7%l2@J$xsf1}y{JArd=0nBpLG$BExmk!3a}N@29lQ~gGW`(
z-B3yxTG4|o-Bd`TKKiOO$4SXY>F*A9q?RXo$C;}c9oncYyuiDwegBy)fhENm0VY14
z4le9%jd8t9?nBPOj$NG+x7HUoZ4@1(>J_VF-U)t-GbNG<04X4-x=uYEqNRQxvODYk
zX7ag+^(<ML;B13a`pUjR&KU}eUCqI!!XH+(-e9)-k#COuHl+rwF%jSTHY4uIZ1>I*
z?qQ<7d7S>hPmSHfz&xf+hextDLwlv<eWP2S4V&#t5-YFecfOuv$AD(lYee3=BfoRi
zGeN&bFw6Y1rEfO#VRJ<xULyGo-}szZa^(h8x0Upfy3Zls_(KV}2BcM{9AII>5@qcV
zTNM;1=k&M+ZBhAcnQ)COMz*x;2(Y_JtxK5H*_Tc>PL(kz-5i-N1-_en=i#up!X9>i
z48tKgqbC$%$e*EMGf$q8T=b?8x~u+!MQ7qv*;J8(dn^U{wxl?!+V1t~%~!_5hOp`Q
zlJRPV@Q=H#Ia74%rl|VaT?P<$;*n1opkC&7)C-r#shzKa|9L4qa+sMh8wLpIKmiB{
z@t;in^CI}KAl>-~NJk!*I1jq7%;#Ln0YEyO%uR~s50Dl?`V*uBYN3Ax>BRZRFLivI
z`(Ft=aqkFZMLXY4r<J}wvGMZUcC<rHiz8ho%Rh6bK6bUg?h6Wb8SM1yj=CU%72TVo
zC_JkxS1`uMUpn<C61^FmqYKNF%^?>CPFompMlmzwI4n${Jj{E$ql|~{I9S-T{#Db2
zB?_%mPlC8@V}rujI_NT<6(d9}XQ$jMJ8jy4dfLFdNz0PY%o{<5vNkylOu4Kdj*?wi
z8qI=lcVrWv%9T#jjZUoRY6Iw1#$-*lcVsCo*|LWZ;(G@I<%@64a&QEv9k$&j31-@Y
zXfeYq`b)-n!%)ZE2oYl89<&?`NFtP(|3kvgJ48>d1WdvUDy#Mu6h-z`=*!*&4|IBx
zS1qEQHzA|d!hF|~g)Un<6-JhH2-9gUF&`wGZ+B#h1>pDvqw=|jvLA#!uI_}PcqQ0J
z*1}s4@wYc%(&`XIoFLvpr-Fy%1!5tKe3$B5--Fu}H}G49YJ<oOrbR*nGAh>kRH21u
z0#35448gQ)KEg{7U>rRN;vnbW7u>VE6hXI%4YvQa>l4y@rn{lUJ=F#+rdq?V^RBH?
z7)M>SsRFxpwfL{D;XT!4;eJUNHBU3FF~MAheoq*6jZnHs*$};-Z%shJ5I%kG?g6(i
zIJVgm0!N2@)f7SafQYNCL5IY<{Q3G6T%?jSJ4ix=R24Y+u;H7tCvwsWi9&01_xiC#
zbp1&=kiqEzGB&P++H|(gnG!^<b;NmpP69fsjq+EXLJT$luQE>qc2EF2$df#UJ7?dp
z*<YK+OIln{W0-_C%Os|-Duoy46_t@$ncpx1!}F?S%doGCCV(?)*BE${)M})4#M2RS
zUIsU*70rAezNj7YdYHCB9vU|}Bp4kgOuD8SA}vYOkrM=PET!_bSC_?90s4U$grPho
zog9wpyeM9%UH^CRk#@=(d7rPwFZ{Oz<|$LHpW+-kq75{{Za?)VFTr@&Ft@ItsJ!SW
z7sB5-6stzl*!M~c@HO^*(7!viL$*(x{z<VHe^V^f9~9dQpjfj%DV8w_K(QMDiZ%a(
zVp)EnSO|nl0&CxF?$Z@pf=j!W$PxZY8AQu*UM<l{HK)}+9f3%)@hs0X1b-jGUL*yF
zWG?rc{!~ePrK}ZVWvBWncV`cou$yoMoFCxD?$UiQ(1;*3Ui6smAKPbXQZ)>utuvQV
zx#VqE3sgj;0{^@lj(N;}HPq{^mb`=}z%ZOHDT=G>L4YpbpET-;AaIg;hZoptE(Dq9
zP&x@bghF_eA-OBYBXzsA7q~4q!V_&g|1SN0G(DX?K^JC^+7ab|apa_NP=wzR<p)(w
zWP+hto~pT|k7t5atX@z6k0i1m39xX_ic{~lTZ8P&1m-FK55WFpO<wQjkSobmFgi<z
z$t;^hPGBfPXYK=AqNJb5Mzo;dZ=trspIrCqv;_Jqx!G;WclS!_k>m$|D2)r8{U=`j
zz~le+K9o+tmLUCu@A|@UafWd{pFMw);Gb-)5T@k*PUa_R$^zgKme3g*A}p-uxIhii
z>dBvA{GY68rNI6N#NrH*If5jxa<V0IIt-jDtOCLTIXj#gxOtQflW&tl`jd}80R9nn
zKK%nB?}qY)7=H5WFLeJ49kYGR_yfJ+%>c0hU_GGCw?n_Tnf(Wq;;Z#ct4VhM%nh*K
zX9L<38jlAQ+BVcL4~T_u;qQF>uQtEEwcGGlzBnuul|@ooW2IWNAp(t~Qz!tT0T-+%
zAITezYV5+FMy~lf2|R^DpoU(}^}0D_a73UB5(<Yt_WkX5+7-vU)VQg)Oae<Y(q~tL
zjknSq-CuW%rH(tjL03dA+K`$kBL|4JEYF+5Q?uRgEm{&F;6)0mWgCHvqnGK~z)G74
zn6<C&yF=#HK7^mYHo>63K!|0{gM0|1H4mRxH;Y<px+m)83*0FZ6suN-=L_R3$sEYv
zIFRKw=+&zZmdo&5YF8F0<l$;+6<X3nI8C7$>RC5oAz02D*)Ll-gf%_%1wd?6H1FQU
zmvfpqe<N22|4^f&VeXe`*~T#VBBD-eG0XXtIW5pg+&XwUEo7dfGfh)P{j<5893JP(
z!h?F$mlf;srSum2a@5aDO|2~r&y8QH&=~zv%kgq^Mj4#qO(h9f=-ui!XycZQ&kcnp
zpKK^n*cY#o@h`h#Ir#BF$CS50Nv+Ld$!4+U70F_u-ZkhF<Wt{*&8=_k9EoM@C#<XJ
zhuimrjgh?Gt!IpmM`&`ASY!svI#k;a?pkB(Nl<NQ`BH^-LkdILXZYSJx^L`ZlGZ|g
z{1Tq3fv;ziZKF0aeq%(LyX5VR7k;FhhjdKs`z_{});DtLvt-fs0c>cTvbFij&_cV2
z(<EOi82Fpz;$ZrGS8Q(ui}(G_LQ%nwb98ZU5EI5>I-3M>>OUB{A+g~ZX&WH3?~3=J
zK0d*<X;gr8SL~Q<eNgIkICV=J)rPSD=xY}+A<nH^NNDw~$Jtsad(Zg#{cuTYQ?)&1
z_-A>9;+~Ur8-lgrpxHZh&W`+M@+KHnjuX(YWz;h|q_V3umfzl7X4B*oiQq)B>2nKH
zmt<+ca@Wg<L8|j<O9Z=xRR)yRi!7)u4Cp?9JApN~>1?<7K!+ZIB3BbA5i47-rFA@P
zV?xV4cLf)&5roPxo#(-TjA~Sinm0Qpp^t&gTZm4ryrv5q!;=$ysljc`*Rg6`ZW>VY
zegn0}PDCGAOqv)TSE}elHPq)&754S!PmXOS18}VR4~_-BOCKu}@0BShI@Z6axC@4p
zN}uL}3>#EO8qE4QU!(m&(OuEQl|y?74kL*HK3{jU5x3HRw`CBH!qyogsM_=WUi6OR
z#~M7z;uqDLO=+U6ppS5_M5EW}Iu^cASR85&F8_d7Y^_9{;kX80dGUZI*QXhX=iLR}
zZ47ULGMu&w772ZN{Q|8qI!Cop8@yVaF`a<z(eZ^(a!fm8rygZ5#*n$$hyhJch=lY#
z+9d}~DR>?m>>EU>%2bu?h*_fp->1ZQ)X>44o_ZV!gV)HrqQA*_$LP8eWepEI(S5|4
zSZ@(>LKARd#!C6vr(!^#Yr{k4M9RF-q_+3PN*z<m_omjqTWU{=m-F}}qw)`kjS>9;
zv8gTqh%Nd7v4Q}I75Hp5Yn9mCDv^|YQCI+7cKKlGdy(nBD6%i9wmU}|GUKW~L6uro
z8(B7P$VmE>C+0T_+zw)>4g%A?Q<i+R?J=_UO88$_hus9ZeR=@|O9fc=LjYLsZ|d&q
z=4h{FZ};b-e`_~$`=1Lt{%^%UAWDC2p%Xn(Ak1(O>uu}2$;;W}UP$luy|gjfBR{P-
zy0NhKTdQVJJ=|a@($XC<L*Ks?tqAs3oV;I9Wt&uEr;3U5A(R9a+&!JeK#Pv;$fhm`
zqGUO0+b-bWu=_xFzJ*#|AjZKIS(N?lhypH^Rt9UtEDx_DnI)b_+q04Mz+K<b?ZsZ`
z*0@a6k%;gC;_H37%*87Qe2C|r_z4En7eeI46)h^gUcb@gPeUB>R1ob(Ud<V0%doAs
z*Mo0X0KWwM`!|9hj<eWxz{#ltRDcCU1@yNHetiE*E{;yFKSe-PKn6sWNAy=1{$F3S
z62@#k|0tCU>kL_FBc&eC4c;~~foVy_@KN7tq^}_(9sclPYlU=1)#u1M9p9tVcw{CG
zyI%21n3p!NlFG~~#kTPnyuGVq3vx&#xhbWvo~oONOMODo95=2qhDB`m9A(PPI)A2}
z4J5#(Y1^+^e|Oj4d7Lxr1D4KZJHvc9y4yr__zID%Ri;UBAo0Myl#~)E4z`AaNapCc
zH>qi2CuP-PL+?Q8LSC$y{C->s_r_QRcD~NTlR=jWCc(Cf{mnyHa(QRm;<bUoXU>E&
zvNuZ60bb(nfEt8<N3V29uPg=-i$%Z#^<UBZ{}s48={lHkMtT_qdJQOrF==@QX?bXd
z(oyL~^(bdJr?1gaH_9qNuy^D;AmBkJGBD^Z+}`~f(oHhh<mBKQ4-fsr*rhFz{XX~L
zrQSj<4NnEjeJDiDRQiH~^z^LUv*dy;Y@F=XVrxU)-ExA|tkjgOf*n+~M1?3eSn4r#
z^-~eP1952ph5W}!HpCvLz5&Q%4^W_i3>YW?)fYc?!D#B}V*VrP1(eYJUo{XQbbg8Q
zil3PPC1g@h5j3|P`;bs&O-Vq<ePm?eLdznX_Qv)&<O?$Q*G0$QDnXp1pBEL6IEO6^
z)%TBuag|5#!hnSdq%>TK=eT{e$DeVxuw}_Vn$r_Y(qpmFGBC0ft7zDIO*ewrgJVs+
zE0RwCGBu!+Vq!NBL1P1=Nu2$u%w4<^_8N!wOOqQs7s(cmrV;hW)J=rF@^^0$q{bzR
z7WeBQox<}&VT#zf;6(h&8uMr`Ek&!d)HQmWz8t$@-DZs~5XH?JO2mZ8&w$A<$8YQ)
zo-b{lw;0Z1)?G#c)3A)I(Aq(Zhbu~Yvb4o38hJ>?2cf=)u(8#DuMzx$QFh8p!Q0k6
z$<eqo(5OH%H`2pIpX?sb6-WuKsjp&+d7`cfa;NX>G3Z#?CiB_AO|U>}^QDg2!}gj1
zVFu(ji*bK_Q`tNAlrYs*O^ht&nd#!QmvrJ4jWo3PsYk|@rvQB90n^HBUms<@VgY%J
z`zPviD6FIOm$A+N?3#sqUofr!s%-<5v;DH**}+ZC*u?IqY%7vh;ue{Z!cJ+g@k!Pg
zokcv_qB$y>8l*b*#l;D`u_Cmt6}Om++WiMThN?nKq|_4%oCX9k?zt|XE_BO}sPLq0
zZB$07hC??zD91V}1UV1eBol)yEe4a>3n(aox6JR)Kf88WRh%bm_=CcZ*-rbc(O=+s
z(Xxf4ABXmsm}XlLylM5XN`G|UJNYz=f9XP-a`myj=qd<~;{*e9i7hdjF_o}^Nnmv%
zTWQY<zM(FpUiVG3uH#CTYbq>ImUj8p$8@$rd1ZYp>)~whr8{hdq>phIMqzWXIBN|g
z={wPmzNYv~G-h*{=-LSDbpgijC7k<{mwB*Z@mVp%f*MIx+4ITuXMFv_9mRJyq%YRH
zb$5jB&WYq*J~ya+tcU3UlL}MtS<Sg7b!A~omLa;;;_6QQwq+|!O+ROwm|Q@C4pUvO
zOkG=g<&85wDhZwx5-XnTRpb>VP?9&{M0=C|aZfK{UW%URk>TMeVs=!ISY;ZL%sHM9
zB>kR@gyBIVxEZBqU}VlYAj>T5%g4botespjvioHPvwk*-5Pf1~C^D3wp$5Ar+{h8T
zNgK0E2@(om)N8@|9-XJts=&LLcTk7OBFge$=MK^_*SMZYnW~h<VrFk|p6sm$YCf`O
zfP_zDRdk7&%@b(70F?0W;Ttm#LjeTvP6gnB2I#;)i_1LCO;mqb{}VIWBLm8e^mD?e
zYiV9cA*pj~CQ>;k34Q>w_VB<RHS3kLsZexWEF&`T86iuLPk+<$AY|A98eKS9YGF_g
z6a1kktW>p{@o*uwj4YiAOA(l-5mLGQ<-#O=2`<x8s`M$jj7nIiA$zeHO}Db&0XTM)
zT7)W|lsQ99CWj3tV5vWyJcgnr_LAZFT3z3;+%bGY*$OW^jJJ+AG$HOeqX+X{u$_J~
zA$@M4`6e-oHWKw?o}jmt-ko_yzaUh$ISS59J6)k7>OQFYV&;RFNHtBv@n^KRV*_bm
zuJua(k?|%jdjiJtej~}?T7*@xx5>E#r?UC4X3Iau{C~#`4=j9k74Xh7C=d|Rud{)%
zlhglA1^^NLxn-&L0PYz8D5sbg#Oma939iru74J_l*)!G!?X#cAkQ?kZlTMh=TbPTl
z!_{2yDN~G(XS=?VIzQZ9MT3M==51rxtuLeNrkS&9Gfca^ZjNR&M^;{xz_B#eCm>Fp
z+x!mM2|q3>1Yetn!BI7WFjb8eT^3?6fc=5qTnE!95-ptH)xI2knd|y%h<H;;nJmNv
zR8!DSuOj?N?e~MgQ~O1(l&k)Thdt?<b@r=ODX??aVdnY)<B5g7i^Y7l#uH&b10+Fl
zKiXR)aA(r>cm_6Qy0om=w~jp6MItUrbOQP=sr^sow-U6GTa|bD>P}OQTFdYZX!~!*
zFHjW5kA(QaV<nZHQzM?*nhFz;6KaTVg&!EAyj3{G{XP~2!Rs3~OpC1_rK~p-%~&<7
zBpC#B&jO>hDv3Qugtt*e8?uP7*y|IRO-_@fr+pbP>K>4UEBIzr!nr-*73i%Ucg+%6
zqyw@W7Kz8Mw5hk^B+_oX?{F7B@6F&b$s{wjW#+{5J+}&X&euBL?Jjg^eeHa8?u3GV
zG&*9}jN@7|c4b^PCEV3LWkPV|4BsA_jcro3OEY*aaiyn7)Y|iiAVYQRHL^h&@w+Md
z<#t7ZqgFnuWHeI;$@%|OPXL3^1ICR1zM05h8u;t=KW;6eB>PVX|GY!NUxq(kj{qI*
zm-`j`Zurl#?OzR%0Q2JiR}uH`o_;U2{o7YD^nVoI{%-zzh0)*UCrE#q|D)dMcl+N<
zQ2w@uNBz_O*MgMa&3~^^_}iQoP_pnd4!>6{{O;oSwV;2yfWZ6H#jh(ve>eYqxz*q1
zn?!$^|JUNH-~Igl6Vu;*IOzW2=f`mSyYWA>`oB#9dz?VOWOsik>Yq9O@4o(-8~*AG
zg8Nrr|I8GB_wvsi=~pjeJimMSnKAwD;Gg-&uMVhrfq?#%jr?x@I|%;mV2%IJa9RNF
z{PRCp_`Ch@knp!XsL-GGzahi#9{xFH{%sHVN`!wofj=iuC0TGlsm+g63mHfkurgUz
I?8jgK587R6i2wiq

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4fe902d0fd7a..7727bc1a5e26 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2384,6 +2384,16 @@ DECLARE_OOXMLEXPORT_TEST(testFieldFlagB,"TOC_field_b.docx")
     CPPUNIT_ASSERT(contents.match(" TOC \\b \"bookmark111\" \\o \"1-9\" \\h"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testPreserveXfieldTOC, "PreserveXfieldTOC.docx")
+{
+     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");
+    xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+    OUString contents = OUString::createFromAscii((const char*)((pXmlNode->children[0]).content));
+   CPPUNIT_ASSERT(contents.match(" TOC \\x \\f \\o \"1-3\" \\h"));
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 06a695d68472..7aa85ffcdf52 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -665,6 +665,9 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
         case WID_TAB_IN_TOC:
              lcl_AnyToBitMask(rValue, nCreate, nsSwTOXElement::TOX_TAB_IN_TOC);
         break;
+        case WID_TOC_NEWLINE:
+            lcl_AnyToBitMask(rValue, nCreate, nsSwTOXElement::TOX_NEWLINE);
+        break;
 //          case WID_PARAGRAPH_STYLE_NAMES             :OSL_FAIL("not implemented")
 //          break;
         case WID_HIDE_TABLEADER_PAGENUMBERS:
diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index e3f9d1e626af..da26adcddd0f 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1416,6 +1416,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     { OUString(UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS), WID_HIDE_TABLEADER_PAGENUMBERS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_TAB_IN_TOC), WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
                     { OUString(UNO_NAME_TOC_BOOKMARK), WID_TOC_BOOKMARK, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    { OUString(UNO_NAME_TOC_NEWLINE), WID_TOC_NEWLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
                     { OUString(UNO_NAME_CREATE_FROM_OUTLINE), WID_CREATE_FROM_OUTLINE                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
@@ -1455,6 +1456,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s
                     { OUString(UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS), WID_HIDE_TABLEADER_PAGENUMBERS                   ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_TAB_IN_TOC), WID_TAB_IN_TOC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
                     { OUString(UNO_NAME_TOC_BOOKMARK), WID_TOC_BOOKMARK, cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0},
+                    { OUString(UNO_NAME_TOC_NEWLINE), WID_TOC_NEWLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0},
                     { OUString(UNO_NAME_CREATE_FROM_CHAPTER), WID_CREATE_FROM_CHAPTER                 ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_IS_PROTECTED), WID_PROTECTED                           ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
                     { OUString(UNO_NAME_USE_LEVEL_FROM_SOURCE), WID_USE_LEVEL_FROM_SOURCE               ,  cppu::UnoType<bool>::get()  , PROPERTY_NONE,     0},
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d2c9dace2ad6..24d4a18e3553 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2120,6 +2120,10 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
                         sStr +="\\w " ;
                         GetExport( ).bTabInTOC = true ;
                     }
+                    if(nsSwTOXElement::TOX_NEWLINE & pTOX->GetCreateType())
+                    {
+                        sStr +="\\x " ;
+                    }
                     if( nsSwTOXElement::TOX_MARK & pTOX->GetCreateType() )
                     {
                         sStr += "\\f ";
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 28ff7f92ff0e..ec6945f5782e 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -244,6 +244,8 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
             lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_LABELS,          0!=(nContentOptions&nsSwTOXElement::TOX_SEQUENCE       ));
             lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS,          0!=(nContentOptions&nsSwTOXElement::TOX_TABLEADER       ));
             lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_TAB_IN_TOC,                  0!=(nContentOptions&nsSwTOXElement::TOX_TAB_IN_TOC       ));
+            lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_TOC_NEWLINE,                 0!=(nContentOptions&nsSwTOXElement::TOX_NEWLINE));
+
 
             lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_CREATE_FROM_CHAPTER, rDesc.IsFromChapter());
             lcl_SetBOOLProp(xInfo, xIdxProps, UNO_NAME_IS_PROTECTED, rDesc.IsReadonly());
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d42137cc7e9c..57255088763c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2697,6 +2697,7 @@ void DomainMapper_Impl::handleToc
     bool bFromEntries = false;
     bool bHideTabLeaderPageNumbers = false ;
     bool bIsTabEntry = false ;
+    bool bNewLine = false ;
 
     sal_Int16 nMaxLevel = 10;
     OUString sTemplate;
@@ -2789,10 +2790,10 @@ void DomainMapper_Impl::handleToc
          bIsTabEntry = true ;
      }
 //                  \x Preserve newline characters within table entries
-//                    if( lcl_FindInCommand( pContext->GetCommand(), 'x', sValue ))
-//                    {
-                        //todo: unsupported
-//                    }
+    if( lcl_FindInCommand( pContext->GetCommand(), 'x', sValue ))
+    {
+        bNewLine = true ;
+    }
 //                  \z Hides page numbers within the table of contens when shown in Web Layout View
                     if( lcl_FindInCommand( pContext->GetCommand(), 'z', sValue ))
                     {
@@ -2822,6 +2823,7 @@ void DomainMapper_Impl::handleToc
         xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_CREATE_FROM_MARKS ), uno::makeAny( bFromEntries ));
         xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS ), uno::makeAny( bHideTabLeaderPageNumbers ));
         xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_TAB_IN_TOC ), uno::makeAny( bIsTabEntry ));
+        xTOC->setPropertyValue( rPropNameSupplier.GetName( PROP_TOC_NEW_LINE ), uno::makeAny( bNewLine ));
         if( !sTemplate.isEmpty() )
         {
                             //the string contains comma separated the names and related levels
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index a6bda94dcf15..776e263e0510 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -363,6 +363,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const
             case PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS      :    sName = "HideTabLeaderAndPageNumber" ; break ;
             case PROP_TAB_IN_TOC : sName = "TabInTOC"; break ;
             case PROP_TOC_BOOKMARK: sName = "TOCBookmark"; break;
+            case PROP_TOC_NEW_LINE: sName = "TOCNewLine"; break;
         }
         ::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
                 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index c6cf976ae249..33690bcaa612 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -334,6 +334,7 @@ enum PropertyIds
         ,PROP_HIDE_TAB_LEADER_AND_PAGE_NUMBERS
         ,PROP_TAB_IN_TOC
         ,PROP_TOC_BOOKMARK
+        ,PROP_TOC_NEW_LINE
     };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier