sw/qa/extras/rtfimport/data/tdf162198.rtf | 258 ++++++++++++++++++++++++++++++ sw/qa/extras/rtfimport/rtfimport.cxx | 17 + 2 files changed, 275 insertions(+)
New commits: commit 0313b56b931d78453ac5711d5f5f16eed38d02ca Author: Oliver Specht <oliver.spe...@cib.de> AuthorDate: Thu Sep 26 11:39:46 2024 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Tue Nov 19 01:13:36 2024 +0100 tdf#162198 Reset default cell padding in RTF 66b4bfe302e248fc1503c5c74b83f4fb5fee4026 introduced a default left/right cell margin of 0.19 cm in DOCX import but is was also applied in RTF. This is no longer applied in RTF import. Change-Id: I192b2d17018c234837b926be64fdf27554b024e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173981 Tested-by: Jenkins Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/sw/qa/extras/rtfimport/data/tdf162198.rtf b/sw/qa/extras/rtfimport/data/tdf162198.rtf new file mode 100644 index 000000000000..d211768aee53 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf162198.rtf @@ -0,0 +1,258 @@ +{ tf1deflang1025nsinsicpg1250\uc1deff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1038\deflangfe1038 hemelang3079 hemelangfe0 hemelangcs0{onttbl{0bidi roman charset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{0bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};}{40bidi swisscharset0prq2{\*\panose 00000000000000000000}Verdana;} +{lomajor31500bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};}{dbmajor31501bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{himajor31502bidi romancharset0prq2{\*\panose 02040503050406030204}Cambria;}{bimajor31503bidi romancharset0 prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{lominor31504bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};}{dbminor31505bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{himinor31506bidi swisscharset0prq2{\*\panose 020f0502020204030204}Calibri;}{biminor31507bidi romancharset0 prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{42bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{43bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{45bidi roman charset161prq2 Times New Roman Greek{\*alt Arial};} +{46bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};}{47bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{48bidi roman charset178prq2 Times New Roman (Arabic){\*alt Arial};} +{49bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{50 bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};}{42 bidi romancharset238prq2 Times New Roman CE{\*alt Arial};} +{43bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{45bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{46bidi roman charset162prq2 Times New Roman Tur{\*alt Arial};} +{47bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{48 bidi romancharset178prq2 Times New Roman (Arabic){\*alt Arial};}{49bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};} +{50bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};}{ 442bidi swisscharset238prq2 Verdana CE;}{443bidi swisscharset204prq2 Verdana Cyr;}{445bidi swisscharset161prq2 Verdana Greek;} +{446bidi swisscharset162prq2 Verdana Tur;}{449bidi swisscharset186 prq2 Verdana Baltic;}{450bidi swisscharset163prq2 Verdana (Vietnamese);}{ lomajor31508bidi romancharset238prq2 Times New Roman CE{\*alt Arial};} +{lomajor31509bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{lomajor31511bidi romancharset161prq2 Times New Roman Greek{\* alt Arial};} +{lomajor31512bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};}{lomajor31513bidi romancharset177prq2 Times New Roman (Hebrew){\* alt Arial};} +{lomajor31514bidi romancharset178prq2 Times New Roman (Arabic){\*alt Arial};}{lomajor31515bidi romancharset186prq2 Times New Roman Baltic{\* alt Arial};} +{lomajor31516bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Arial};}{dbmajor31518bidi romancharset238prq2 Times New Roman CE{\* alt Arial};} +{dbmajor31519bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{dbmajor31521bidi romancharset161prq2 Times New Roman Greek{\* alt Arial};} +{dbmajor31522bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};}{dbmajor31523bidi romancharset177prq2 Times New Roman (Hebrew){\* alt Arial};} +{dbmajor31524bidi romancharset178prq2 Times New Roman (Arabic){\*alt Arial};}{dbmajor31525bidi romancharset186prq2 Times New Roman Baltic{\* alt Arial};} +{dbmajor31526bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Arial};}{himajor31528bidi romancharset238prq2 Cambria CE;}{himajor 31529bidi romancharset204prq2 Cambria Cyr;} +{himajor31531bidi romancharset161prq2 Cambria Greek;}{himajor31532 bidi romancharset162prq2 Cambria Tur;}{himajor31535bidi romancharset186 prq2 Cambria Baltic;} +{himajor31536bidi romancharset163prq2 Cambria (Vietnamese);}{bimajor 31538bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{bimajor 31539bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};} +{bimajor31541bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{bimajor31542bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};} +{bimajor31543bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{bimajor31544bidi romancharset178prq2 Times New Roman (Arabic){\* alt Arial};} +{bimajor31545bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{bimajor31546bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};} +{lominor31548bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{lominor31549bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};} +{lominor31551bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{lominor31552bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};} +{lominor31553bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{lominor31554bidi romancharset178prq2 Times New Roman (Arabic){\* alt Arial};} +{lominor31555bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{lominor31556bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};} +{dbminor31558bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{dbminor31559bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};} +{dbminor31561bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{dbminor31562bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};} +{dbminor31563bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{dbminor31564bidi romancharset178prq2 Times New Roman (Arabic){\* alt Arial};} +{dbminor31565bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{dbminor31566bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};}{himinor31568bidi swisscharset238prq2 Calibri CE;} +{himinor31569bidi swisscharset204prq2 Calibri Cyr;}{himinor31571bidi swisscharset161prq2 Calibri Greek;}{himinor31572bidi swisscharset162 prq2 Calibri Tur;} +{himinor31573bidi swisscharset177prq2 Calibri (Hebrew);}{himinor31574 bidi swisscharset178prq2 Calibri (Arabic);}{himinor31575bidi swiss charset186prq2 Calibri Baltic;} +{himinor31576bidi swisscharset163prq2 Calibri (Vietnamese);}{biminor 31578bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{biminor 31579bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};} +{biminor31581bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{biminor31582bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};} +{biminor31583bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{biminor31584bidi romancharset178prq2 Times New Roman (Arabic){\* alt Arial};} +{biminor31585bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{biminor31586bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};}}{+ ed0\green255lue255; ed0\green255lue0; ed255\green0lue255; ed255\green0lue0; ed255\green255lue0; ed255\green255lue255; ed0\green0lue128; ed0\green128lue128; ed0\green128lue0; ed128\green0lue128; ed128\green0lue0; + ed128\green128lue0; ed128\green128lue128; ed192\green192lue192;}{\*\defchp s22\lochf31506\hichf31506\dbchf31505 }{\*\defpap \ql \li0 i0\sa160\sl259\slmult1\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 } + oqfpromote {\stylesheet{\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlchcs1 f0fs26lang1025 \ltrchcs0 s26\lang3079\langfe3079\loch0\hichf0\dbchf31505+\snext0 \sqformat \spriority0 Normal;}{\*+ s11 srowd rftsWidthB3 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blind0 blindtype3 svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr sbrdrh sbrdrv \ql \li0 i0\sa160\sl259\slmult1 +\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f0fs22lang1025 \ltrchcs0 s22\lang1038\langfe1038\loch 31506\hichf31506\dbchf31505+Normal Table;}{\s15\ql \li0 i0\widctlparrdrtrdrsrdrw10rsp20 rdrlrdrsrdrw10rsp80 rdrbrdrsrdrw10rsp20 rdrrrdrsrdrw10rsp80 \wrapdefaultspalphaspnum aauto\outlinelevel0djustright in0\lin0\itap0 tlchcs1 +f0fs26lang1025 \ltrchcs0 s26+ tlchcs1 if0fs20lang1025 \ltrchcs0 \i s20+\s17\ql \li0 i0\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f0fs18lang1025 \ltrchcs0 s18\lang3079\langfe3079\loch0\hichf0\dbchf31505+\sbasedon0 \snext18 \styrsid12846473 Formatvorlage1;}{\s18\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlch cs1 f0fs18lang1025 \ltrchcs0 +s18\lang3079\langfe3079\loch0\hichf0\dbchf31505+Footer Char;}{\s20\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlchcs1 f0fs26lang1025 \ltrchcs0 +s26\lang3079\langfe3079\loch0\hichf0\dbchf31505+Header Char;}{\* s22 srowd rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidthB3 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blind0 blindtype0 svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr sbrdrh sbrdrv +\ql \li0 i0\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang3079\langfe3079\loch0\hichf0\dbchf31505+Table Grid;}{\s23\ql \li567 i0\sa120\widctlpar x1985 x5245\wrapdefaultspalphaspnum aautodjustright in0\lin567\itap0 tlchcs1 f0fs24lang1025 \ltrchcs0 +s24\lang1031\langfe3079\loch0\hichf0\dbchf31505+ tlchcs1 f0fs24lang1025 \ltrchcs0 s24\lang1031\langfe3079\loch 0\hichf0\dbchf31505+\sbasedon10 \slink24 \slocked \ssemihidden Body Text Char;}}{\*\listtable}{\*\listoverridetable}{\* sidtbl sid3917 sid7470 sid19183 sid25664 sid69221 sid81193 sid84341 sid90346 sid140821 sid219325 sid219465 sid263898 sid287563 sid294294 + sid328071 sid328209 sid342127 sid402373 sid411808 sid414037 sid467972 sid468441 sid474491 sid477934 sid528349 sid536801 sid549353 sid600520 sid604361 sid680233 sid728206 sid745177 sid799442 sid813357 sid878930 sid936366 sid936884 + sid944907 sid993972 sid1005493 sid1066335 sid1075163 sid1124402 sid1125728 sid1201494 sid1250781 sid1311488 sid1326381 sid1469920 sid1522637 sid1584958 sid1592216 sid1595681 sid1596005 sid1600821 sid1649671 sid1736107 sid1784491 + sid1796408 sid1860184 sid1928750 sid1979879 sid1997447 sid2039780 sid2055703 sid2250203 sid2294471 sid2314071 sid2369889 sid2491014 sid2633353 sid2638598 sid2638837 sid2647454 sid2759139 sid2785105 sid2884316 sid2905072 sid2954960 + sid2967005 sid3018893 sid3024944 sid3033475 sid3038771 sid3227651 sid3291680 sid3345385 sid3350522 sid3353835 sid3361496 sid3374688 sid3436231 sid3545926 sid3696752 sid3767615 sid3802133 sid3874284 sid3892998 sid3896560 sid3946943 + sid4066896 sid4076894 sid4077694 sid4129831 sid4194784 sid4200654 sid4283098 sid4325452 sid4344938 sid4347327 sid4397442 sid4399208 sid4412313 sid4415548 sid4418199 sid4596554 sid4605360 sid4682683 sid4742224 sid4815479 sid4922930 + sid4926363 sid4937850 sid4945336 sid4991887 sid5046731 sid5115973 sid5123621 sid5178095 sid5182500 sid5243792 sid5326382 sid5333057 sid5336830 sid5374636 sid5383239 sid5404651 sid5446551 sid5458591 sid5512786 sid5587440 sid5594169 + sid5662346 sid5726100 sid5850334 sid5859868 sid5864727 sid5972953 sid5983507 sid6057405 sid6125011 sid6161690 sid6170353 sid6291839 sid6387897 sid6433456 sid6447511 sid6563912 sid6566631 sid6619599 sid6685492 sid6698290 sid6774956 + sid6819314 sid6894763 sid6900530 sid6908904 sid6964169 sid7032544 sid7081017 sid7098601 sid7229407 sid7284469 sid7297703 sid7482528 sid7502391 sid7536975 sid7546225 sid7671674 sid7672031 sid7677595 sid7689569 sid7694304 sid7699655 + sid7758316 sid7881422 sid7891781 sid8062416 sid8069374 sid8090397 sid8129152 sid8130858 sid8196416 sid8212653 sid8219246 sid8271596 sid8393315 sid8402201 sid8526625 sid8531472 sid8544157 sid8552283 sid8595079 sid8597035 sid8608734 + sid8651025 sid8683225 sid8734124 sid8793912 sid8850892 sid8852457 sid8857726 sid8914918 sid8938488 sid8998341 sid9129887 sid9130764 sid9240621 sid9252582 sid9273184 sid9332537 sid9443449 sid9462908 sid9535051 sid9581498 sid9663047 + sid9665620 sid9710220 sid9768426 sid9778366 sid9961728 sid9962860 sid9978737 sid9983976 sid9985474 sid9987307 sid9993499 sid10047262 sid10099146 sid10107834 sid10170643 sid10244230 sid10356402 sid10366794 sid10369680 sid10378474 + sid10380274 sid10385744 sid10497927 sid10511251 sid10566169 sid10575606 sid10575906 sid10695302 sid10712685 sid10766796 sid10770571 sid10880976 sid10884283 sid10902545 sid10903349 sid10974954 sid11023951 sid11032883 sid11042061 + sid11147669 sid11172275 sid11220633 sid11221299 sid11273455 sid11285410 sid11292595 sid11408500 sid11428724 sid11478361 sid11493482 sid11559005 sid11601314 sid11617146 sid11672504 sid11681275 sid11755416 sid11802932 sid11826221 + sid11874156 sid11949239 sid11949663 sid11955924 sid12014271 sid12068771 sid12088408 sid12131903 sid12149453 sid12200768 sid12222082 sid12263772 sid12273649 sid12273881 sid12281962 sid12325049 sid12328388 sid12335434 sid12392164 + sid12418160 sid12475582 sid12476691 sid12517734 sid12520748 sid12593200 sid12600998 sid12717259 sid12723334 sid12741683 sid12745774 sid12846473 sid12848022 sid12924930 sid12982918 sid13052061 sid13061715 sid13125353 sid13138651 + sid13192045 sid13309855 sid13317689 sid13335223 sid13335773 sid13380928 sid13444895 sid13505878 sid13526282 sid13597011 sid13650949 sid13771208 sid13772803 sid13786016 sid13791872 sid13858738 sid13925985 sid13959442 sid13961344 + sid13981581 sid14056178 sid14103927 sid14121667 sid14159058 sid14175295 sid14176974 sid14247170 sid14291025 sid14292212 sid14294654 sid14437479 sid14440833 sid14500648 sid14640993 sid14746930 sid14751481 sid14831552 sid14840355 + sid14892069 sid14904854 sid14947518 sid15011530 sid15028834 sid15031995 sid15080033 sid15083829 sid15158579 sid15171479 sid15221883 sid15231937 sid15271241 sid15275145 sid15337906 sid15352275 sid15428956 sid15429299 sid15481218 + sid15539292 sid15540373 sid15552385 sid15606245 sid15609587 sid15689280 sid15758159 sid15761011 sid15820457 sid15822747 sid15824171 sid15865070 sid15870817 sid15875993 sid15945245 sid15952923 sid16073359 sid16074461 sid16128139 + sid16195534 sid16198240 sid16271321 sid16334723 sid16338726 sid16343807 sid16404406 sid16408192 sid16458867 sid16461174 sid16475738 sid16521901 sid16532913 sid16582197 sid16598846 sid16655499 sid16678522 sid16718061 sid16720294 + sid16730406 sid16743476}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{+{ ofpages1}{ ofwords1}{ ofchars13}{ ofcharsws13}{ern109}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw4876\paperh3175\margl113\margr113\margt113\margb0\gutter0\ltrsect +\deftab708\widowctrltnbjenddoc\hyphhotz425 rackmoves0 rackformatting1\donotembedsysfont0 elyonvml1\donotembedlingdata1\grfdocevents0 alidatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0 +\showxmlerrors0 oxlattoyenxpshrtn oultrlspc\dntblnsbdb ospaceforul\hyphcaps0 ormshade\horzdoc\dgmargin\dghspace130\dgvspace180\dghorigin113\dgvorigin113\dghshow0\dgvshow0 +\jexpandiewkind1iewscale210\pgbrdrhead\pgbrdrfoot olnhtadjtbl empersonalinfo ojkernpunct sidroot25664 emdttm et0{\*\wgrffmtfilter 013f}\ilfomacatclnup0{\*\docvar {APPROBDAT}{26.07.2022}}{\*\docvar {BEH_BEZ_Z1}{A-8052 Graz}} +{\*\docvar {BEH_BEZ_Z2}{Stra\'dfganger Stra\'dfe 171}}{\*\docvar {DIENSTORT}{Graz}}{\*\docvar {DKE_SBGeschlecht}{M}}{\*\docvar {EMAIL}{christian.moli...@bmlv.gv.at}}{\*\docvar {FAXNR}{0664/622 2778}}{\*\docvar {GESCHLECHT}{M}}{\*\docvar {IFMIN}{ }} +{\*\docvar {KPH_Abgabestelle}{Stra\'dfganger Stra\'dfe 171}}{\*\docvar {KPH_Empf\'e4ngerKurz}{ }}{\*\docvar {KPH_Fax}{ }}{\*\docvar {KPH_GENDATUM}{26.07.2022}}{\*\docvar {KPH_Genehmiger}{MOLITOR}}{\*\docvar {KPH_Gesch\'e4ftszahl}{[Gesch\'e4ftszahl]}} +{\*\docvar {KPH_Ort}{Graz}}{\*\docvar {KPH_PLZ}{8052}}{\*\docvar {KPH_Sachbearbeiter}{MOLITOR}}{\*\docvar {KPH_SBeMail}{christian.moli...@bmlv.gv.at}}{\*\docvar {KPH_SBFax}{0664/622 2778}}{\*\docvar {KPH_SBIFMIN}{SBIFMIN}} +{\*\docvar {KPH_SBTelefon}{50 26150}}{\*\docvar {KPH_Telefon}{ }}{\*\docvar {KPH_VerantwOEBez_Z1}{A-8052 Graz}}{\*\docvar {KPH_VerantwOEBez_Z2}{Stra\'dfganger Stra\'dfe 171}}{\*\docvar {KPH_VerantwOEOrt}{Graz}}{\*\docvar {KPH_zuHanden}{ }} +{\*\docvar {OBJEKT_TYP}{DOKU_ATTR}}{\*\docvar {TELNR}{50 26150}}{\*\docvar {UFORMEL}{MOLITOR, ADir}}{\*\docvar {UFORMEL2}{ }}{\*\docvar {UFORMEL3}{ }}{\*\docvar {UFORMELCODE}{HPA}}{\*tnsep \ltrpar \pard\plain \ltrpar +\ql \li0 i0\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f0fs26lang1025 \ltrchcs0 s26\lang3079\langfe3079\lochf0\hichf0\dbchf31505+\insrsid6161690 +\par }}{\* tnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlch cs1 f0fs26lang1025 \ltrchcs0 +s26\lang3079\langfe3079\lochf0\hichf0\dbchf31505+\par }}{\*ftnsep \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlchcs1 f0fs26lang1025 \ltrchcs0 +s26\lang3079\langfe3079\lochf0\hichf0\dbchf31505+\par }}{\*ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlchcs1 f0fs26lang1025 \ltrchcs0 +s26\lang3079\langfe3079\lochf0\hichf0\dbchf31505+\par }}\ltrpar \sectd \ltrsect\lndscpsxn\psz5\linex0\headery708ootery0+{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang +{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}} +\pard\plain \ltrpar\qj \li136 i142\widctlpar\wrapdefaultaauto in142\lin136\itap0\pararsid7891781 tlchcs1 f0fs26lang1025 \ltrchcs0 s26\lang3079\langfe3079\lochf0\hichf0\dbchf31505+f40fs12 \ltrchcs0 40 s12\insrsid14159058 \hichf40\dbchf31505\loch40 Xxx}{ tlchcs1 f40fs12 \ltrchcs0 40s12\insrsid11559005+\par \ltrrow} rowd \irow0\irowband0\lastrow \ltrrow s11 rleft133 rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth4482 rftsWidthB3 rftsWidthA3 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blrsid14159058 bllkhdrrows bllklastrow bllkhdrcols bllklastcol blind138 blindtype3 +rdrsrdrw10 +\pard \ltrpar\ql \li0 i0\widctlpar\intbl x1134\wrapdefaultspalphaspnumaautodjustright in0\lin0\pararsid414037 { tlch cs1 f40fs10 \ltrchcs0 40s10\insrsid14159058 \hichf40\dbchf31505\loch40 X11}{ tlchcs1 f40fs10 +\ltrchcs0 40s10\insrsid15539292+\hichf40\dbchf31505\loch40 yyy}{ tlch cs1 f40fs12 \ltrchcs0 40s12\insrsid15539292 +\ltrchcs0 40 s12\insrsid15539292 rowd \irow0\irowband0\lastrow \ltrrow s11 rleft133 rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth4482 rftsWidthB3 rftsWidthA3 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blrsid14159058 bllkhdrrows bllklastrow bllkhdrcols bllklastcol blind138 blindtype3 +rdrsrdrw10 + ow }\pard \ltrpar\ql \li0 i0\widctlpar x964\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0\pararsid328209 { tlchcs1 f40fs12 \ltrchcs0 40s12\insrsid536801 +\par }{\* hemedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210060ffbff5a4060000a21b0000160000007468656d652f7468656d652f +7468656d65312e786d6cec594f6f1b4514bf23f11d467b6f6327761a4775aad8b11b6852a2d82dea71bc3bde9d66766735334eea1b6a8f484888823850891b07 +04546a252ee5d3048aa048fd0abc99d95defc46b92b411ada039b4f6ec6fdefff79b37ebabd7eec50c1d1221294fda5efd72cd4324f1794093b0eddd1af62fad +79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607f22d771db8b944ad79796a40fcb585ee62949e0d9988b182bf82ac2a540e023901bb3a5e55a6d +7529c634f150826310bb830595127b1bb9dc1e03e189927ac16762a0a5920a707050d71039955d26d021666d0f7404fc6848ee290f312c153c687b35f3e72d6d +5c5dc2ebd926a616ec2dedeb9bbf6c5fb6213858363a45382a94d6fb8dd695ad42be0130358febf57add5ebd906700d8f7c1556b4b5966a3bf56efe4324b20fb +715e76b7d6ac355c7c49feca9ccdad4ea7d36c65b658a106643f36e6f06bb5d5c6e6b28337208b6fcee11b9dcd6e77d5c11b90c5afcee1fb575aab0d176f4011 +a3c9c11c5a27b4dfcfa417903167db95f03580afd532f80c05d55094975631e6895a586c31becb451f101ac9b0a20952d3948cb10f25dcc5f14850ac35e07582 +4b4fec922fe796b432247d4153d5f63e4c31b4c34cdecb673fbc7cf6041ddf7f7a7cffe7e3070f8eefff640539bbb671129677bdf8eef3bf1e7d82fe7cf2ed8b +875f56e36519ffdb8f9ffefacb17d540e89f9939cfbf7afcfbd3c7cfbffeec8fef1f56c037051e95e1431a13896e9223b4cf6370cc44c5b59c8cc4f9760c234c +cb3b369350e2046b2d15f27b2a72d037a79865d971ece8103782b705f04715f0fae4ae63f0201213452b34df886207b8cb39eb705119851b5a5729ccc3491256 +2b1793326e1fe3c32add5d9c38f9ed4d5260cebc2c1dc7bb1171ccdc63385138240951483fe30784547877875227aebbd4175cf2b1427728ea605a1992211d39 +d534dbb44d63c8cbb4ca67c8b7139bdddba8c35995d75be4d0454257605661fc9030278cd7f144e1b84ae410c7ac1cf01daca22a230753e197713da920d32161 +1cf502a2cfb4f9d2ff4880bfa5a4dfc040599569df65d3d8450a450faa64ee60cecbc82d7ed08d709c5661073489cad80fe4019428467b5c55c177b9db21fa3b +e401270bd37d9b1227dda7b3c12d1a3a26cd0a443f99888a285e27dca9dfc1948d31315403acee70754c937f226e4681b9ad868b236ea0cae7df3caab0fb6da5 +ec4d38bdaa7a66fb04512fc29da4e72e17017dfbd9790b4f923d020d31dfa7efc8f91d397bff79725ed4cf174fc933160682d6b3889db4cddc1d2f1ebbc794b1 +819a32b223cde42de1f009fab0a8379afb2629ee6169041f752b830607170a6cf620c1d5c754458308a730b5d73d2d249499e850a2944bb82e9ae54ad91a0f93 +bfb297cda6be8658ea9058edf2c02eafe8e5fcb65188315685e64e9b2b5ad102ceaa6ce54a26147c7b1565756dd499b5d58d6986151d6d85cb3ac4e65e0e212f +5c83c5229a30d520988520caab70e3d7aae1b683190974dc6d8ef2b4982c5c648a64840392e548fb3d9fa3ba49525e2b738e683f6c31e8abe329512b696b69b1 +afa1ed2c492aab6b2c509767ef75b29457f02c4b20ed643bb2a4dc9c2c41476dafd55c6e7ac8c769db1bc345193ec629645dea4112b3105e35f94ad8b23fb599 +4d97cfb2d9ca1d739ba00e2f3f6cdce71c76782015526d6119d9d2308fb2126089d664ed5f6e42582fca810a363a9b152b6b500c6fcc0a88a39b5a321e135f95 +935d5ad1b1b35f332ae51345c4200a8ed0884dc43e86f4eb52057f022ae17d876104fd05decee9689b472e39674d577e276670761db334c219ddea16cd3bd9c2 +0d211536986f25f3c0b74adb8d73e777c5b4fc05b9522ee3ff992bfa3c81d70f2b81ce800f2f860546ba53da1e172ae2c0426944fdbe80c9c17007540bbce185 +c75054f07adafc2fc8a1fedff69c9561da1a6e916a9f864850388f542408d9035a32d5778ab07a767659912c13642aaa64ae4cadd9237248d85073e0aa3edb3d +1441a91b36c968c0e04ed69ffb3deba051a8879c72bf394c569cbdb607feedc9c7363338e5f2b01968f2f8172616e3c1ec54b5fbcdf6fcec2d3ba21fccc6ac46 +de15a0ac7414b4b2b67f4513ce79d45ac69af378b9991b07599cf718168b812885974848ff03e71f153e23a68cf5813ae4fbc0ad087ebed0c2a06ca0aa2fd9c1 +036982b48b23189ceca22d262dca86361b9d74d4f2c3fa8227dd42ef89606bcbce92ef7306bb18ce5c754e2f5e64b0b3083bb1b66b0b430d993dd9a2b034ce6f +322631e647b2f28f597c741712bd053f1a4c9892a698e0972a8161861e983e80e6b71acdd68dbf010000ffff0300504b0304140006000800000021000dd1909f +b60000001b010000270000007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f +6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b0 +60828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509a +ffb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000 +001c0200001300000000000000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c000 +0000360100000b00000000000000000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c +00000000000000000000000000190200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210060ffbf +f5a4060000a21b00001600000000000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021 +000dd1909fb60000001b0100002700000000000000000000000000ae0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000a90a00000000} +{\*+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid; +\lsdsemihidden1 \lsdlocked0 Placeholder Text;\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid; +\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1; +\lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1; +\lsdsemihidden1 \lsdlocked0 Revision;\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1; +\lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2; +\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3; +\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4; +\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdpriority62 \lsdlocked0 Light Grid Accent 5; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000 +4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000007012 +fd20a4deda01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 25a93bd2db23..3aadb03618ff 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> +#include <com/sun/star/table/TableBorderDistances.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/SizeType.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> @@ -1950,6 +1951,22 @@ CPPUNIT_TEST_FIXTURE(Test, test160553Tdf) CPPUNIT_ASSERT_EQUAL(2, getPages()); } +CPPUNIT_TEST_FIXTURE(Test, test162198Tdf) +{ + createSwDoc("tdf162198.rtf"); + uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), + uno::UNO_QUERY); + uno::Reference<text::XTextTable> xTable1(xTables->getByIndex(0), uno::UNO_QUERY); + + uno::Reference<table::XCell> xCell = xTable1->getCellByName(u"A1"_ustr); + uno::Reference<beans::XPropertySet> xCellPropSet(xCell, uno::UNO_QUERY_THROW); + sal_Int32 nLeftDistance = getProperty<sal_Int32>(xCellPropSet, u"LeftBorderDistance"_ustr); + sal_Int32 nRightDistance = getProperty<sal_Int32>(xCellPropSet, u"LeftBorderDistance"_ustr); + CPPUNIT_ASSERT_EQUAL_MESSAGE("left cell spacing to contents", sal_Int32(9), nLeftDistance); + CPPUNIT_ASSERT_EQUAL_MESSAGE("right cell spacing to contents", sal_Int32(9), nRightDistance); +} + // tests should only be added to rtfIMPORT *if* they fail round-tripping in rtfEXPORT } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT();