sw/qa/extras/layout/data/section-break-hidden-paragraphs.rtf | 2 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 17 sw/qa/extras/rtfimport/data/165717.rtf | 178 +++++++ sw/qa/extras/rtfimport/data/165805.rtf | 271 +++++++++++ sw/qa/extras/rtfimport/rtfimport.cxx | 16 sw/source/writerfilter/dmapper/DomainMapper.cxx | 2 sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 4 sw/source/writerfilter/dmapper/PropertyMap.cxx | 137 +++-- sw/source/writerfilter/dmapper/PropertyMap.hxx | 3 sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx | 6 10 files changed, 578 insertions(+), 58 deletions(-)
New commits: commit 8c1929b395e15b3f3b17956f430a8fbd64e4c0a8 Author: Oliver Specht <[email protected]> AuthorDate: Tue Mar 18 15:03:31 2025 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Mar 24 11:27:03 2025 +0100 tdf#165805 RTF import of \page at table end fixed With 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625 page breaks in tables were ignored in docx import. That is not done in RTF import anymore. Change-Id: I7a0fa859360323376f84570a289ba91079f171cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183159 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/sw/qa/extras/rtfimport/data/165805.rtf b/sw/qa/extras/rtfimport/data/165805.rtf new file mode 100644 index 000000000000..8c9456bb0ebb --- /dev/null +++ b/sw/qa/extras/rtfimport/data/165805.rtf @@ -0,0 +1,271 @@ +{ tf1deflang1025nsinsicpg1252\uc1deff31507\deff0\stshfdbch31505\stshfloch46\stshfhich46\stshfbi31507\deflang1031\deflangfe1041 hemelang1031 hemelangfe1041 hemelangcs0{ onttbl{ 0 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};} +{ 34 bidi roman charset0 prq2{\*\panose 02040503050406030204}Cambria Math;}{ 35 bidi swiss charset128 prq2{\*\panose 020b0400000000000000}Yu Gothic{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ 46 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Liberation Sans;}{ 51 bidi swiss charset128 prq2{\*\panose 020b0400000000000000}@Yu Gothic;} +{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};} +{ dbmajor 31501 bidi swiss charset128 prq2{\*\panose 020b0300000000000000}Yu Gothic Light{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};}{ himajor 31502 bidi swiss charset0 prq2 Aptos Display;} +{ bimajor 31503 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};}{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};} +{ dbminor 31505 bidi swiss charset128 prq2{\*\panose 020b0400000000000000}Yu Gothic{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ himinor 31506 bidi swiss charset0 prq2 Aptos;} +{ biminor 31507 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};}{ 52 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ 53 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ 55 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ 56 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ 57 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ 58 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ 59 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ 60 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ 392 bidi roman charset238 prq2 Cambria Math CE;}{ 393 bidi roman charset204 prq2 Cambria Math Cyr;}{ 395 bidi roman charset161 prq2 Cambria Math Greek;} +{ 396 bidi roman charset162 prq2 Cambria Math Tur;}{ 399 bidi roman charset186 prq2 Cambria Math Baltic;}{ 400 bidi roman charset163 prq2 Cambria Math (Vietnamese);} +{ 404 bidi swiss charset0 prq2 Yu Gothic Western{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ 402 bidi swiss charset238 prq2 Yu Gothic CE{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ 403 bidi swiss charset204 prq2 Yu Gothic Cyr{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ 405 bidi swiss charset161 prq2 Yu Gothic Greek{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ 406 bidi swiss charset162 prq2 Yu Gothic Tur{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ 409 bidi swiss charset186 prq2 Yu Gothic Baltic{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ 512 bidi swiss charset238 prq2 Liberation Sans CE;}{ 513 bidi swiss charset204 prq2 Liberation Sans Cyr;}{ 515 bidi swiss charset161 prq2 Liberation Sans Greek;}{ 516 bidi swiss charset162 prq2 Liberation Sans Tur;} +{ 517 bidi swiss charset177 prq2 Liberation Sans (Hebrew);}{ 519 bidi swiss charset186 prq2 Liberation Sans Baltic;}{ 520 bidi swiss charset163 prq2 Liberation Sans (Vietnamese);}{ 564 bidi swiss charset0 prq2 @Yu Gothic Western;} +{ 562 bidi swiss charset238 prq2 @Yu Gothic CE;}{ 563 bidi swiss charset204 prq2 @Yu Gothic Cyr;}{ 565 bidi swiss charset161 prq2 @Yu Gothic Greek;}{ 566 bidi swiss charset162 prq2 @Yu Gothic Tur;} +{ 569 bidi swiss charset186 prq2 @Yu Gothic Baltic;}{ lomajor 31508 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};}{ lomajor 31509 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};} +{ lomajor 31511 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ lomajor 31512 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ lomajor 31513 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ lomajor 31514 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};} +{ lomajor 31515 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};}{ lomajor 31516 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};} +{ dbmajor 31520 bidi swiss charset0 prq2 Yu Gothic Light Western{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};}{ dbmajor 31518 bidi swiss charset238 prq2 Yu Gothic Light CE{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{ dbmajor 31519 bidi swiss charset204 prq2 Yu Gothic Light Cyr{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{ dbmajor 31521 bidi swiss charset161 prq2 Yu Gothic Light Greek{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{ dbmajor 31522 bidi swiss charset162 prq2 Yu Gothic Light Tur{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{ dbmajor 31525 bidi swiss charset186 prq2 Yu Gothic Light Baltic{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};}{ himajor 31528 bidi swiss charset238 prq2 Aptos Display CE;} +{ himajor 31529 bidi swiss charset204 prq2 Aptos Display Cyr;}{ himajor 31531 bidi swiss charset161 prq2 Aptos Display Greek;}{ himajor 31532 bidi swiss charset162 prq2 Aptos Display Tur;} +{ himajor 31535 bidi swiss charset186 prq2 Aptos Display Baltic;}{ himajor 31536 bidi swiss charset163 prq2 Aptos Display (Vietnamese);}{ bimajor 31538 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ bimajor 31539 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ bimajor 31541 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};} +{ bimajor 31542 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};}{ bimajor 31543 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};} +{ bimajor 31544 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ bimajor 31545 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ bimajor 31546 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ lominor 31548 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ lominor 31549 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ lominor 31551 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};} +{ lominor 31552 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};}{ lominor 31553 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};} +{ lominor 31554 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ lominor 31555 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ lominor 31556 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ dbminor 31560 bidi swiss charset0 prq2 Yu Gothic Western{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ dbminor 31558 bidi swiss charset238 prq2 Yu Gothic CE{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ dbminor 31559 bidi swiss charset204 prq2 Yu Gothic Cyr{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ dbminor 31561 bidi swiss charset161 prq2 Yu Gothic Greek{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ dbminor 31562 bidi swiss charset162 prq2 Yu Gothic Tur{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{ dbminor 31565 bidi swiss charset186 prq2 Yu Gothic Baltic{\* alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{ himinor 31568 bidi swiss charset238 prq2 Aptos CE;}{ himinor 31569 bidi swiss charset204 prq2 Aptos Cyr;} +{ himinor 31571 bidi swiss charset161 prq2 Aptos Greek;}{ himinor 31572 bidi swiss charset162 prq2 Aptos Tur;}{ himinor 31575 bidi swiss charset186 prq2 Aptos Baltic;} +{ himinor 31576 bidi swiss charset163 prq2 Aptos (Vietnamese);}{ biminor 31578 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};}{ biminor 31579 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};} +{ biminor 31581 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ biminor 31582 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ biminor 31583 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ biminor 31584 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};} +{ biminor 31585 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};}{ biminor 31586 bidi roman charset163 prq2 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; ed0\green0lue0; ed0\green0lue0;++\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 } oqfpromote {\stylesheet{\ql \li0 i0\sa160\sl278\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f31507fs24lang1025 +\ltrch cs0 s24\lang1031\langfe1041\kerning2\loch 46\hichf46\dbchf31505+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel0djustright in0\lin0\itap0 tlch cs1 f31503fs40lang1025 \ltrch cs0 + s40+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel1djustright in0\lin0\itap0 tlch cs1 f31503fs32lang1025 \ltrch cs0 + s32+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel2djustright in0\lin0\itap0 tlch cs1 f31503fs28lang1025 \ltrch cs0 + s28+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel3djustright in0\lin0\itap0 tlch cs1 if31503fs24lang1025 \ltrch cs0 +\i s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel4djustright in0\lin0\itap0 tlch cs1 f31503fs24lang1025 \ltrch cs0 + s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel5djustright in0\lin0\itap0 tlch cs1 if31503fs24lang1025 \ltrch cs0 +\i s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel6djustright in0\lin0\itap0 tlch cs1 f31503fs24lang1025 \ltrch cs0 + s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel7djustright in0\lin0\itap0 tlch cs1 if31503fs24lang1025 \ltrch cs0 +\i s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel8djustright in0\lin0\itap0 tlch cs1 f31503fs24lang1025 \ltrch cs0 + s24+Default Paragraph Font;}{\* s11 srowd rftsWidthB3 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blind0 blindtype3 svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr sbrdrh sbrdrv \ql \li0 i0\sa160\sl278\slmult1 +\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f31507fs24lang1025 \ltrch cs0 s24\lang1031\langfe1041\kerning2\loch 46\hichf46\dbchf31505+Normal Table;}{\*+ s32+\sbasedon10 \slink3 \ssemihidden \spriority9 \styrsid6043305 \'dcberschrift 3 Zchn;}{\*+\'dcberschrift 4 Zchn;}{\*+\ltrch cs0 \i+\sbasedon10 \slink7 \ssemihidden \spriority9 \styrsid6043305 \'dcberschrift 7 Zchn;}{\*+\'dcberschrift 8 Zchn;}{\*+\s24\ql \li0 i0\sa80\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0+ s56xpnd-2xpndtw-10\lang1031\langfe1041\kerning28\loch 31502\hichf31502\dbchf31501+ s56xpnd-2xpndtw-10\kerning28\loch 31502\hichf31502\dbchf31501 \sbasedon10 \slink24 \spriority10 \styrsid6043305 Titel Zchn;}{\s26\ql \li0 i0\sa160\sl278\slmult1\widctlpar\wrapdefaultspalphaspnum aauto\ilvl1djustright in0\lin0\itap0 + tlch cs1 f31503fs28lang1025 \ltrch cs0 s28xpnd3xpndtw15++\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 if31507fs24lang1025 \ltrch cs0 \i s24+\sbasedon0 \snext0 \slink29 \sqformat \spriority29 \styrsid6043305 Quote;}{\*+\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin720\itap0+\sbasedon0 \snext30 \sqformat \spriority34 \styrsid6043305 List Paragraph;}{\*+\widctlparrdrtrdrsrdrw10rsp200rdrcf19 rdrbrdrsrdrw10rsp200rdrcf19 \wrapdefaultspalphaspnum aautodjustright in864\lin864\itap0 tlch cs1 if31507fs24lang1025 \ltrch cs0 +\i s24+\sbasedon10 \slink32 \spriority30 \styrsid6043305 Intensives Zitat Zchn;}{\*+ sid1056961 sid6043305 sid8217171 sid8653403 sid13333028 sid15952640}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{uthor Oliver Specht} +{\operator Oliver Specht}{+word/2003/wordml}}\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1134\gutter0\ltrsect +\deftab708\widowctrl tnbjenddoc\hyphhotz425 rackmoves0 rackformatting1\donotembedsysfont1 elyonvml0\donotembedlingdata0\grfdocevents0 alidatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0 +\showxmlerrors1 oxlattoyenxpshrtn oultrlspc\dntblnsbdb ospaceforul ormshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1417\dgvorigin1417\dghshow1\dgvshow1 +\jexpand iewkind1 iewscale100\pgbrdrhead\pgbrdrfoot\splytwnine tnlytwnine\htmautsp olnhtadjtbl\useltbalnlntblind\lytcalctblwd\lyttblrtgr\lnbrkrule obrkwrptbl\snaptogridincellllowfieldendsel\wrppunct +sianbrkrule sidroot6043305 ewtblstyruls ogrowautofit\usenormstyforlist oindnmbrts elnbrelev ocxsptable\indrlsweleven oafcnsttblfelev\utinl\hwelev\spltpgpar otcvasp otbrkcnstfrctbl otvatxbx\krnprsnet+{\*\wgrffmtfilter 2450} ofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\headery708 ootery708+\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 )}}\pard\plain \ltrpar\ql \li0 i0\sa160\sl278\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid6043305 tlch cs1 f31507fs24lang1025 \ltrch cs0 + s24\lang1031\langfe1041\kerning2\lochf46\hichf46\dbchf31505+\par \ltrrow} rowd \irow0\irowband0\lastrow \ltrrow s11 rgaph70 rleft0 rkeep rftsWidth1 rpaddl70 rpaddr70 rpaddfl3 rpaddfr3 blrsid14635698 blind0 blindtype3 ++\widctlpar\intbl\wrapdefaultspalphaspnum aautodjustright in0\lin0\pararsid6043305 { tlch cs1 f31507 \ltrch cs0 \lang3079\langfe1041\langnp3079\insrsid6043305+\ltrch cs0 \lang3079\langfe1041\langnp3079\insrsid6043305+\par +\par + rowd \irow0\irowband0\lastrow \ltrrow s11 rgaph70 rleft0 rkeep rftsWidth1 rpaddl70 rpaddr70 rpaddfl3 rpaddfr3 blrsid14635698 blind0 blindtype3 ++\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid6043305 { tlch cs1 f31507 \ltrch cs0 \lang1033\langfe1041\langnp1033\insrsid6043305+\lang1040\langfe1041\langnp1040\insrsid6043305 \hichf46\dbchf31505\loch 46 INFORMATION}{ tlch cs1 bf31507 \ltrch cs0 \lang1040\langfe1041\langnp1040\insrsid6043305+\par }\pard \ltrpar\ql \li0 i0\sa160\sl278\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 { tlch cs1 f31507 \ltrch cs0 \lang1040\langfe1041\langnp1040\insrsid534836+\par }{\* hemedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b0304140006000800000021001c7541e88d070000c7200000160000007468656d652f7468656d652f +7468656d65312e786d6cec594b8f1bb911be07c87f20fa2eab5b8f9634b0bcd0d3b3f68c6d58b2833d72244a4d0fbbd968523316160602ef299700017617b904 +c82d8720c80259208b5cf2630cd848363f224576ab454a94e70103318299b9a8d95f153f5615abaac9fb5fbc8e19ba2099a03ce97ac13ddf432499f1394d965d +efc5745c697b48489ccc31e309e97a6b22bc2f1efcf217f7f1918c484c10c827e20877bd48caf4a85a153318c6e21e4f4902ef163c8bb184c76c599d67f812f4 +c6ac5af3fdb01a639a7828c131a87dba58d019f11e6cd48e18e84ea4500333964d9452b28f9d9f070a21d662c032748159d78319e6fc724a5e4b0f312c24bce8 +7abefef3aa0fee57f15121c4e40159436eacff0ab942607e5ed37366cbb372527f546b378252bf0630b98f1bb5d57fa94f03f06c062bcdb9983a8366e8b76b05 +d600e53f1dba3bada06ee30dfdf53dce4127ecd71a967e0dcaf537f6f0feb8331a362dbc06e5f8e61ebee7d7fa9dba85d7a01c1feee11ba35eab36b2f01a1431 +9a9cefa3c356bb1d16e812b2e0ecd809ef84a1df1a16f02d0aa2a18c2e35c58227f250acc5f815cfc600504086254d905ca764816710bfbd5472818654a40caf +3d94e2840b18f66b4100a1d7f06be5bfb6383e22d89056bc8089d81b527c90986534955def1168f50cc8fb9f7e7af7f6c7776ffffeee9b6fdebdfd2b3aa1cb48 +e6aa2cb9639c2c4db99ffff4bbfffce1d7e8df7ffbe3cfdf7ee7c60b13ffe12fbff9f08f7f7e4c3d6cb5ad29de7fffc3871f7f78fffbdffeebcfdf3ab4f7327c +66c2a73426023d2197e8398f6181da14367f7296dd4c621a616a4af492a5c00956b338f48f6464a19fac31c30e5c9fd8767c9941aa71011fae5e59842751b692 +d4a1f171145bc053ce599f674e2b3c567319669eae92a57bf26c65e29e637ce19a7b8013cbcba3550a3996ba540e2262d17cc67022f192244422f58e9f13e258 +dd57945a763da5b38c0bbe90e82b8afa983a4d32a56756346d858e690c7e59bb0882bf2ddb9cbe447dce5cab1e920b1b097b033307f9296196191fe295c4b14b +e514c7cc34f80996918be4649dcd4cdc4848f0f492308e467322844be66906eb359cfe18437673bafd94ad631b99497aeed27982393791437e3e88709cbab013 +9a4426f64b710e218ad1332e5df0536eef10f50c7ec0c94177bfa4c472f7d5d9e005643993d23640d49b55e6f0e543c2adf89dacd9021357aae965b195627b19 +7546477fb5b442fb8410862ff19c10f4e24b07833e4f2d9b6f493f8a20ab1c1357603dc276acaae78408827473b39f274fa8b042764296fc009fd3f54ee259e3 +24c6d921cd4fc0eba6cd4767196c46c73a9fb2d9b9097c42a1fb8378711ae5a9001d46701fd4fa2cc2560153cfc21dafebccf2df75f618eccb57168d6bec4b90 +21379681c46eca7cd43653ccac09b60133c5149db8d22d8858eedf8aa8e2aac5564eb985bd69b76e80eec86a7a629a5cd101fd6f3a1f47207e9a9ec7add84a58 +37ec760e2594e39d1ee7106eb7b319f06c4e3fffc6668857c93302b5643f6bddf535777d8df77fdfd71cdacf77ddcca19ee3ae9bf1a0cbb8eb668a03964fd3cd +6c1b18e86dd421437ed8a38f7ee283273f0bcad844ae193911faf047c037cd7c0c834a4e9f7792f224308de0a72a733081855b6658cba08ccb5f51194d229cc2 +0951e029254b51a85e0a94720107477ad8a95be1d92a3ee5f3fcc0539f30f9796515586ec7fd261c3de5e37058257374d82a06153f7daa0a7c35dba53e6cdd10 +50b23721614c6693a83b48b4368357905067679f8645c7c1a2add46f5cb5670aa0567a053eba117caa77bd6643118233723183067daefc94bb7ae35dedcc4fe9 +e943c6b422000e17f395c0a17ce9e98ee27a70796a7579a85dc3d31609ed943cac6c12da32bac113117c0a17d1a946af43e3a6beee6c5d6ad153a6d0f3417c6f +69b4da1f63715b5f83dc6e6e6089992958822ebb5e586f42c8cc70daf51670700c3fe3146247a8ef2ecc9670ef329359bee16f9359d24cc82116516e709d7472 +f7c454920c311a773db5fcd20d2cd13944730b6a90103e5b721d482b9f1b3970baed64b258909934dd6e8c284be78f90e1f35ce17cabc56f0f56927c05ee9e44 +f34b74c656d9730c21d66c05ca80732ae0fe20c8ad39a770215626b26dfced14a622f99b37523a86f271ccd2081715c54ce6395cd793928e7e2a6d603c156b06 +831a26290ae1d9521558d3a856352d4b57cee160d5bd5a4859ce489adb9a6965155535dd59cc9a615306766c79bb226fb0da9818729a59e1f3d4bd9b723b9b5c +b7d3279455020c5edaef76a5dfa0b69dcca2a618efa76195b38b51bb766c167805b5eb140923eb871bb53b762b6b84733a18bc55e507b9dda885a1c5a6afd496 +d677e6e6e5363f7b05c963085dee8a49a15d0957d71986ae6ca27b923c6dc016792d8bad01bfd02aa35def6bbfd96b0c6acd41c56f37479546bde157dacd5ebd +d26b36ebc1a819f8c37eed0d141619c54133bfaf1fc325065b17b7f67a7cefe63ededcd3dc9bf1b8caf5cd7c5513d737f741cd71738fa6ea82de431492ced761 +6ddca977fa61a553ef8d2b8d61bf5de90cc27e65180e5ac3f170d06c77c66f3c74a1c18d5e7dd00847ed4a180c069546e82bfaed4ea5d5a8d57a8d56af3d6af4 +de146d0cac3c4f1f852dc0bc9ad783ff020000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d65 +2f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0d +ae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a +939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0 +239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000000000000000 +5b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000000000300100 +005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c00000000000000000000000000190200007468656d652f +7468656d652f7468656d654d616e616765722e786d6c504b01022d00140006000800000021001c7541e88d070000c72000001600000000000000000000000000 +d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000000000000000 +00000000970a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000920b00000000} +{\*+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax376\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 Normal Table;\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 Table Simple 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\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;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000 +02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000007036 +6a951698db01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +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 32a432e19417..fb422b0f53c7 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2022,6 +2022,13 @@ CPPUNIT_TEST_FIXTURE(Test, test165483Tdf) CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xStyle, u"ParaBottomMargin"_ustr)); } +CPPUNIT_TEST_FIXTURE(Test, test165805Tdf) +{ + createSwDoc("165805.rtf"); + //without page break there would be only one page + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + // tests should only be added to rtfIMPORT *if* they fail round-tripping in rtfEXPORT } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index 30c88d92a22a..211289cf44e8 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -1608,7 +1608,9 @@ void DomainMapper_Impl::deferBreak( BreakType deferredBreakType) case PAGE_BREAK: // See SwWW8ImplReader::HandlePageBreakChar(), page break should be // ignored inside tables. - if (0 < m_StreamStateStack.top().nTableDepth) + // but not in RTF import + + if (0 < m_StreamStateStack.top().nTableDepth && !IsRTFImport()) return; m_StreamStateStack.top().bIsPageBreakDeferred = true; commit 8045c7bcdd633f4ce6175723bbb7b8d6a300c14b Author: Oliver Specht <[email protected]> AuthorDate: Wed Mar 12 15:39:00 2025 +0100 Commit: Thorsten Behrens <[email protected]> CommitDate: Mon Mar 24 11:26:52 2025 +0100 tdf#165717, tdf#165718 additional hack to apply continuous section breaks Keeps reference to range in front of the current range to apply page style to an already available page break in cases where the section starts with a table. Page number restart is also applied in the old and the new code. Remove of dummy section paragraphs introduced with b696600821d8aafb63b6a88016d299ef89478f56 is now only performed if it is no RTF import. This causes: Test name: testHiddenParaBreaks::TestBody equality assertion failed - Expected: 3 - Actual : 4 - In <>, XPath '/root/page[2]/body/txt' number of nodes is incorrect But the file is not imported correctly anyway and this is actually fixing a bug, so adapt the test file. rtfimport.cxx:910:Assertion Test name: (anonymous namespace)::testContSectionPageBreak::TestBody equality assertion failed - Expected: THIRD - Actual : The problem here is that the extra paragraph that is inserted for \sect if m_bIgnoreNextContSectBreak is now wrong as it was previously removed but no longer is, so don't insert the extra paragraph any more. But leave the extra paragraph in case it's a frame, otherwise we get: rtfexport8.cxx:91:(anonymous namespace)::testTdf158586_0::TestBody equality assertion failed - Expected: 1 - Actual : 2 testTd112202 fails, but Oliver says that extra page 6 is an improvement. Change-Id: Ie9a22f00e75c797762f52e6b865e32002051988c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183084 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/sw/qa/extras/layout/data/section-break-hidden-paragraphs.rtf b/sw/qa/extras/layout/data/section-break-hidden-paragraphs.rtf index f8526dafe5ea..4dc442bea367 100644 --- a/sw/qa/extras/layout/data/section-break-hidden-paragraphs.rtf +++ b/sw/qa/extras/layout/data/section-break-hidden-paragraphs.rtf @@ -54,7 +54,7 @@ Normal Table;}{\* s15 srowd rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbr s22\lang2057\langfe1028\lochf31506\hichf31506\dbchf31505 \linex0\headery708 ootery708 \ltrch cs0 s22\lang2057\langfe1028\lochf31506\hichf31506\dbchf31505-\par \par }{ tlch cs1 f31507 \ltrch cs0 \lang1031\langfe1028\langnp1031 +\par }{ tlch cs1 f31507 \ltrch cs0 \lang1031\langfe1028\langnp1031 \par \ltrrow} rowd \irow0\irowband0\lastrow \ltrrow s15 rgaph108 rleft5 rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 rftsWidth1 rftsWidthB3 rautofit1 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 bllkhdrrows bllkhdrcols bllknocolband blind0 blindtype3 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index d9056a70222c..f8909b1f1c7f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -713,14 +713,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112202, "090716_Studentische_Arbeit_VWS.docx") "portion"_ostr, u"Titel der studentischen Arbeit"_ustr); assertXPath(pXmlDoc, "/root/page[5]/header//anchored"_ostr, 0); - // page 6: same as page 4 - assertXPath(pXmlDoc, "/root/page[6]/header/txt"_ostr, 1); - assertXPath(pXmlDoc, "/root/page[6]/header/tab"_ostr, 1); - assertXPath( - pXmlDoc, - "/root/page[6]/header/tab/row[1]/cell[1]/txt[1]/SwParaPortion/SwLineLayout/SwParaPortion"_ostr, - "portion"_ostr, u"Titel der studentischen Arbeit"_ustr); - assertXPath(pXmlDoc, "/root/page[6]/header//anchored"_ostr, 0); + // page 7: same as page 4 + // page 6 is automatically empty since page number is applied with tdf#165717 tdf#165718 + assertXPath(pXmlDoc, "/root/page[7]/header/txt", 1); + assertXPath(pXmlDoc, "/root/page[7]/header/tab", 1); + assertXPath(pXmlDoc, + "/root/page[7]/header/tab/row[1]/cell[1]/txt[1]/SwParaPortion/SwLineLayout/" + "SwParaPortion", + "portion", u"Titel der studentischen Arbeit"_ustr); + assertXPath(pXmlDoc, "/root/page[7]/header//anchored", 0); } CPPUNIT_TEST_FIXTURE(Test, testTdf79435_legacyInputFields) diff --git a/sw/qa/extras/rtfimport/data/165717.rtf b/sw/qa/extras/rtfimport/data/165717.rtf new file mode 100644 index 000000000000..b5531d92e8d2 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/165717.rtf @@ -0,0 +1,178 @@ +{ tf1deflang1025nsinsicpg1252\uc1deff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1031\deflangfe1041 hemelang3079 hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};} +{ 1 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Arial{\* alt Arial};}{ 34 bidi roman charset0 prq2{\*\panose 02040503050406030204}Cambria Math;}{ 48 bidi swiss charset0 prq2{\*\panose 020b0502040204020203}Segoe UI;} +{ 49 bidi swiss charset0 prq2{\*\panose 020b0503020204020204}Corbel;}{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};} +{ dbmajor 31501 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};}{ himajor 31502 bidi roman charset0 prq2{\*\panose 02040503050406030204}Cambria;} +{ bimajor 31503 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};}{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};} +{ dbminor 31505 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};}{ himinor 31506 bidi swiss charset0 prq2{\*\panose 020f0502020204030204}Calibri;} +{ biminor 31507 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Arial};}{ 51 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ 52 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ 54 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ 55 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ 56 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ 57 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ 58 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ 59 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ 61 bidi swiss charset238 prq2 Arial CE{\* alt Arial};}{ 62 bidi swiss charset204 prq2 Arial Cyr{\* alt Arial};} +{ 64 bidi swiss charset161 prq2 Arial Greek{\* alt Arial};}{ 65 bidi swiss charset162 prq2 Arial Tur{\* alt Arial};}{ 66 bidi swiss charset177 prq2 Arial (Hebrew){\* alt Arial};} +{ 67 bidi swiss charset178 prq2 Arial (Arabic){\* alt Arial};}{ 68 bidi swiss charset186 prq2 Arial Baltic{\* alt Arial};}{ 69 bidi swiss charset163 prq2 Arial (Vietnamese){\* alt Arial};} +{ 391 bidi roman charset238 prq2 Cambria Math CE;}{ 392 bidi roman charset204 prq2 Cambria Math Cyr;}{ 394 bidi roman charset161 prq2 Cambria Math Greek;}{ 395 bidi roman charset162 prq2 Cambria Math Tur;} +{ 398 bidi roman charset186 prq2 Cambria Math Baltic;}{ 399 bidi roman charset163 prq2 Cambria Math (Vietnamese);}{ 531 bidi swiss charset238 prq2 Segoe UI CE;}{ 532 bidi swiss charset204 prq2 Segoe UI Cyr;} +{ 534 bidi swiss charset161 prq2 Segoe UI Greek;}{ 535 bidi swiss charset162 prq2 Segoe UI Tur;}{ 536 bidi swiss charset177 prq2 Segoe UI (Hebrew);}{ 537 bidi swiss charset178 prq2 Segoe UI (Arabic);} +{ 538 bidi swiss charset186 prq2 Segoe UI Baltic;}{ 539 bidi swiss charset163 prq2 Segoe UI (Vietnamese);}{ 541 bidi swiss charset238 prq2 Corbel CE;}{ 542 bidi swiss charset204 prq2 Corbel Cyr;} +{ 544 bidi swiss charset161 prq2 Corbel Greek;}{ 545 bidi swiss charset162 prq2 Corbel Tur;}{ 548 bidi swiss charset186 prq2 Corbel Baltic;}{ 549 bidi swiss charset163 prq2 Corbel (Vietnamese);} +{ lomajor 31508 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};}{ lomajor 31509 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};} +{ lomajor 31511 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ lomajor 31512 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ lomajor 31513 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ lomajor 31514 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};} +{ lomajor 31515 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};}{ lomajor 31516 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};} +{ dbmajor 31518 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};}{ dbmajor 31519 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};} +{ dbmajor 31521 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ dbmajor 31522 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ dbmajor 31523 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ dbmajor 31524 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};} +{ dbmajor 31525 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};}{ dbmajor 31526 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ himajor 31528 bidi roman charset238 prq2 Cambria CE;} +{ himajor 31529 bidi roman charset204 prq2 Cambria Cyr;}{ himajor 31531 bidi roman charset161 prq2 Cambria Greek;}{ himajor 31532 bidi roman charset162 prq2 Cambria Tur;} +{ himajor 31535 bidi roman charset186 prq2 Cambria Baltic;}{ himajor 31536 bidi roman charset163 prq2 Cambria (Vietnamese);}{ bimajor 31538 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ bimajor 31539 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ bimajor 31541 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};} +{ bimajor 31542 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};}{ bimajor 31543 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};} +{ bimajor 31544 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ bimajor 31545 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ bimajor 31546 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ lominor 31548 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ lominor 31549 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ lominor 31551 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};} +{ lominor 31552 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};}{ lominor 31553 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};} +{ lominor 31554 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ lominor 31555 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ lominor 31556 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ dbminor 31558 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};} +{ dbminor 31559 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};}{ dbminor 31561 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};} +{ dbminor 31562 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};}{ dbminor 31563 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};} +{ dbminor 31564 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};}{ dbminor 31565 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};} +{ dbminor 31566 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Arial};}{ himinor 31568 bidi swiss charset238 prq2 Calibri CE;}{ himinor 31569 bidi swiss charset204 prq2 Calibri Cyr;} +{ himinor 31571 bidi swiss charset161 prq2 Calibri Greek;}{ himinor 31572 bidi swiss charset162 prq2 Calibri Tur;}{ himinor 31573 bidi swiss charset177 prq2 Calibri (Hebrew);} +{ himinor 31574 bidi swiss charset178 prq2 Calibri (Arabic);}{ himinor 31575 bidi swiss charset186 prq2 Calibri Baltic;}{ himinor 31576 bidi swiss charset163 prq2 Calibri (Vietnamese);} +{ biminor 31578 bidi roman charset238 prq2 Times New Roman CE{\* alt Arial};}{ biminor 31579 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Arial};} +{ biminor 31581 bidi roman charset161 prq2 Times New Roman Greek{\* alt Arial};}{ biminor 31582 bidi roman charset162 prq2 Times New Roman Tur{\* alt Arial};} +{ biminor 31583 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Arial};}{ biminor 31584 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Arial};} +{ biminor 31585 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Arial};}{ biminor 31586 bidi roman charset163 prq2 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; ed0\green0lue0; ed0\green0lue0;}{\*\defchp 31506 s22\lang3079\langfe1033\langnp3079\langfenp1033 }{\*\defpap \ql \li0 i0\sa200\sl276\slmult1 +\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 } oqfpromote {\stylesheet{\ql \li0 i0\sa200\sl276\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 + 49 s23\lang3079\langfe1033+ 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\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f31506fs22lang1025 \ltrch cs0 31506 s22\lang3079\langfe1033+\s15\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+\sbasedon0 \snext15 \slink16 \sunhideused header;}{\*+ qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+\sbasedon0 \snext17 \slink18 \sunhideused \spriority57 footer;}{\*++ rftsWidthB3 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blind0 blindtype3 svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr sbrdrh sbrdrv +\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 31506 s22\lang3079\langfe1033+\s21\ql \li720 i0\sa200\sl276\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin720\itap0+\sbasedon0 \snext21 \sqformat \spriority34 List Paragraph;}{\s22\ql \li0 i0\widctlparrdrtrdrsrdrw10rsp20 rdrlrdrsrdrw10rsp80 rdrbrdrsrdrw10rsp20 rdrrrdrsrdrw10rsp80 +\wrapdefaultspalphaspnum aauto\outlinelevel0djustright in0\lin0\itap0 tlch cs1 f0fs20lang1025 \ltrch cs0 s26+\s23\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f48fs18lang1025 \ltrch cs0 48 s18\lang3079\langfe1033+\sbasedon0 \snext23 \slink24 \ssemihidden \sunhideused Balloon Text;}{\*+rdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidthB3 rpaddl108 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blind0 blindtype3 svertalt sbrdrt sbrdrl sbrdrb sbrdrr sbrdrdgl sbrdrdgr sbrdrh sbrdrv +\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 31506 s22\lang1031\langfe1033+Tabellenraster1;}{\s26\ql \li0 i0\sa345\sl264\slmult1\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel0djustright in0\lin0\itap0+ s28\lang1031\langfe1033\loch 31502\hichf31502\dbchf31505+ s23\lang1031\langfe0\loch 31502\hichf31502\dbchf31505+\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs23lang1025 \ltrch cs0 s23\lang1031\langfe1033\loch 31506\hichf31506\dbchf31505+\sbasedon0 \snext28 \slink29 \sqformat \spriority1 No Spacing;}{\*+Kein Leerraum Zchn;}}{\*\listtable}{\*\listoverridetable}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1 +\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{ itle incl_DBBezeichnung_klein}{uthor e107}{\operator Oliver Specht}{+{ ersion2}{dmins0}{ ofpages2}{ ofwords8}{ ofchars54}{\*+\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1134\gutter0\ltrsect +\deftab708\widowctrl tnbjenddoc\pgnstart3\hyphhotz425 rackmoves0 rackformatting1\donotembedsysfont1 elyonvml0\donotembedlingdata0\grfdocevents0 alidatexml1\showplaceholdtext0\ignoremixedcontent0 +\saveinvalidxml0\showxmlerrors1 oxlattoyenxpshrtn oultrlspc\dntblnsbdb ospaceforul ormshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1417\dgvorigin1417\dghshow1\dgvshow1 +\jexpand iewkind1 iewscale130\pgbrdrhead\pgbrdrfoot\splytwnine tnlytwnine\htmautsp olnhtadjtbl\useltbalnlntblind\lytcalctblwd\lyttblrtgr\lnbrkrule obrkwrptbl\snaptogridincellllowfieldendsel\wrppunct +sianbrkrule ewtblstyruls ogrowautofit\usenormstyforlist oindnmbrts elnbrelev ocxsptable\indrlsweleven oafcnsttblfelev\utinl\hwelev\spltpgpar otcvasp otbrkcnstfrctbl otvatxbx\krnprsnet+{\*\wgrffmtfilter 2450} ofeaturethrottle1\ilfomacatclnup0{\* tnsep \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 + 49 s23\lang3079\langfe1033+\par }}{\* tnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+ tlch cs1 f0 \ltrch cs0 +\par }}{\*ftnsep \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+ tlch cs1 f0 \ltrch cs0 +\par }}{\*ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+ tlch cs1 f0 \ltrch cs0 +\par }}\ltrpar \sectd \ltrsect\pgnrestart\pgnstarts3\linex0\headery708 ootery708+ qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+\lang1031\langfe1033\langnp1031Header 1}{ tlch cs1 f0 \ltrch cs0 \lang1031\langfe1033\langn p1031 +\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 )}}\pard\plain \ltrpar\ql \li0 i0\sa200\sl276\slmult1 +\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+ s24\lang1033\langfe1033\langnp1033 paragraph 1 +\par }\pard \ltrpar\ql \li0 i0\sa200\sl276\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 { tlch cs1 f0fs24 \ltrch cs0 s24\lang1033\langfe1033\langnp1033 +before page break\page }{ tlch cs1 f0fs24 \ltrch cs0 s24\lang1033\langfe1033\langnp1033 before section break\sect }\sectd \ltrsect +\marglsxn1077\margrsxn1077\margtsxn1440\margbsxn1440\sbknone\pgnrestart\linex0\headery709 ootery709+ qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+\lang1031\langfe1033\langnp1031 Header 2}{ tlch cs1 f0 \ltrch cs0 \lang1031\langfe1033\langnp1031 +\par }{ tlch cs1 f0 \ltrch cs0 \lang1031\langfe1033\langnp1031 +\par }}{ ooterr \ltrpar \pard\plain \ltrpar\s17\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 + 49 s23\lang3079\langfe1033+\par }}{\headerf \ltrpar \pard\plain \ltrpar\s15\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 + 49 s23\lang3079\langfe1033+{\shp{\*\shpinst\shpleft113\shptop5954\shpright680\shpbottom5954\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz0\shplockanchor\shplid1025{\sp{\sn shapeType}{\sv 20}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}} +{\sp{\sn fLockRotation}{\sv 0}}{\sp{\sn fLockAspectRatio}{\sv 0}}{\sp{\sn fLockPosition}{\sv 0}}{\sp{\sn fLockAgainstSelect}{\sv 0}}{\sp{\sn fLockVerticies}{\sv 0}}{\sp{\sn fLockAdjustHandles}{\sv 0}} +{\sp{\sn fLockAgainstGrouping}{\sv 0}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineColor}{\sv 12566463}{\*\hsv +{\sp{\sn fLockShapeType}{\sv 0}}{\sp{\sn wzName}{\sv Gerade Verbindung 2}}{\sp{\sn dyWrapDistTop}{\sv -1}}{\sp{\sn dyWrapDistBottom}{\sv -1}}{\sp{\sn posrelh}{\sv 1}}{\sp{\sn posrelv}{\sv 1}}{\sp{\sn metroBlob}{\sv {\*\svb +504b030414000600080000002100b6833892fe000000e1010000130000005b436f6e74656e745f54797065735d2e786d6c9491414ec3301045f748dcc1f216254ebb400825e982b44b40a81c60644f128b646c794c686f8f93b61b449158da33ffbf27bbdc1cc6414c18d83aaae42a2fa440d2ce58ea2af9bedf650f527004 +323038c24a1e91e5a6bebd29f7478f2c529ab8927d8cfe5129d63d8ec0b9f34869d2ba30424cc7d0290ffa033a54eba2b857da51448a599c3b645d36d8c2e710c5f690ae4f26010796e2e9b438b32a09de0f56434ca66a22f383929d09794a2e3bdc5bcf774943aa5f09f3e43ae09c7b494f13ac41f10a213ec398349409ac +70ed1aa7f3bf3b66c99133d7b65663de04de2ea98bd3b56ee3be28e0f4dff226c5de70bab4abe583ea6f000000ffff0300504b03041400060008000000210038fd21ffd6000000940100000b0000005f72656c732f2e72656c73a490c16ac3300c86ef83bd83d17d719ac318a34e2fa3d06be91ec0d88a631a5b4632d9faf6 +3383c1327adb51bfd0f7897f7ff84c8b5a91255236b0eb7a50981df9988381f7cbf1e90594549bbd5d28a3811b0a1cc6c787fd19175bdb91ccb1886a942c06e65acbabd6e2664c563a2a98db66224eb6b691832ed65d6d403df4fdb3e6df0c18374c75f206f8e40750975b69e63fec141d93d0543b4749d33445778faa3d7d +e433ae8d62396035e059be43c6b56bcf81beefddfdd31bd89639ba23db846fe4b67e1ca8653f7abde972fc020000ffff0300504b030414000600080000002100dc60c717f0010000410400000e0000006472732f65326f446f632e786d6cac534d8fd33010bd23f11f2cdf69d2c2161435ddc3ae762f0b54ecc2ddb5c7a985 +bf64bb4dfaef193b4d583e8404e262c533f3decc7b196fae07a3c9094254ceb674b9a82901cb9d50b66be9e7a7bb57ef28898959c1b4b3d0d233447abd7df962d3fb0656eee0b4804090c4c6a6f72d3da4e49baa8afc0086c585f36031295d302ce135749508ac4776a3ab555dafabde05e183e31023466fc724dd167e2981 +a78f52464844b714674be50ce5dce7b3da6e58d305e60f8a5fc660ff308561ca62d399ea9625468e41fd4265140f2e3a9916dc99ca49a938140da86659ffa4e6f1c03c142d684ef4b34df1ffd1f20fa75d204ab4744d8965067fd13d0426807c81b057561c6d4756d9a6dec706ab6fec2e64a17cb08ffec1f1af1173d50fc9 +7c897e2c1b6430b91c9592a1d87e9e6d8721118ec1d7ebba7e7345099f52156b269c0f31dd8333247fb4542b9b0d610d3b3dc4943bb3662ac9616df3199d56e24e695d2e7995e046077262b804fb6e5908f4d1bc77628cbdbdaaebb20ac856362f9717ee674c98cbec45eaa8aee84c670d63e74f20d148d433369889c61e8c +73b069999d2c4c589d6112a79c817599ec8fc04b7d864259efbf01cf88d2d9d934838db22efcae7b1aa691e5583f3930eace16ec9d38efc2b405b8a745e1e54de587f0fc5ee0df5ffef61b000000ffff0300504b030414000600080000002100b179e523dd000000090100000f0000006472732f646f776e7265762e786d6c +4c8fcd4ec3301084ef48bc83b548dca89342d312e254fc561c698ac4d58db74944bc36b1db069e9e454282e3cc7e9a9d2996a3edc50187d03952904e121048b5331d350a5e374f170b10216a32ba77840a3e31c0b23c3d29746edc91d678a86223388442ae15b431fa5cca50b7687598388fc4b79d1bac8e2c87469a411f39 +dcf6729a2499b4ba23fed06a8ff72dd6efd5de2ac8ded2afe7d5631637dd47f532bd7bf0e96eee953a3f1b6f6f40441ce31f0c3ff5b93a94dc69ebf66482e859a7974c2a985dcfae4030902d78dbf6d7906521ff2f28bf010000ffff0300504b01022d0014000600080000002100b6833892fe000000e10100001300000000 +000000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d001400060008000000210038fd21ffd6000000940100000b000000000000000000000000002f0100005f72656c732f2e72656c73504b01022d0014000600080000002100dc60c717f0010000410400000e000000000000000000 +000000002e0200006472732f65326f446f632e786d6c504b01022d0014000600080000002100b179e523dd000000090100000f000000000000000000000000004a0400006472732f646f776e7265762e786d6c504b05060000000004000400f3000000540500000000 +}}}{\sp{\sn dhgt}{\sv 251659264}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fAllowOverlap}{\sv 1}}{\sp{\sn fBehindDocument}{\sv 0}}{\sp{\sn fHidden}{\sv 0}}{\sp{\sn fPseudoInline}{\sv 0}} +{\sp{\sn sizerelh}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}}{\shprslt{\*\do\dobxpage\dobypage\dodhgt8192\dpline\dpptx0\dppty0\dpptx567\dppty0\dpx113\dpy5954\dpxsize567\dpysize0\dplinew15\dplinecor108\dplinecog9\dplinecob0}}} +{\shp{\*\shpinst\shpleft113\shptop8420\shpright680\shpbottom8420\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz1\shplockanchor\shplid1026{\sp{\sn shapeType}{\sv 20}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}} +{\sp{\sn fLockRotation}{\sv 0}}{\sp{\sn fLockAspectRatio}{\sv 0}}{\sp{\sn fLockPosition}{\sv 0}}{\sp{\sn fLockAgainstSelect}{\sv 0}}{\sp{\sn fLockVerticies}{\sv 0}}{\sp{\sn fLockAdjustHandles}{\sv 0}} +{\sp{\sn fLockAgainstGrouping}{\sv 0}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineColor}{\sv 12566463}{\*\hsv +{\sp{\sn fLockShapeType}{\sv 0}}{\sp{\sn wzName}{\sv Gerade Verbindung 4}}{\sp{\sn dyWrapDistTop}{\sv -1}}{\sp{\sn dyWrapDistBottom}{\sv -1}}{\sp{\sn posrelh}{\sv 1}}{\sp{\sn posrelv}{\sv 1}}{\sp{\sn metroBlob}{\sv {\*\svb +504b030414000600080000002100b6833892fe000000e1010000130000005b436f6e74656e745f54797065735d2e786d6c9491414ec3301045f748dcc1f216254ebb400825e982b44b40a81c60644f128b646c794c686f8f93b61b449158da33ffbf27bbdc1cc6414c18d83aaae42a2fa440d2ce58ea2af9bedf650f527004 +323038c24a1e91e5a6bebd29f7478f2c529ab8927d8cfe5129d63d8ec0b9f34869d2ba30424cc7d0290ffa033a54eba2b857da51448a599c3b645d36d8c2e710c5f690ae4f26010796e2e9b438b32a09de0f56434ca66a22f383929d09794a2e3bdc5bcf774943aa5f09f3e43ae09c7b494f13ac41f10a213ec398349409ac +70ed1aa7f3bf3b66c99133d7b65663de04de2ea98bd3b56ee3be28e0f4dff226c5de70bab4abe583ea6f000000ffff0300504b03041400060008000000210038fd21ffd6000000940100000b0000005f72656c732f2e72656c73a490c16ac3300c86ef83bd83d17d719ac318a34e2fa3d06be91ec0d88a631a5b4632d9faf6 +3383c1327adb51bfd0f7897f7ff84c8b5a91255236b0eb7a50981df9988381f7cbf1e90594549bbd5d28a3811b0a1cc6c787fd19175bdb91ccb1886a942c06e65acbabd6e2664c563a2a98db66224eb6b691832ed65d6d403df4fdb3e6df0c18374c75f206f8e40750975b69e63fec141d93d0543b4749d33445778faa3d7d +e433ae8d62396035e059be43c6b56bcf81beefddfdd31bd89639ba23db846fe4b67e1ca8653f7abde972fc020000ffff0300504b030414000600080000002100ae1178b8f0010000410400000e0000006472732f65326f446f632e786d6cac534d6fd43010bd23f11f2cdfd964cbb6a068b33db46a2f055614b87bed71d6c2 +5fb2bd9becbf67ec6c42691112888b15cfcc7b33ef65bcbe1e8c2647085139dbd2e5a2a6042c7742d9aea55fbfdcbd794f494ccc0aa69d85969e20d2ebcdeb57ebde3770e1f64e0b0804496c6c7adfd27d4abea9aac8f760585c380f1693d205c3125e435789c07a6437babaa8ebabaa7741f8e038c488d1db314937855f4a +e0e993941112d12dc5d95239433977f9ac366bd67481f9bde2e731d83f4c6198b2d874a6ba65899143502fa88ce2c14527d3823b5339291587a201d52ceb676a1ef7cc43d182e6443fdb14ff1f2dff78dc06a2444b57945866f017dd436002c837083b65c5c17664956dea7d6cb0fac66e4316ca07fbe81f1cff1e3157fd92 +cc97e8c7b2410693cb5129198aeda7d9761812e1187c7b55d7ab4b4af894aa5833e17c88e91e9c21f9a3a55ad96c086bd8f121a6dc993553490e6b9bcfe8b412774aeb72c9ab04373a9023c325d875cb42a00fe6831363ecdd655d975540b6b279b9bc703f61c25c662f52477545673a69183b7f068946a29eb1c14c34f660 +9c834dcbec6461c2ea0c9338e50caccb647f049eeb3314ca7aff0d784694cecea6196c9475e177ddd3308d2cc7fac9815177b660e7c4691ba62dc03d2d0acf6f2a3f84a7f702fff9f2373f000000ffff0300504b030414000600080000002100e332eeaadc000000090100000f0000006472732f646f776e7265762e786d6c +4c8fcd4ec3301084ef48bc83b548dca893804294c6a9f817474891b8baf136891aaf4decb681a7679190e0b49addd1ec37d56ab6a338e01406470ad2450202a97566a04ec1dbfaf1a20011a226a34747a8e01303acead3934a97c61de9150f4dec04875028b5823e465f4a19da1ead0e0be791f8b67593d591e5d44933e923 +87db516649924bab07e20fbdf678d763bb6bf65641fe9e7e3d3f3de4713d7c342fd9edbd4fb7d75ea9f3b3f9660922e21cffccf083cfe85033d3c6edc90431b24e2fd9a9a0b8cab8131bf282e7e67721eb4afe6f507f030000ffff0300504b01022d0014000600080000002100b6833892fe000000e1010000130000000000 +0000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d001400060008000000210038fd21ffd6000000940100000b000000000000000000000000002f0100005f72656c732f2e72656c73504b01022d0014000600080000002100ae1178b8f0010000410400000e00000000000000000000 +0000002e0200006472732f65326f446f632e786d6c504b01022d0014000600080000002100e332eeaadc000000090100000f000000000000000000000000004a0400006472732f646f776e7265762e786d6c504b05060000000004000400f3000000530500000000 +}}}{\sp{\sn dhgt}{\sv 251660288}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fAllowOverlap}{\sv 1}}{\sp{\sn fBehindDocument}{\sv 0}}{\sp{\sn fHidden}{\sv 0}}{\sp{\sn fPseudoInline}{\sv 0}} +{\sp{\sn sizerelh}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}}{\shprslt{\*\do\dobxpage\dobypage\dodhgt8193\dpline\dpptx0\dppty0\dpptx567\dppty0\dpx113\dpy8420\dpxsize567\dpysize0\dplinew15\dplinecor108\dplinecog9\dplinecob0}}} +{\shp{\*\shpinst\shpleft113\shptop11907\shpright680\shpbottom11907\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt0\shpz2\shplockanchor\shplid1027{\sp{\sn shapeType}{\sv 20}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}} +{\sp{\sn fLockRotation}{\sv 0}}{\sp{\sn fLockAspectRatio}{\sv 0}}{\sp{\sn fLockPosition}{\sv 0}}{\sp{\sn fLockAgainstSelect}{\sv 0}}{\sp{\sn fLockVerticies}{\sv 0}}{\sp{\sn fLockAdjustHandles}{\sv 0}} +{\sp{\sn fLockAgainstGrouping}{\sv 0}}{\sp{\sn fFillOK}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn lineColor}{\sv 12566463}{\*\hsv +{\sp{\sn fLockShapeType}{\sv 0}}{\sp{\sn wzName}{\sv Gerade Verbindung 5}}{\sp{\sn dyWrapDistTop}{\sv -1}}{\sp{\sn dyWrapDistBottom}{\sv -1}}{\sp{\sn posrelh}{\sv 1}}{\sp{\sn posrelv}{\sv 1}}{\sp{\sn metroBlob}{\sv {\*\svb +504b030414000600080000002100b6833892fe000000e1010000130000005b436f6e74656e745f54797065735d2e786d6c9491414ec3301045f748dcc1f216254ebb400825e982b44b40a81c60644f128b646c794c686f8f93b61b449158da33ffbf27bbdc1cc6414c18d83aaae42a2fa440d2ce58ea2af9bedf650f527004 +323038c24a1e91e5a6bebd29f7478f2c529ab8927d8cfe5129d63d8ec0b9f34869d2ba30424cc7d0290ffa033a54eba2b857da51448a599c3b645d36d8c2e710c5f690ae4f26010796e2e9b438b32a09de0f56434ca66a22f383929d09794a2e3bdc5bcf774943aa5f09f3e43ae09c7b494f13ac41f10a213ec398349409ac +70ed1aa7f3bf3b66c99133d7b65663de04de2ea98bd3b56ee3be28e0f4dff226c5de70bab4abe583ea6f000000ffff0300504b03041400060008000000210038fd21ffd6000000940100000b0000005f72656c732f2e72656c73a490c16ac3300c86ef83bd83d17d719ac318a34e2fa3d06be91ec0d88a631a5b4632d9faf6 +3383c1327adb51bfd0f7897f7ff84c8b5a91255236b0eb7a50981df9988381f7cbf1e90594549bbd5d28a3811b0a1cc6c787fd19175bdb91ccb1886a942c06e65acbabd6e2664c563a2a98db66224eb6b691832ed65d6d403df4fdb3e6df0c18374c75f206f8e40750975b69e63fec141d93d0543b4749d33445778faa3d7d +e433ae8d62396035e059be43c6b56bcf81beefddfdd31bd89639ba23db846fe4b67e1ca8653f7abde972fc020000ffff0300504b0304140006000800000021006924364eef010000410400000e0000006472732f65326f446f632e786d6cac53cb6edb3010bc17e83f10bcd792d33a2d04cb3924482e696b3469ee34b99488 +f20592b6e5bfef92b294f481022d7a21c4dd9dd99dd1727d35184d0e10a272b6a5cb454d0958ee84b25d4bbf3edebef940494ccc0aa69d85969e20d2abcdeb57eba36fe0c2f54e0b0804496c6c8ebea57d4abea9aac87b302c2e9c078b49e9826109afa1ab4460476437babaa8ebcbeae882f0c1718811a33763926e0abf94 +c0d367292324a25b8ab3a5728672eef2596dd6ace902f3bde2e731d83f4c6198b2d874a6ba6189917d50bf5019c5838b4ea60577a672522a0e4503aa59d63fa979e89987a205cd897eb629fe3f5afee9b00d448996ae28b1cce02fba83c0049027083b65c5de7664956d3afad860f5b5dd862c940ff6c1df3bfe2d62aefa21 +992fd18f65830c2697a3523214db4fb3ed3024c231f8f6b2aedf617b3ea52ad64c381f62ba036748fe68a956361bc21a76b88f297766cd5492c3dae6333aadc4add2ba5cf22ac1b50ee4c0700976ddb210e8bdf9e8c4187bbfaaebb20ac856362f9717ee174c98cbec45eaa8aee84c270d63e72f20d148d433369889c61e8c +73b069999d2c4c589d6112a79c817599ec8fc0737d864259efbf01cf88d2d9d934838db22efcae7b1aa691e5583f3930eace16ec9c386dc3b405b8a745e1f94de587f0f25ee0cf2f7ff31d0000ffff0300504b030414000600080000002100602897a1dd0000000b0100000f0000006472732f646f776e7265762e786d6c4c +8fcd4ec3301084ef487d076b91b85127454a4b8853955f71a429125737de2611f1dac46e1b787ab607444fabd91dcd7e532c47db8b030ea173a4209d2620906a673a6a14bc6f9eaf172042d46474ef08157c63806539b928746edc91d678a86223388442ae15b431fa5cca50b76875983a8fc4b79d1bac8e2c87469a411f39 +dcf672962499b4ba23fed06a8f0f2dd69fd5de2ac83ed29fd797a72c6ebaafea6d76ffe8d3dddc2b757539aeee40441ce3bf194ef88c0e25336ddd9e4c103debf4869da7799bcc41b0235b70b9eddf4696853cef50fe020000ffff0300504b01022d0014000600080000002100b6833892fe000000e1010000130000000000 +0000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d001400060008000000210038fd21ffd6000000940100000b000000000000000000000000002f0100005f72656c732f2e72656c73504b01022d00140006000800000021006924364eef010000410400000e00000000000000000000 +0000002e0200006472732f65326f446f632e786d6c504b01022d0014000600080000002100602897a1dd0000000b0100000f00000000000000000000000000490400006472732f646f776e7265762e786d6c504b05060000000004000400f3000000530500000000 +}}}{\sp{\sn dhgt}{\sv 251661312}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fAllowOverlap}{\sv 1}}{\sp{\sn fBehindDocument}{\sv 0}}{\sp{\sn fHidden}{\sv 0}}{\sp{\sn fPseudoInline}{\sv 0}} +{\sp{\sn sizerelh}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}}{\shprslt{\*\do\dobxpage\dobypage\dodhgt8194\dpline\dpptx0\dppty0\dpptx567\dppty0\dpx113\dpy11907\dpxsize567\dpysize0\dplinew15\dplinecor108\dplinecog9\dplinecob0}}}}{ tlch cs1 f0 \ltrch cs0 +\par }}\pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefault aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+\lang1033\langfe1033\langnp1033 +\par \ltrrow} rowd \irow0\irowband0\lastrow \ltrrow + s17 rgaph108 rrh1985 rleft0 rftsWidth3 rwWidth9781 rftsWidthB3 rpaddl108 rpaddt85 rpaddb85 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 bllkhdrrows bllkhdrcols bllknocolband blind0 blindtype3 +rdrtbl +rdrtbl + tlch cs1 f0fs22lang1025 \ltrch cs0 49 s23\lang3079\langfe1033+ s21\lang1024\langfe1024 oproof\langfenp3079 e}{ tlch cs1 f1fs23 \ltrch cs0 \lang1031\langfe1033\langnp1031 + s17\lang1031\langfe1033\langnp1031 + 49 s23\lang3079\langfe1033+ s17 rgaph108 rrh1985 rleft0 rftsWidth3 rwWidth9781 rftsWidthB3 rpaddl108 rpaddt85 rpaddb85 rpaddr108 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 bllkhdrrows bllkhdrcols bllknocolband blind0 blindtype3 +rdrtbl -e ... etc. - the rest is truncated
