sw/qa/extras/rtfimport/data/165805.rtf | 271 +++++++++++++++++++ sw/qa/extras/rtfimport/rtfimport.cxx | 7 sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx | 4 3 files changed, 281 insertions(+), 1 deletion(-)
New commits: commit db13f53f810b27cb036771d22a7f42321ca12677 Author: Oliver Specht <oliver.spe...@cib.de> AuthorDate: Tue Mar 18 15:03:31 2025 +0100 Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> CommitDate: Fri Mar 21 12:15:49 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/+/183096 Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> Tested-by: Jenkins Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183183 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{0bidi roman charset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{34bidi romancharset0prq2{\*\panose 02040503050406030204}Cambria Math;}{ 35bidi swisscharset128prq2{\*\panose 020b0400000000000000}Yu Gothic{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{46bidi swisscharset0prq2{\*\panose 020b0604020202020204}Liberation Sans;}{51bidi swisscharset128prq2{\*\panose 020b0400000000000000}@Yu Gothic;} +{lomajor31500bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{dbmajor31501bidi swisscharset128prq2{\*\panose 020b0300000000000000}Yu Gothic Light{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};}{himajor 31502bidi swisscharset0prq2 Aptos Display;} +{bimajor31503bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};}{lominor31504bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};} +{dbminor31505bidi swisscharset128prq2{\*\panose 020b0400000000000000}Yu Gothic{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{himinor31506bidi swisscharset0prq2 Aptos;} +{biminor31507bidi romancharset0prq2{\*\panose 02020603050405020304}Times New Roman{\*alt Arial};}{52bidi romancharset238prq2 Times New Roman CE{\* alt Arial};} +{53bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{55bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{56bidi roman charset162prq2 Times New Roman Tur{\*alt Arial};} +{57bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{58 bidi romancharset178prq2 Times New Roman (Arabic){\*alt Arial};}{59bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};} +{60bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};}{ 392bidi romancharset238prq2 Cambria Math CE;}{393bidi romancharset204 prq2 Cambria Math Cyr;}{395bidi romancharset161prq2 Cambria Math Greek;} +{396bidi romancharset162prq2 Cambria Math Tur;}{399bidi roman charset186prq2 Cambria Math Baltic;}{400bidi romancharset163prq2 Cambria Math (Vietnamese);} +{404bidi swisscharset0prq2 Yu Gothic Western{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{402bidi swisscharset238prq2 Yu Gothic CE{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{403bidi swisscharset204prq2 Yu Gothic Cyr{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{405bidi swisscharset161prq2 Yu Gothic Greek{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{406bidi swisscharset162prq2 Yu Gothic Tur{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{409bidi swisscharset186prq2 Yu Gothic Baltic{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{512bidi swisscharset238prq2 Liberation Sans CE;}{513bidi swiss charset204prq2 Liberation Sans Cyr;}{515bidi swisscharset161prq2 Liberation Sans Greek;}{516bidi swisscharset162prq2 Liberation Sans Tur;} +{517bidi swisscharset177prq2 Liberation Sans (Hebrew);}{519bidi swiss charset186prq2 Liberation Sans Baltic;}{520bidi swisscharset163prq2 Liberation Sans (Vietnamese);}{564bidi swisscharset0prq2 @Yu Gothic Western;} +{562bidi swisscharset238prq2 @Yu Gothic CE;}{563bidi swisscharset204 prq2 @Yu Gothic Cyr;}{565bidi swisscharset161prq2 @Yu Gothic Greek;}{566 bidi swisscharset162prq2 @Yu Gothic Tur;} +{569bidi swisscharset186prq2 @Yu Gothic Baltic;}{lomajor31508bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{lomajor31509bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};} +{lomajor31511bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{lomajor31512bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};} +{lomajor31513bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{lomajor31514bidi romancharset178prq2 Times New Roman (Arabic){\* alt Arial};} +{lomajor31515bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{lomajor31516bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};} +{dbmajor31520bidi swisscharset0prq2 Yu Gothic Light Western{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};}{dbmajor31518bidi swiss charset238prq2 Yu Gothic Light CE{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{dbmajor31519bidi swisscharset204prq2 Yu Gothic Light Cyr{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{dbmajor31521bidi swisscharset161prq2 Yu Gothic Light Greek{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{dbmajor31522bidi swisscharset162prq2 Yu Gothic Light Tur{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};} +{dbmajor31525bidi swisscharset186prq2 Yu Gothic Light Baltic{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e Light};}{himajor31528bidi swiss charset238prq2 Aptos Display CE;} +{himajor31529bidi swisscharset204prq2 Aptos Display Cyr;}{himajor31531 bidi swisscharset161prq2 Aptos Display Greek;}{himajor31532bidi swiss charset162prq2 Aptos Display Tur;} +{himajor31535bidi swisscharset186prq2 Aptos Display Baltic;}{himajor 31536bidi swisscharset163prq2 Aptos Display (Vietnamese);}{bimajor31538 bidi romancharset238prq2 Times New Roman CE{\*alt Arial};} +{bimajor31539bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{bimajor31541bidi romancharset161prq2 Times New Roman Greek{\* alt Arial};} +{bimajor31542bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};}{bimajor31543bidi romancharset177prq2 Times New Roman (Hebrew){\* alt Arial};} +{bimajor31544bidi romancharset178prq2 Times New Roman (Arabic){\*alt Arial};}{bimajor31545bidi romancharset186prq2 Times New Roman Baltic{\* alt Arial};} +{bimajor31546bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Arial};}{lominor31548bidi romancharset238prq2 Times New Roman CE{\* alt Arial};} +{lominor31549bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};}{lominor31551bidi romancharset161prq2 Times New Roman Greek{\* alt Arial};} +{lominor31552bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};}{lominor31553bidi romancharset177prq2 Times New Roman (Hebrew){\* alt Arial};} +{lominor31554bidi romancharset178prq2 Times New Roman (Arabic){\*alt Arial};}{lominor31555bidi romancharset186prq2 Times New Roman Baltic{\* alt Arial};} +{lominor31556bidi romancharset163prq2 Times New Roman (Vietnamese){\* alt Arial};}{dbminor31560bidi swisscharset0prq2 Yu Gothic Western{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{dbminor31558bidi swisscharset238prq2 Yu Gothic CE{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{dbminor31559bidi swiss charset204prq2 Yu Gothic Cyr{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{dbminor31561bidi swisscharset161prq2 Yu Gothic Greek{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{dbminor31562bidi swiss charset162prq2 Yu Gothic Tur{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};} +{dbminor31565bidi swisscharset186prq2 Yu Gothic Baltic{\*alt \'9f\'e0\'83\'53\'83\'56\'83\'62\'83\'4e};}{himinor31568bidi swiss charset238prq2 Aptos CE;}{himinor31569bidi swisscharset204prq2 Aptos Cyr;} +{himinor31571bidi swisscharset161prq2 Aptos Greek;}{himinor31572bidi swisscharset162prq2 Aptos Tur;}{himinor31575bidi swisscharset186prq2 Aptos Baltic;} +{himinor31576bidi swisscharset163prq2 Aptos (Vietnamese);}{biminor 31578bidi romancharset238prq2 Times New Roman CE{\*alt Arial};}{biminor 31579bidi romancharset204prq2 Times New Roman Cyr{\*alt Arial};} +{biminor31581bidi romancharset161prq2 Times New Roman Greek{\*alt Arial};}{biminor31582bidi romancharset162prq2 Times New Roman Tur{\*alt Arial};} +{biminor31583bidi romancharset177prq2 Times New Roman (Hebrew){\*alt Arial};}{biminor31584bidi romancharset178prq2 Times New Roman (Arabic){\* alt Arial};} +{biminor31585bidi romancharset186prq2 Times New Roman Baltic{\*alt Arial};}{biminor31586bidi romancharset163prq2 Times New Roman (Vietnamese){\*alt Arial};}}{+ ed0\green255lue255; ed0\green255lue0; ed255\green0lue255; ed255\green0lue0; ed255\green255lue0; ed255\green255lue255; ed0\green0lue128; ed0\green128lue128; ed0\green128lue0; ed128\green0lue128; ed128\green0lue0; + ed128\green128lue0; ed128\green128lue128; ed192\green192lue192; ed0\green0lue0; ed0\green0lue0;++\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 } oqfpromote {\stylesheet{\ql \li0 i0\sa160\sl278\slmult1\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f31507fs24lang1025 +\ltrchcs0 s24\lang1031\langfe1041\kerning2\loch 46\hichf46\dbchf31505+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel0djustright in0\lin0\itap0 tlchcs1 f31503fs40lang1025 \ltrchcs0 +s40+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel1djustright in0\lin0\itap0 tlchcs1 f31503fs32lang1025 \ltrchcs0 +s32+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel2djustright in0\lin0\itap0 tlchcs1 f31503fs28lang1025 \ltrchcs0 +s28+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel3djustright in0\lin0\itap0 tlchcs1 if31503fs24lang1025 \ltrchcs0 +\is24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel4djustright in0\lin0\itap0 tlchcs1 f31503fs24lang1025 \ltrchcs0 +s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel5djustright in0\lin0\itap0 tlchcs1 if31503fs24lang1025 \ltrchcs0 +\is24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel6djustright in0\lin0\itap0 tlchcs1 f31503fs24lang1025 \ltrchcs0 +s24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel7djustright in0\lin0\itap0 tlchcs1 if31503fs24lang1025 \ltrchcs0 +\is24+\keep\keepn\widctlpar\wrapdefaultspalphaspnum aauto\outlinelevel8djustright in0\lin0\itap0 tlchcs1 f31503fs24lang1025 \ltrchcs0 +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\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 f31507fs24lang1025 \ltrchcs0 s24\lang1031\langfe1041\kerning2\loch 46\hichf46\dbchf31505+Normal Table;}{\*+s32+\sbasedon10 \slink3 \ssemihidden \spriority9 \styrsid6043305 \'dcberschrift 3 Zchn;}{\*+\'dcberschrift 4 Zchn;}{\*+\ltrchcs0 \i+\sbasedon10 \slink7 \ssemihidden \spriority9 \styrsid6043305 \'dcberschrift 7 Zchn;}{\*+\'dcberschrift 8 Zchn;}{\*+\s24\ql \li0 i0\sa80\widctlpar\wrapdefaultspalphaspnumaautodjustright 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 + tlchcs1 f31503fs28lang1025 \ltrchcs0 s28xpnd3xpndtw15++\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 tlchcs1 if31507fs24lang1025 \ltrchcs0 \is24+\sbasedon0 \snext0 \slink29 \sqformat \spriority29 \styrsid6043305 Quote;}{\*+\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin720\itap0+\sbasedon0 \snext30 \sqformat \spriority34 \styrsid6043305 List Paragraph;}{\*+\widctlparrdrtrdrsrdrw10rsp200rdrcf19 rdrbrdrsrdrw10rsp200rdrcf19 \wrapdefaultspalphaspnumaautodjustright in864\lin864\itap0 tlchcs1 if31507fs24lang1025 \ltrchcs0 +\is24+\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\widowctrltnbjenddoc\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 +\jexpandiewkind1iewscale100\pgbrdrhead\pgbrdrfoot\splytwnine tnlytwnine\htmautsp olnhtadjtbl\useltbalnlntblind\lytcalctblwd\lyttblrtgr\lnbrkrule obrkwrptbl\snaptogridincellllowfieldendsel\wrppunct +sianbrkrule sidroot6043305 ewtblstyruls ogrowautofit\usenormstyforlist oindnmbrtselnbrelev 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\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0\pararsid6043305 tlchcs1 f31507fs24lang1025 \ltrchcs0 +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 { tlchcs1 f31507 \ltrchcs0 \lang3079\langfe1041\langnp3079\insrsid6043305+\ltrchcs0 \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 { tlchcs1 f31507 \ltrchcs0 \lang1033\langfe1041\langnp1033\insrsid6043305+\lang1040\langfe1041\langnp1040\insrsid6043305 \hichf46\dbchf31505\loch46 INFORMATION}{ tlchcs1 bf31507 \ltrchcs0 \lang1040\langfe1041\langnp1040\insrsid6043305+\par }\pard \ltrpar\ql \li0 i0\sa160\sl278\slmult1\widctlpar\wrapdefaultspalphaspnumaautodjustright in0\lin0\itap0 { tlchcs1 f31507 \ltrchcs0 \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 6a79ac33d5a2..21e1b13ca64d 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1995,6 +1995,13 @@ CPPUNIT_TEST_FIXTURE(Test, test165333Tdf) CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(xRun2, u"CharHidden"_ustr)); } +CPPUNIT_TEST_FIXTURE(Test, test165805Tdf) +{ + createSwDoc("165805.rtf"); + //without page break there would be only one page + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + CPPUNIT_TEST_FIXTURE(Test, test165483Tdf) { createSwDoc("165483.rtf"); diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx index c5982ec10090..9f434c72502f 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx @@ -1642,7 +1642,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;