sw/qa/extras/rtfimport/data/tdf148544.rtf | 512 ++++++++++++++++++++ sw/qa/extras/rtfimport/rtfimport.cxx | 27 + sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx | 39 + sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx | 6 4 files changed, 581 insertions(+), 3 deletions(-)
New commits: commit 13cd36248069d32688cfb8adfe0955ca5229e075 Author: Oliver Specht <oliver.spe...@cib.de> AuthorDate: Tue Jul 9 08:50:46 2024 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Mon Jul 15 20:14:29 2024 +0200 tdf#148554 RTF import - reset borders on fill cells In documents containing tables with rows having different right margins an additional cell is added to fill the gap. These cells should be 'invisible' and therefore need to have no border. Change-Id: I802310251f36fb6b2c00f3cb38786f438e4565a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170179 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/sw/qa/extras/rtfimport/data/tdf148544.rtf b/sw/qa/extras/rtfimport/data/tdf148544.rtf new file mode 100755 index 000000000000..0677acb3ce91 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf148544.rtf @@ -0,0 +1,512 @@ +{ tf1deflang1025nsinsicpg1250\uc1deff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1038\deflangfe1038 hemelang1031 hemelangfe0 hemelangcs0{onttbl{0bidi romancharset0 prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};} +{1bidi swisscharset0prq2{\*\panose 020b0604020202020204}Arial{\*alt Helvetica};}{2bidi moderncharset0prq1{\*\panose 02070309020205020404}Courier New;}{2bidi moderncharset0prq1{\*\panose 02070309020205020404}Courier New;} +{39bidi swisscharset0prq2{\*\panose 020b0604030504040204}Tahoma;}{ lomajor31500bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};} +{dbmajor31501bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};}{himajor31502bidi romancharset0 prq2{\*\panose 02040503050406030204}Cambria;} +{bimajor31503bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};}{lominor31504bidi romancharset0 prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};} +{dbminor31505bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};}{himinor31506bidi swisscharset0 prq2{\*\panose 020f0502020204030204}Calibri;} +{biminor31507bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Times New Roman};}{321bidi romancharset238prq2 Times New Roman CE{\*alt Times New Roman};} +{322bidi romancharset204prq2 Times New Roman Cyr{\*alt Times New Roman};}{324bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};} +{325bidi romancharset162prq2 Times New Roman Tur{\*alt Times New Roman};}{326bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};} +{327bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};}{328bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};} +{329bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Times New Roman};}{331bidi swisscharset238prq2 Arial CE{\*alt Helvetica};}{332 bidi swisscharset204prq2 Arial Cyr{\*alt Helvetica};} +{334bidi swisscharset161prq2 Arial Greek{\*alt Helvetica};}{335bidi swisscharset162prq2 Arial Tur{\*alt Helvetica};}{336bidi swisscharset177 prq2 Arial (Hebrew){\*alt Helvetica};} +{337bidi swisscharset178prq2 Arial (Arabic){\*alt Helvetica};}{338bidi swisscharset186prq2 Arial Baltic{\*alt Helvetica};}{339bidi swiss charset163prq2 Arial (Vietnamese){\*alt Helvetica};} +{341bidi moderncharset238prq1 Courier New CE;}{342bidi modern charset204prq1 Courier New Cyr;}{344bidi moderncharset161prq1 Courier New Greek;}{345bidi moderncharset162prq1 Courier New Tur;} +{346bidi moderncharset177prq1 Courier New (Hebrew);}{347bidi modern charset178prq1 Courier New (Arabic);}{348bidi moderncharset186prq1 Courier New Baltic;}{349bidi moderncharset163prq1 Courier New (Vietnamese);} +{341bidi moderncharset238prq1 Courier New CE;}{342bidi modern charset204prq1 Courier New Cyr;}{344bidi moderncharset161prq1 Courier New Greek;}{345bidi moderncharset162prq1 Courier New Tur;} +{346bidi moderncharset177prq1 Courier New (Hebrew);}{347bidi modern charset178prq1 Courier New (Arabic);}{348bidi moderncharset186prq1 Courier New Baltic;}{349bidi moderncharset163prq1 Courier New (Vietnamese);} +{711bidi swisscharset238prq2 Tahoma CE;}{712bidi swisscharset204prq2 Tahoma Cyr;}{714bidi swisscharset161prq2 Tahoma Greek;}{715bidi swiss charset162prq2 Tahoma Tur;} +{716bidi swisscharset177prq2 Tahoma (Hebrew);}{717bidi swiss charset178prq2 Tahoma (Arabic);}{718bidi swisscharset186prq2 Tahoma Baltic;}{719bidi swisscharset163prq2 Tahoma (Vietnamese);} +{720bidi swisscharset222prq2 Tahoma (Thai);}{lomajor31508bidi roman charset238prq2 Times New Roman CE{\*alt Times New Roman};}{lomajor31509 bidi romancharset204prq2 Times New Roman Cyr{\*alt Times New Roman};} +{lomajor31511bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};}{lomajor31512bidi romancharset162prq2 Times New Roman Tur{\* alt Times New Roman};} +{lomajor31513bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};}{lomajor31514bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};} +{lomajor31515bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};}{lomajor31516bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Times New Roman};} +{dbmajor31518bidi romancharset238prq2 Times New Roman CE{\*alt Times New Roman};}{dbmajor31519bidi romancharset204prq2 Times New Roman Cyr{\* alt Times New Roman};} +{dbmajor31521bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};}{dbmajor31522bidi romancharset162prq2 Times New Roman Tur{\* alt Times New Roman};} +{dbmajor31523bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};}{dbmajor31524bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};} +{dbmajor31525bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};}{dbmajor31526bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Times New Roman};} +{himajor31528bidi romancharset238prq2 Cambria CE;}{himajor31529bidi romancharset204prq2 Cambria Cyr;}{himajor31531bidi romancharset161prq2 Cambria Greek;}{himajor31532bidi romancharset162prq2 Cambria Tur;} +{himajor31535bidi romancharset186prq2 Cambria Baltic;}{himajor31536 bidi romancharset163prq2 Cambria (Vietnamese);}{bimajor31538bidi roman charset238prq2 Times New Roman CE{\*alt Times New Roman};} +{bimajor31539bidi romancharset204prq2 Times New Roman Cyr{\*alt Times New Roman};}{bimajor31541bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};} +{bimajor31542bidi romancharset162prq2 Times New Roman Tur{\*alt Times New Roman};}{bimajor31543bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};} +{bimajor31544bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};}{bimajor31545bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};} +{bimajor31546bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Times New Roman};}{lominor31548bidi romancharset238prq2 Times New Roman CE{\*alt Times New Roman};} +{lominor31549bidi romancharset204prq2 Times New Roman Cyr{\*alt Times New Roman};}{lominor31551bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};} +{lominor31552bidi romancharset162prq2 Times New Roman Tur{\*alt Times New Roman};}{lominor31553bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};} +{lominor31554bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};}{lominor31555bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};} +{lominor31556bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Times New Roman};}{dbminor31558bidi romancharset238prq2 Times New Roman CE{\*alt Times New Roman};} +{dbminor31559bidi romancharset204prq2 Times New Roman Cyr{\*alt Times New Roman};}{dbminor31561bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};} +{dbminor31562bidi romancharset162prq2 Times New Roman Tur{\*alt Times New Roman};}{dbminor31563bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};} +{dbminor31564bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};}{dbminor31565bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};} +{dbminor31566bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Times New Roman};}{himinor31568bidi swisscharset238prq2 Calibri CE;}{ himinor31569bidi swisscharset204prq2 Calibri Cyr;} +{himinor31571bidi swisscharset161prq2 Calibri Greek;}{himinor31572 bidi swisscharset162prq2 Calibri Tur;}{himinor31573bidi swisscharset177 prq2 Calibri (Hebrew);} +{himinor31574bidi swisscharset178prq2 Calibri (Arabic);}{himinor31575 bidi swisscharset186prq2 Calibri Baltic;}{himinor31576bidi swiss charset163prq2 Calibri (Vietnamese);} +{biminor31578bidi romancharset238prq2 Times New Roman CE{\*alt Times New Roman};}{biminor31579bidi romancharset204prq2 Times New Roman Cyr{\* alt Times New Roman};} +{biminor31581bidi romancharset161prq2 Times New Roman Greek{\*alt Times New Roman};}{biminor31582bidi romancharset162prq2 Times New Roman Tur{\* alt Times New Roman};} +{biminor31583bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Times New Roman};}{biminor31584bidi romancharset178prq2 Times New Roman (Arabic){\*alt Times New Roman};} +{biminor31585bidi romancharset186prq2 Times New Roman Baltic{\*alt Times New Roman};}{biminor31586bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Times New Roman};}}{+ ed0\green0lue255; 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 }{\*\defpap \ql \li0 i0\sa200\sl276\slmult1\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 } + oqfpromote {\stylesheet{\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s1\ql \li0 i0\keepn\widctlpar\wrapdefault aauto\outlinelevel0djustright in0\lin0\itap0 tlchcs1 f0fs24lang1025 \ltrchcs0 s24\lang1031\langfe3079+\s2\ql \li0 i0\keepn\widctlparrdrtrdrsrdrw10rsp20 + x709 x1276 x1985 x2835 x3402 x3686 x3969 x4253 x4536 x4820 x5103 x5387 x5670 x5954 x6237 x6521 x6804 x7088 x7371 x7655 x7938 x8222\wrapdefaultaauto\outlinelevel1djustright in0\lin0\itap0 tlchcs1 f0fs24lang1025 +\ltrchcs0 s24\lang1031\langfe3079+\ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 s22\lang1031\langfe3079+\ltrchcs0 s20\lang1031\langfe3079+ s11 srowd rftsWidthB3 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blind0 blindtype3 svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr sbrdrh sbrdrv \ql \li0 i0\sa200\sl276\slmult1 +\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f0fs22lang1025 \ltrchcs0 s22\lang1038\langfe1038+bif0fs28 \ltrchcs0 \is28\lang0\langfe3079\loch 31502\hichf31502\dbchf31501\langnp0\langfenp3079 \sbasedon10 \slink2 \slocked \ssemihidden \spriority9 Heading 2 Char;}{\*+s26\lang0\langfe3079\loch 31502\hichf31502\dbchf31501\langnp0\langfenp3079 \sbasedon10 \slink3 \slocked \ssemihidden \spriority9 Heading 3 Char;}{\*+s28\lang0\langfe3079\loch 31506\hichf31506\dbchf31505\langnp0\langfenp3079 \sbasedon10 \slink4 \slocked \ssemihidden \spriority9 Heading 4 Char;}{\*+\is26\lang0\langfe3079\loch 31506\hichf31506\dbchf31505\langnp0\langfenp3079 \sbasedon10 \slink5 \slocked \ssemihidden \spriority9 Heading 5 Char;}{\*+\lang0\langfe3079\loch 31506\hichf31506\dbchf31505\langnp0\langfenp3079 \sbasedon10 \slink6 \slocked \ssemihidden \spriority9 Heading 6 Char;}{\s20\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in0\l in0\itap0 + tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+ s32\lang0\langfe3079\kerning32\loch 31502\hichf31502\dbchf31501\langnp0\langfenp3079 \sbasedon10 \slink1 \slocked \spriority9 Heading 1 Char;}{\s22\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in0\lin0\itap0 + tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\sbasedon10 \slink20 \slocked \ssemihidden Header Char;}{\*+\sbasedon10 \slink22 \slocked \ssemihidden Footer Char;}{\s26\ql \li0 i0\widctlpar\wrapdefault aautodjustright in0\lin0\itap0 tlchcs1 bf0fs28lang1025 \ltrchcs0 +s28\ulxpnd12xpndtw60\lang1031\langfe3079+s20\lang1031\langfe3079+\i s20\lang1031\langfe3079+s20\lang1031\langfe3079+s20\lang1031\langfe3079+ s20\lang1031\langfe3079+s20\lang1031\langfe3079+s24\lang1031\langfe3079+ s20\lang1031\langfe3079+\s36\ql i-200\li400 i0\widctlpar\wrapdefault aautodjustright in0\lin400\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s37\qj \li0 i567\sl360\slmult1\widctlpar\wrapdefault aautodjustright in567\lin0\itap0 tlchcs1 f0fs24lang1025 \ltrchcs0 s24\lang1031\langfe3079+\s38\qc \li0 i0\sb240\sa60\widctlpar\wrapdefault aauto\outlinelevel0djustright in0\lin0\itap0 tlchcs1 bf1fs72lang1025 \ltrchcs0 1s72xpnd12xpndtw60\lang1031\langfe3079\kerning28+\sbasedon0 \snext38 \slink41 \sqformat Title;}{\*+ \sbasedon10 \sqformat Strong;}{\*+dditive tlchcs1 f0 \ltrchcs0 \ul+\sbasedon0 \snext43 \slink45 Plain Text;}{\s44\ql \li1400 i0\widctlpar\wrapdefaultaautodjustright in0\lin1400\itap0 tlchcs1 f0fs20 lang1025 \ltrchcs0 s20\lang1031\langfe3079+\sbasedon0 \snext0 \sautoupd \ssemihidden toc 8;}{\*+\s46\ql i-200\li1000 i0\widctlpar\wrapdefault aautodjustright in0\lin1000\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s47\ql \li1000 i0\widctlpar\wrapdefault aautodjustright in0\lin1000\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s48\ql i-200\li600 i0\widctlpar\wrapdefault aautodjustright in0\lin600\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s49\ql \li600 i0\widctlpar\wrapdefault aautodjustright in0\lin600\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s50\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 bf0fs20lang1025 \ltrchcs0 s20+\s51\ql \li200 i0\sb120\widctlpar\wrapdefaultaautodjustright in0\lin200\itap0 tlchcs1 bf0fs22lang1025 \ltrchcs0 s22\lang1031\langfe3079+\s52\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\ita p0 tlchcs1 f0fs96lang1025 \ltrchcs0 s96xpnd12xpndtw60\lang1031\langfe3079+\s53\ql \li0 i0\sa120\sl480\slmult1\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\s54\ql \li1600 i0\widctlpar\wrapdefaultaautodjustright in0\lin1600\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+ tlchcs1 f0fs20 \ltrch cs0 s20\lang0\langfe3079\langnp0\langfenp3079 \sbasedon10 \slink53 \slocked \ssemihidden Body Text 2 Char;}{\s56\ql \li1200 i0\widctlpar\wrapdefault aautodjustright in0\lin1200\itap0 tlchcs1 f0fs20lang1025 +\ltrchcs0 s20\lang1031\langfe3079+s20\lang1031\langfe3079+39 s20\lang1031\langfe3079+\sbasedon10 \slink58 \slocked \ssemihidden Document Map Char;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}}{\* sidtbl sid7448 sid19707 sid22939 sid68616 sid275582 sid732841 sid788256 sid871170 sid1203641 + sid1248003 sid1251256 sid1581784 sid1648631 sid1655235 sid1970507 sid2307341 sid2311696 sid2382104 sid2499885 sid2704869 sid2955050 sid2962817 sid3175132 sid3356238 sid3485975 sid3565333 sid3871843 sid4481867 sid4483692 sid4617125 + sid4666746 sid4669845 sid4880541 sid5010641 sid5440130 sid5452096 sid5507293 sid6121931 sid6305294 sid6518380 sid6576968 sid6708115 sid6776489 sid6946974 sid7079732 sid7227083 sid7414038 sid7417287 sid7474287 sid7752891 sid7884907 + sid7955638 sid8216890 sid8220028 sid8393652 sid8722154 sid9009503 sid9048397 sid9124283 sid9847281 sid10119678 sid10376906 sid10510809 sid10826550 sid11089478 sid11346696 sid11867933 sid11881365 sid12061662 sid12196680 sid12458506 + sid12525316 sid12854558 sid12863449 sid13005839 sid13055431 sid13127788 sid13241397 sid13506915 sid13701504 sid14245016 sid14625583 sid15292989 sid15361887 sid15472644 sid15677948 sid15683482 sid15883973 sid15929469 sid15991050 + sid16083052 sid16590655}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{+{ ofpages1}{ ofwords38}{ ofchars226}{ ofcharsws232}{ern57453}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl851\margr851\margt1134\margb1134\gutter0\ltrsect +\deftab709\widowctrltnbjenddoc\hyphhotz425 rackmoves0 rackformatting1\donotembedsysfont0 elyonvml0\donotembedlingdata1\grfdocevents0 alidatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0 +\showxmlerrors0 oxlattoyenxpshrtn oultrlspc\dntblnsbdb ospaceforul\hyphcaps0 ormshade\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3 +\jcompressiewkind1iewscale130\pgbrdrhead\pgbrdrfoot olnhtadjtbl empersonalinfo sidroot12525316 emdttm et0{\*\wgrffmtfilter 013f}\ilfomacatclnup0{\*tnsep \ltrpar \pard\plain \ltrpar +\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\par }}{\*tnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\insrsid13241397 +\par }}{\*ftnsep \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlch cs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\insrsid13241397 +\par }}{\*ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\insrsid13241397 +\par }}\ltrpar \sectd \ltrsect\linex0\headery709ootery709+f0fs20lang1025 \ltrch cs0 s20\lang1031\langfe3079+\par }}{\headerr \ltrpar \pard\plain \ltrpar\s20\ql \li-284 i-286\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in-286\lin-284\itap0 tlchcs1 f0fs20lang1025 \l trchcs0 s20\lang1031\langfe3079+ tlchcs1 f0 \ltrchcs0 \insrsid4483692 +\par }}{ooterl \ltrpar \pard\plain \ltrpar\s22\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 \insrsid5507293 +\par }}{ooterr \ltrpar \pard\plain \ltrpar\s22\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 \insrsid5507293 +\par }}{\headerf \ltrpar \pard\plain \ltrpar\s20\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 \insrsid5507293 +\par }}{ooterf \ltrpar \pard\plain \ltrpar\s22\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultaautodjustright in0\lin0\itap0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 \insrsid5507293 +\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\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 )}}\ltrrow rowd \irow0\irowband0\lastrow \ltrrow s11 rgaph70 rrh-300 rleft-284 rbrdrtrdrsrdrw10 rbrdrl +rdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth10774 rftsWidthB3 rftsWidthA3 rpaddl70 rpaddr70 rpaddfl3 rpaddfr3 blrsid15677948 blind-214 blindtype3 ++++++++\pard\plain \ltrpar +\s26\ql \li0 i0\widctlpar\intbl\wrapdefaultaauto\outlinelevel0djustright in0\lin0 tlchcs1 bf0fs28lang1025 \ltrchcs0 s28\ulxpnd12xpndtw60\lang1031\langfe3079+{\*kmkstart _Toc465515670}{\*kmkstart _Toc465663135}{\*kmkstart _Toc466457617}{ield lddirty{\*ldinst { tlchcs1 f0 \ltrchcs0 \insrsid8220028 }}{ldrslt }}\sectd \ltrsect +\linex0\headery709ootery709+ tlchcs1 f0 \ltrchcs0 \insrsid14625583 {\*kmkstart ANZEIGE_NEU}{\*kmkend _Toc464894674}{\*kmkend _Toc465515670}{\*kmkend _Toc465663135}{\*kmkend _Toc466457617}{\*kmkend ANZEIGE_NEU}+\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\qr \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0 \ltrch cs0 \insrsid6518380+f0 \ltrchcs0 \insrsid14625583 :}{ tlchcs1 f0 \ltrchcs0 \insrsid11346696 }{ tlchcs1 f0 \ltrchcs0 \insrsid6518380 11}{ tlchcs1 f0 \ltrchcs0 \insrsid14625583 .}{ tlchcs1 f0 \ltrchcs0 \insrsid6518380 11}{ tlchcs1 f0 +\ltrchcs0 \insrsid14625583 .}{ tlchcs1 f0 \ltrchcs0 \insrsid6518380 1111}{ tlchcs1 f0 \ltrchcs0 \insrsid14625583 +{ tlchcs1 f0 \ltrchcs0 \insrsid14625583 rowd \irow0\irowband0\lastrow \ltrrow s11 rgaph70 rrh-300 rleft-284 rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrv +rdrsrdrw10 rftsWidth3 rwWidth10774 rftsWidthB3 rftsWidthA3 rpaddl70 rpaddr70 rpaddfl3 rpaddfr3 blrsid15677948 blind-214 blindtype3 ++++++++ ow + }\pard \ltrpar\ql \li-284 i0\widctlpar\wrapdefaultaautodjustright in0\lin-284\itap0 { tlchcs1 f0fs24 +\ltrchcs0 s24\ul\insrsid12525316 +\par }\pard \ltrpar\ql \li0 i0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 { tlchcs1 f0 \ltrchcs0 \insrsid12525316 +\par \ltrrow} rowd \irow0\irowband0\ltrrow s11 rgaph70 rrh-238 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rpaddl70 rpaddr70 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++++\pard\plain \ltrpar\s30\ql \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0 tlchcs1 bf0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\insrsid6518380 Rrrrrrr}{ tlchcs1 f0 \ltrchcs0 \insrsid15677948 +s20\lang1031\langfe3079+\par }\pard\plain \ltrpar\s30\ql \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0 tlchcs1 bf0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\insrsid15677948 + tlchcs1 bf0 \ltrchcs0 \insrsid15677948 rowd \irow0\irowband0\ltrrow s11 rgaph70 rrh-238 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrv +rdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rpaddl70 rpaddr70 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++++ ow + \ltrrow +} rowd \irow1\irowband1\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++\pard\plain \ltrpar\s20\ql \li0 i0\widctlpar\intbl qc x4536 qr x9072\wrapdefault aautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 +s20\lang1031\langfe3079+\insrsid15677948 . }{ tlchcs1 f0 \ltrchcs0 \insrsid6518380 Rrrrrr}{ tlchcs1 f0 \ltrchcs0 \insrsid15677948 , (}{ tlch cs1 f0 \ltrchcs0 \insrsid6518380 Rrrrr}{ tlchcs1 f0 \ltrchcs0 \insrsid15677948 .:}{ tlchcs1 f0 +\ltrchcs0 \insrsid6518380 Rrrrrrr}{ tlchcs1 f0 \ltrchcs0 \insrsid15677948 .)+\ltrchcs0 s20\lang1031\langfe3079+ rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++ ow + \ltrrow} rowd \irow2\irowband2\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrl +rdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++\pard\plain \ltrpar +\s20\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 tlch cs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ql \li0 i0\sa200\sl276\slmult1\widctlpar\intbl\wrapdefaultspalphaspnum aautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+ rowd \irow2\irowband2\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++ ow + \ltrrow}\pard \ltrpar\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 +\widctlpar\intbl\wrapdefaultspalphaspnumaautodjustright in0\lin0 { tlch cs1 f0 \ltrchcs0 \insrsid15677948 rowd \irow3\irowband3\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrb +rdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +rdrsrdrw10 ++ ow + \ltrrow} rowd \irow4\irowband4\ltrrow s11 rgaph28 rrh-238 rleft-284 rkeep rbrdrtrdrsrdrw10 + rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +++++\pard\plain \ltrpar\s30\ql \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0\pararsid1648631 tlchcs1 bf0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 \insrsid6518380 Rrrrrrrrrrrrrrr}{ tlchcs1 f0 \ltrchcs0 \insrsid15677948 }{ tlchcs1 f0 \ltrchcs0 \insrsid15677948+ x1701 qr x9072\wrapdefaultaautodjustright in0\lin0\pararsid13127788 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\par }\pard \ltrpar\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0\pararsid7955638 { tlch cs1 f0fs26 \ltrchcs0 s26\insrsid15677948+\par }\pard\plain \ltrpar\s30\ql \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0\pararsid15292989 tlchcs1 bf0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+\ltrchcs0 \insrsid15677948+ s20\lang1031\langfe3079+rdrsrdrw10 rb rdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +rdrsrdrw10 +++++ ow + \ltrrow} rowd \irow5\irowband5\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrh +rdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +rdrsrdrw10 +++++++rdrsrdrw10 ++++\pard\plain \ltrpar +\s20\qr \li0 i0\widctlpar\intbl qdec x284\wrapdefault aautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+}\pard\plain \ltrpar\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+ tlchcs1 f0fs16 \ltrch cs0 s16\insrsid15677948 +s20\lang1031\langfe3079++rr}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 + tlchcs1 f0fs14 \ltrchcs0 s14\insrsid6518380 111}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid15677948 )+ tlchcs1 f0 \ltrchcs0 \insrsid15677948 rowd \irow5\irowband5\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 ++++++rdrsrdrw10 +++++++ ow + \ltrrow}\pard \ltrpar +\qr \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 +s16\insrsid6518380 Rrrrrrr}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 +}\pard \ltrpar\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0fs16 \ltrchcs0 s16\insrsid6518380 rr}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 +s14\insrsid15677948 (}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid6518380 11}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid15677948 ,}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid6518380 1}{ tlchcs1 f0fs14 \ltrch cs0 +s14\insrsid15677948 -}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid6518380 11}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid15677948 ,}{ tlchcs1 f0fs14 \ltrch cs0 s14\insrsid6518380 1}{ tlchcs1 f0fs14 \ltrchcs0 +s14\insrsid15677948 )+ s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 ++++++rdrsrdrw10 +++++++ ow + \ltrrow}\pard \ltrpar +\qr \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 +s16\insrsid6518380 RRR}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 +\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0fs16 \ltrchcs0 s16\super\insrsid15677948 +\ql \li0 i0\sa200\sl276\slmult1\widctlpar\intbl\wrapdefaultspalphaspnum aautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 rowd \irow7\irowband7\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrl +rdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 ++++rdrsrdrw10 +++++rdrsrdrw10 +++++ ow + \ltrrow}\pard \ltrpar\qr \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 +\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0fs16 \ltrchcs0 s16\insrsid6518380 Rrrrr}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 + qdec x469\wrapdefault aautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 -+ tlch cs1 f0fs16 \ltrchcs0 s16\insrsid15677948 + tlchcs1 f0 \ltrchcs0 \insrsid15677948 rowd \irow8\irowband8\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 ++++++rdrsrdrw10 +++++++ ow + \ltrrow}\pard \ltrpar +\qr \li0 i0\widctlpar\intbl qdec x284\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 +s16\insrsid6518380 Rrrrrr}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 +}\pard \ltrpar\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 { tlchcs1 f0fs16 \ltrchcs0 s16\insrsid6518380 rr}{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 +s14\insrsid15677948 (< }{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid6518380 11}{ tlchcs1 f0fs14 \ltrchcs0 s14\insrsid15677948 )+\widctlpar\intbl\wrapdefaultspalphaspnumaautodjustright in0\lin0 { tlch cs1 f0 \ltrchcs0 \insrsid15677948 rowd \irow9\irowband9\ltrrow s11 rgaph28 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrb +rdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl28 rpaddr28 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +rdrsrdrw10 ++++++++rdrsrdrw10 +++++ ow + \ltrrow} rowd \irow10\irowband10\lastrow \ltrrow s11 rgaph26 rrh-240 rleft-284 rkeep rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrh +rdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl26 rpaddr26 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 +rdrsrdrw10 +++++++rdrsrdrw10 ++++\pard\plain \ltrpar +\s20\qr \li0 i0\widctlpar\intbl qdec x284\wrapdefault aautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+}\pard\plain \ltrpar\ql \li0 i0\widctlpar\intbl\wrapdefaultaautodjustright in0\lin0 tlchcs1 f0fs20lang1025 \ltrchcs0 s20\lang1031\langfe3079+{ tlchcs1 f0fs16 \ltrchcs0 s16\insrsid15677948 .+s20\lang1031\langfe3079+ s20\lang1031\langfe3079+}\pard \ltrpar\ql \li0 i0\sa200\sl276\slmult1\widctlpar\intbl\wrapdefaultspalphaspnum aautodjustright in0\lin0 { tlchcs1 f0 \ltrchcs0 \insrsid15677948 rowd \irow10\irowband10\lastrow \ltrrow s11 rgaph26 rrh-240 rleft-284 rkeep + rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth3 rwWidth3250 rftsWidthB3 rftsWidthA3 rwWidthA34 rpaddl26 rpaddr26 rpaddfl3 rpaddfr3 blrsid7414038 blind-214 blindtype3 ++++++rdrsrdrw10 +++++++ ow + }\pard \ltrpar +\ql \li0 i0\sl-20\slmult0\widctlpar\wrapdefaultaautodjustright in0\lin0\itap0 { tlchcs1 f0 \ltrchcs0 \insrsid12525316 +\par +\par }{\* hemedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100e35a492797060000551b0000160000007468656d652f7468656d652f +7468656d65312e786d6cec594d6f1b4518be23f11f467b6f6327761a4775aad8b11b6852a2d82dea71bc3bde9d66766735334eea1b6a8f484888823850891b07 +04546a252ee5d7048aa048fd0bbc33b3bbde89d72469235a417d48bcb3cfbcdf5f33be7aed5eccd0211192f2a4edd52fd73c44129f073409dbdead61ffd29a87 +a4c24980194f48db9b12e95ddb78ffbdab785d45242608f627721db7bd48a9747d6949fab08ce5659e9204de8db988b18247112e05021f01dd982d2dd76aab4b +31a68987121c03d91d2ca894f8d21691344cbc8d9c7c8f018f4449bde03331d0c489bbc7808383ba86c8a9ec32810e316b7bc02ae04743724f798861a9e045db +ab998fb7b4717509af679b985ab0b7b4af6f3ed9be6c4370b06c788a705430adf71bad2b5b057d03606a1ed7ebf5babd7a41cf00b0ef83aa569632cd467fadde +c9699640f6eb3ced6ead596bb8f812fd9539995b9d4ea7d9ca64b1440dc87e6dcce1d76aab8dcd65076f4016df9cc3373a9bddeeaa8337208b5f9dc3f7afb456 +1b2ede802246938339b47668bf9f512f2063ceb62be16b005fab65f0190aa2a1082fcd62cc13b530d8627c978b3e203492614513a4a62919631f22b98be391a0 +5873c0eb0497ded8255fce2d696648fa82a6aaed7d9862c88a19bd97cf7e78f9ec093abefff4f8fecfc70f1e1cdfffc91272766de3242cef7af1dde77f3dfa04 +fdf9e4db170fbfacc6cb32feb71f3ffdf5972faa81903f33719e7ff5f8f7a78f9f7ffdd91fdf3fac806f0a3c2ac387342612dd2447689fc7a098b18a2b391989 +f3ed18469896776c26a1c409d65c2ae8f754e4a06f4e31cbbce3c8d121ae056f0ba81f55c0eb93bb8ec083484c14ade07c238a1de02ee7acc345a5156e685e25 +330f274958cd5c4ccab87d8c0fab787771e2f8b73749a172e661e928de8d8823e61ec389c221498842fa1d3f20a442bb3b943a76dda5bee0928f15ba435107d3 +4a930ce9c889a6d9a66d1a835fa6553a83bf1ddbecde461dceaab4de22872e12b202b30ae187843966bc8e270ac755248738666583ef6015550939980abf8ceb +49059e0e09e3a81710686d15527c2440df92d36f602859956edf65d3d8450a450faa68ee60cecbc82d7ed08d709c5661073489cad80fe4018428467b5c55c177 +b99b21fa19fc809385eebe4d89e3eed3abc12d1a3a22cd0244bf99086d45a8d54e058e69f24fe59851a8c7d6fa17578ea1003effe651854fdfd642bc093da92a +13b64f94df45b89345b7cb4540dffe9abb8527c91e81309f6f3cef4aeebb92ebfde74beea27c3e6ba19dd55628bb7a6eb053b19991e3c523f298323650534676 +a4999225348aa00f8b7aa3392292e2cc9446f0352bec0e2e14d8ec4182ab8fa98a06114e61c2ae7b9a482833d2a144299770b433cb95b4351ea674650f864d7d +64b0054162b5cb03bbbca297f3934141c6b49bd09c3f73462b9ac05999ad5cc98882daafc2acae853a33b7ba11cdd43a875ba13238715e35582cac09130882b9 +05acbc0a8774cd1a4e26989140dbdd36dfdc2dc60b17e92219e180643ed27acffba86e9c94c78ab90c80d8a9f0913ee69d62b512b79626fb1adccee2a432bbc6 +0276b9f75ec74b7904cfbca413f7443ab2a49c9c2c41476dafd55c6e7ac8c769db1bc3a116bec629785deaa10fb3106e877c256cd89f9acc26cb67de6ce58ab9 +4950878b0a6bf739859d3a900aa9b6b08c6c6898575908b04473b2f22f37c1ac17a5808df4579062650d82e18d490176745d4bc663e2abb2b34b2bda76f6312b +a57ca2881844c1111ab189d8c7e07e1daaa04f4025dc4d988aa01fe0264d5bdbbc728b739674e5fb2b83b3eb98a511cecaad4ed13c932ddce4712183792a8907 +ba55ca6e943bbf2a26e52f48957218ffcf54d1fd04ae0a5602ed011fee7205463a5fdb1e172ae25085d288fa7d019383a91d102d701b0baf21a8e046d9fc17e4 +50ffb739676998b486139fdaa7211214fa918a04217b50964cf49d42ac9ef52e4b9265844c4495c495a9157b440e091bea1ab8aa7bbb87220875534db2326070 +27e3cf7dce326814ea21a79c6f4e0d297aafcd817f7bf2b1c90c4ab975d80c34b9fd0b112bbaaadd6fb6e7bdb7ac887e311bb31a795600b3522b686569ff8a22 +9cb3d5da8a35a7f17233170ebc38af312c1603510a173e48ff81fe4785cf880963dd50877c1f6a2b829f1a3431081b88ea4b76f040ba40dac5110c4e76d10693 +26654d9b8d4eda6a79b3bee049b7e07bc2d85ab2b3f8fb9cc62e8633979d938b1769ecccc28eadedda425383674fa6282c8df3938c718cf95dabfcc3131fdd05 +476fc105ff84296982097e55121846cf81c903487ecbd16cddf81b0000ffff0300504b0304140006000800000021000dd1909fb60000001b0100002700000074 +68656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384 +e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d26 +2452282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe51 +4173d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c0200001300000000000000 +000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b000000000000 +00000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000 +190200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100e35a492797060000551b000016000000 +00000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b010000 +2700000000000000000000000000a10900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d0100009c0a00000000} +{\*+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\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 \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 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5; +\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdpriority59 \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 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000e086 +b38d414bd801feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +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 061359a979ec..5ed7bb274564 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/style/LineSpacingMode.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/TabStop.hpp> +#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/text/RelOrientation.hpp> @@ -1891,6 +1892,32 @@ CPPUNIT_TEST_FIXTURE(Test, test158044Tdf) CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, fillStyle); } } + +CPPUNIT_TEST_FIXTURE(Test, test148544Tdf) +{ + createSwDoc("tdf148544.rtf"); + uno::Reference<text::XTextTablesSupplier> tablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XNameAccess> tables = tablesSupplier->getTextTables(); + uno::Reference<text::XTextTable> xTable1(tables->getByName(u"Table2"_ustr), uno::UNO_QUERY); + const char* aCellNames[] = { "B2", "C5", "F6", "F7", "F8", "F9", "F10", "F11" }; + for (tools::ULong nName = 0; nName < sizeof(aCellNames) / sizeof(const char*); ++nName) + { + uno::Reference<table::XCell> xCell + = xTable1->getCellByName(OUString::createFromAscii(aCellNames[nName])); + uno::Reference<beans::XPropertySet> xPropSet(xCell, uno::UNO_QUERY_THROW); + + const char* aBorderNames[] = { "BottomBorder", "TopBorder", "RightBorder", "LeftBorder" }; + for (tools::ULong nBorder = 0; nBorder < sizeof(aBorderNames) / sizeof(const char*); + ++nBorder) + { + table::BorderLine bottomBorder = getProperty<table::BorderLine>( + xCell, OUString::createFromAscii(aBorderNames[nBorder])); + + CPPUNIT_ASSERT(!bottomBorder.InnerLineWidth); + CPPUNIT_ASSERT(!bottomBorder.OuterLineWidth); + } + } +} // tests should only be added to rtfIMPORT *if* they fail round-tripping in rtfEXPORT } // end of anonymous namespace diff --git a/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx index 85d730e859c6..9f5a465b993e 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx @@ -253,10 +253,47 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) m_aStates.top().getTableRowSprms().set(NS_ooxml::LN_CT_TblGridBase_gridCol, pXValue, RTFOverwrite::NO_APPEND); dispatchSymbol(RTFKeyword::CELL); - // Adjust total width, which is done in the m_nTopLevelCurrentCellX += m_aStates.top().getTableRowWidthAfter(); + int nCellCount = 0; + for (Buf_t& i : m_aTableBufferStack.back()) + { + if (BUFFER_CELLEND == std::get<0>(i)) + ++nCellCount; + } + if (m_nTopLevelCells < nCellCount) + { + m_nTopLevelCells++; + m_aTopLevelTableCellsSprms.push_back(m_aStates.top().getTableCellSprms()); + m_aTopLevelTableCellsAttributes.push_back( + m_aStates.top().getTableCellAttributes()); + } + + if (m_aTopLevelTableCellsSprms.size() >= o3tl::make_unsigned(nCellCount)) + { + Id aBorderIds[] + = { NS_ooxml::LN_CT_TcBorders_bottom, NS_ooxml::LN_CT_TcBorders_top, + NS_ooxml::LN_CT_TcBorders_left, NS_ooxml::LN_CT_TcBorders_right }; + RTFSprms& rCurrentCellSprms = m_aTopLevelTableCellsSprms[nCellCount - 1]; + for (size_t i = 0; i < 4; i++) + { + RTFSprms aAttributes; + RTFSprms aSprms; + auto pBorderValue = new RTFValue(aAttributes, aSprms); + auto pTypeValue = new RTFValue(NS_ooxml::LN_Value_ST_Border_none); + auto pSizeValue = new RTFValue(0); + putNestedSprm(rCurrentCellSprms, NS_ooxml::LN_CT_TcPrBase_tcBorders, + aBorderIds[i], pBorderValue, RTFOverwrite::YES); + RTFSprms* pAttributes = &getLastAttributes( + rCurrentCellSprms, NS_ooxml::LN_CT_TcPrBase_tcBorders); + if (pAttributes) + { + pAttributes->set(NS_ooxml::LN_CT_Border_val, pTypeValue); + pAttributes->set(NS_ooxml::LN_CT_Border_sz, pSizeValue); + } + } + } m_aStates.top().setTableRowWidthAfter(0); } diff --git a/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx b/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx index 2344f5d7febe..8de5fc4fe750 100644 --- a/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx +++ b/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx @@ -1077,8 +1077,10 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) break; case RTFKeyword::BRDRW: { - // dmapper expects it in 1/8 pt, we have it in twip - but avoid rounding 1 to 0 - if (nParam > 1) + // dmapper expects it in 1/8 pt, we have it in twip - but avoid rounding 1 or 2 to 0 + if (nParam == 2) + nParam = 1; + else if (nParam > 1) nParam = nParam * 2 / 5; auto pValue = new RTFValue(nParam); putBorderProperty(m_aStates, NS_ooxml::LN_CT_Border_sz, pValue);