configure.ac | 15 + download.lst | 4 editeng/source/editeng/impedit.hxx | 14 - editeng/source/editeng/impedit2.cxx | 8 editeng/source/editeng/impedit3.cxx | 22 - sw/qa/extras/rtfimport/data/tdf165923.rtf | 272 ++++++++++++++++++++++++ sw/qa/extras/rtfimport/rtfimport.cxx | 14 + sw/source/writerfilter/dmapper/DomainMapper.cxx | 1 vcl/source/font/FeatureCollector.cxx | 5 9 files changed, 326 insertions(+), 29 deletions(-)
New commits: commit 6ebd68d6ab2de8bb98e42aeede3b608d6a80f35b Author: Oliver Specht <[email protected]> AuthorDate: Thu Mar 27 13:14:15 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 29 14:59:16 2025 +0100 tdf#165923 top margin import fixed Top paragraph margin needs to be reset to default if not repeated at the paragraph itself. Change-Id: I02b92a6893122add3a7aa59d58e0c4fe52aba98a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183390 Tested-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> (cherry picked from commit 1a081416db0b89a392bcb187a9792b9b6fc75dbb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183420 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/rtfimport/data/tdf165923.rtf b/sw/qa/extras/rtfimport/data/tdf165923.rtf new file mode 100644 index 000000000000..10437d2f27e0 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf165923.rtf @@ -0,0 +1,272 @@ +{ tf1deflang1025nsinsicpg1250\uc1deff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1038\deflangfe1038 hemelang1031 hemelangfe0 hemelangcs0{ onttbl{ 0 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};} +{ 1 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Arial{\* alt Courier New};}{ 1 bidi swiss charset0 prq2{\*\panose 020b0604020202020204}Arial{\* alt Courier New};} +{ lomajor 31500 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};}{ dbmajor 31501 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};} +{ himajor 31502 bidi roman charset0 prq2{\*\panose 02040503050406030204}Cambria;}{ bimajor 31503 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};} +{ lominor 31504 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};}{ dbminor 31505 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};} +{ himinor 31506 bidi swiss charset0 prq2{\*\panose 020f0502020204030204}Calibri{\* alt Century Gothic};}{ biminor 31507 bidi roman charset0 prq2{\*\panose 02020603050405020304}Times New Roman{\* alt Geneva};} +{ 558 bidi roman charset238 prq2 Times New Roman CE{\* alt Geneva};}{ 559 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};}{ 561 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};} +{ 562 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};}{ 563 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};}{ 564 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};} +{ 565 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};}{ 566 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};}{ 568 bidi swiss charset238 prq2 Arial CE{\* alt Courier New};} +{ 569 bidi swiss charset204 prq2 Arial Cyr{\* alt Courier New};}{ 571 bidi swiss charset161 prq2 Arial Greek{\* alt Courier New};}{ 572 bidi swiss charset162 prq2 Arial Tur{\* alt Courier New};} +{ 573 bidi swiss charset177 prq2 Arial (Hebrew){\* alt Courier New};}{ 574 bidi swiss charset178 prq2 Arial (Arabic){\* alt Courier New};}{ 575 bidi swiss charset186 prq2 Arial Baltic{\* alt Courier New};} +{ 576 bidi swiss charset163 prq2 Arial (Vietnamese){\* alt Courier New};}{ 568 bidi swiss charset238 prq2 Arial CE{\* alt Courier New};}{ 569 bidi swiss charset204 prq2 Arial Cyr{\* alt Courier New};} +{ 571 bidi swiss charset161 prq2 Arial Greek{\* alt Courier New};}{ 572 bidi swiss charset162 prq2 Arial Tur{\* alt Courier New};}{ 573 bidi swiss charset177 prq2 Arial (Hebrew){\* alt Courier New};} +{ 574 bidi swiss charset178 prq2 Arial (Arabic){\* alt Courier New};}{ 575 bidi swiss charset186 prq2 Arial Baltic{\* alt Courier New};}{ 576 bidi swiss charset163 prq2 Arial (Vietnamese){\* alt Courier New};} +{ lomajor 31508 bidi roman charset238 prq2 Times New Roman CE{\* alt Geneva};}{ lomajor 31509 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};} +{ lomajor 31511 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};}{ lomajor 31512 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};} +{ lomajor 31513 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};}{ lomajor 31514 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};} +{ lomajor 31515 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};}{ lomajor 31516 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};} +{ dbmajor 31518 bidi roman charset238 prq2 Times New Roman CE{\* alt Geneva};}{ dbmajor 31519 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};} +{ dbmajor 31521 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};}{ dbmajor 31522 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};} +{ dbmajor 31523 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};}{ dbmajor 31524 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};} +{ dbmajor 31525 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};}{ dbmajor 31526 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};}{ 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 Geneva};} +{ bimajor 31539 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};}{ bimajor 31541 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};} +{ bimajor 31542 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};}{ bimajor 31543 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};} +{ bimajor 31544 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};}{ bimajor 31545 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};} +{ bimajor 31546 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};}{ lominor 31548 bidi roman charset238 prq2 Times New Roman CE{\* alt Geneva};} +{ lominor 31549 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};}{ lominor 31551 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};} +{ lominor 31552 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};}{ lominor 31553 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};} +{ lominor 31554 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};}{ lominor 31555 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};} +{ lominor 31556 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};}{ dbminor 31558 bidi roman charset238 prq2 Times New Roman CE{\* alt Geneva};} +{ dbminor 31559 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};}{ dbminor 31561 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};} +{ dbminor 31562 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};}{ dbminor 31563 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};} +{ dbminor 31564 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};}{ dbminor 31565 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};} +{ dbminor 31566 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};}{ himinor 31568 bidi swiss charset238 prq2 Calibri CE{\* alt Century Gothic};} +{ himinor 31569 bidi swiss charset204 prq2 Calibri Cyr{\* alt Century Gothic};}{ himinor 31571 bidi swiss charset161 prq2 Calibri Greek{\* alt Century Gothic};} +{ himinor 31572 bidi swiss charset162 prq2 Calibri Tur{\* alt Century Gothic};}{ himinor 31573 bidi swiss charset177 prq2 Calibri (Hebrew){\* alt Century Gothic};} +{ himinor 31574 bidi swiss charset178 prq2 Calibri (Arabic){\* alt Century Gothic};}{ himinor 31575 bidi swiss charset186 prq2 Calibri Baltic{\* alt Century Gothic};} +{ himinor 31576 bidi swiss charset163 prq2 Calibri (Vietnamese){\* alt Century Gothic};}{ biminor 31578 bidi roman charset238 prq2 Times New Roman CE{\* alt Geneva};} +{ biminor 31579 bidi roman charset204 prq2 Times New Roman Cyr{\* alt Geneva};}{ biminor 31581 bidi roman charset161 prq2 Times New Roman Greek{\* alt Geneva};} +{ biminor 31582 bidi roman charset162 prq2 Times New Roman Tur{\* alt Geneva};}{ biminor 31583 bidi roman charset177 prq2 Times New Roman (Hebrew){\* alt Geneva};} +{ biminor 31584 bidi roman charset178 prq2 Times New Roman (Arabic){\* alt Geneva};}{ biminor 31585 bidi roman charset186 prq2 Times New Roman Baltic{\* alt Geneva};} +{ biminor 31586 bidi roman charset163 prq2 Times New Roman (Vietnamese){\* alt Geneva};}}{+ ed255\green255lue0; ed255\green255lue255; ed0\green0lue128; ed0\green128lue128; ed0\green128lue0; ed128\green0lue128; ed128\green0lue0; ed128\green128lue0; ed128\green128lue128; ed192\green192lue192;}{\*\defchp + 31506 s22\lang1031\langfe1033\langnp1031\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 1 s16\lang1031\langfe1033+\ssemihidden \sunhideused \spriority1 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\sa200\sl276\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f31506fs22lang1025 \ltrch cs0 31506 s22\lang1031\langfe1033+Normal Table;}{\s15\ql \li0 i0\sb100\sa142\sbauto1\sl288\slmult1\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs24lang1025 \ltrch cs0 s24\lang1031\langfe1031+\sbasedon0 \snext15 \sunhideused \styrsid2891 Normal (Web);}{\s16\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 + 1 s16\lang1031\langfe1033+f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+Header Char;}{\* s19 srowd rbrdrtrdrsrdrw10 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+{\*+f1fs24lang1025 \ltrch cs0 1 s24\lang1031\langfe1031+\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f1fs24lang1025 \ltrch cs0 1 s24\lang1031\langfe1031+\s23\qj \li0 i0\widctlpar\wrapdefault aautodjustright in0\lin0\itap0 tlch cs1 f1fs22lang1025 \ltrch cs0 s22\lang1031\langfe1031\loch 1\hichf1\dbchf31505+Body Text;}{\*+\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0} +{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap1 +\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0} +{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0 +\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0} +{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}{\pgp\ipgp0\itap0\li0 i0\sb0\sa0}}{\* sidtbl sid2891 sid7277 sid12657 sid79941 sid95260 sid145244 sid204608 sid218729 sid224938 sid226199 + sid262367 sid401479 sid411165 sid411197 sid475968 sid486416 sid524342 sid542719 sid545855 sid594287 sid607765 sid612520 sid622214 sid736409 sid741776 sid742677 sid797202 sid798301 sid804400 sid818289 sid856381 sid860348 sid862193 + sid867024 sid930245 sid945995 sid949552 sid1001213 sid1002887 sid1066920 sid1079795 sid1120673 sid1260445 sid1261374 sid1262043 sid1268882 sid1269194 sid1313252 sid1381913 sid1397469 sid1447788 sid1460767 sid1514100 sid1515453 + sid1711468 sid1719172 sid1723150 sid1728666 sid1736462 sid1786932 sid1838527 sid1901980 sid1904773 sid1925035 sid1929345 sid1975998 sid2044302 sid2060854 sid2111408 sid2188786 sid2193461 sid2193710 sid2253537 sid2300398 sid2322063 + sid2430857 sid2441897 sid2443505 sid2446733 sid2450422 sid2511643 sid2557935 sid2561143 sid2582187 sid2627423 sid2640782 sid2689320 sid2694971 sid2695275 sid2761539 sid2782026 sid3018553 sid3024376 sid3082818 sid3088200 sid3220140 + sid3229597 sid3364470 sid3369414 sid3371336 sid3421143 sid3491516 sid3497008 sid3502328 sid3560491 sid3700355 sid3753980 sid3766284 sid3873097 sid3897667 sid3935706 sid3936738 sid3961507 sid3999382 sid4019779 sid4064094 sid4067073 + sid4085078 sid4093808 sid4207106 sid4269075 sid4405732 sid4422712 sid4457617 sid4470737 sid4547839 sid4591559 sid4614481 sid4666210 sid4724473 sid4744239 sid4746199 sid4853860 sid4860930 sid4876768 sid4921272 sid4936860 sid4942141 + sid4983889 sid5046446 sid5051207 sid5202842 sid5327959 sid5328733 sid5331104 sid5331295 sid5335507 sid5337183 sid5403941 sid5404070 sid5443425 sid5471002 sid5533496 sid5574574 sid5596823 sid5658913 sid5706771 sid5849555 sid5905828 + sid5914564 sid5977866 sid5980535 sid6044662 sid6050580 sid6053101 sid6058582 sid6098660 sid6110923 sid6121943 sid6160952 sid6169115 sid6227315 sid6302031 sid6312057 sid6313204 sid6319604 sid6324165 sid6366144 sid6424624 sid6433706 + sid6436570 sid6567939 sid6581886 sid6585154 sid6642239 sid6711460 sid6755794 sid6757584 sid6779744 sid6888982 sid6948223 sid6975803 sid7024388 sid7025174 sid7081207 sid7103434 sid7108465 sid7160902 sid7164123 sid7343544 sid7345907 + sid7347134 sid7352284 sid7357325 sid7408491 sid7413909 sid7424320 sid7550565 sid7565328 sid7602252 sid7620071 sid7676556 sid7682851 sid7693443 sid7749160 sid7762540 sid7819187 sid8018172 sid8026061 sid8066866 sid8068619 sid8081889 + sid8082803 sid8086668 sid8128105 sid8203197 sid8204217 sid8259236 sid8269509 sid8279379 sid8285508 sid8336155 sid8390859 sid8402125 sid8421263 sid8470451 sid8472753 sid8473765 sid8531382 sid8532762 sid8534399 sid8535329 sid8586819 + sid8587584 sid8589600 sid8608293 sid8681154 sid8717121 sid8721614 sid8727803 sid8794558 sid8802362 sid8869444 sid8869508 sid8924542 sid8925422 sid8931672 sid8980592 sid8996733 sid9009365 sid9109599 sid9116411 sid9125466 sid9132112 + sid9191156 sid9207129 sid9251092 sid9267391 sid9313632 sid9316163 sid9338264 sid9376367 sid9394894 sid9438633 sid9452057 sid9455823 sid9463568 sid9524059 sid9528390 sid9529512 sid9597313 sid9716237 sid9717299 sid9766411 sid9774007 + sid9830973 sid9844748 sid9901723 sid9908560 sid9915075 sid9961824 sid10029000 sid10162735 sid10234911 sid10291824 sid10297672 sid10307479 sid10378506 sid10379790 sid10424754 sid10425137 sid10438969 sid10444251 sid10445048 sid10508708 + sid10561723 sid10569481 sid10624778 sid10633685 sid10637585 sid10641777 sid10772228 sid10776411 sid10815347 sid10823044 sid10830253 sid10838428 sid10898659 sid11011899 sid11013034 sid11014417 sid11023163 sid11037713 sid11103186 + sid11150158 sid11151608 sid11158733 sid11277354 sid11290408 sid11338363 sid11360861 sid11408616 sid11409854 sid11417137 sid11419910 sid11476522 sid11479423 sid11480521 sid11625160 sid11674160 sid11693774 sid11697394 sid11740533 + sid11741436 sid11862197 sid11866919 sid11883049 sid11886292 sid11931197 sid11939473 sid11960080 sid11994756 sid12024961 sid12060952 sid12196487 sid12197004 sid12220950 sid12286426 sid12388908 sid12389469 sid12389704 sid12403341 + sid12460324 sid12467539 sid12472654 sid12475534 sid12519338 sid12535934 sid12541586 sid12585735 sid12588833 sid12592859 sid12596689 sid12608182 sid12651982 sid12729596 sid12783232 sid12861900 sid12864610 sid12864741 sid12926671 + sid12931589 sid12990781 sid12993010 sid13108048 sid13130895 sid13177640 sid13196749 sid13200152 sid13251997 sid13267634 sid13269477 sid13317181 sid13334979 sid13381108 sid13382166 sid13446970 sid13449099 sid13503375 sid13520261 + sid13580521 sid13633749 sid13658475 sid13718794 sid13766099 sid13788552 sid13840882 sid13846827 sid13850409 sid13970846 sid13978331 sid14049784 sid14096951 sid14102032 sid14156406 sid14159366 sid14159914 sid14163637 sid14176268 + sid14177252 sid14184782 sid14223635 sid14237907 sid14249737 sid14303686 sid14353833 sid14373254 sid14379704 sid14484632 sid14619545 sid14620673 sid14622174 sid14758707 sid14761261 sid14774227 sid14774309 sid14837427 sid14878365 + sid15020884 sid15028085 sid15030237 sid15037023 sid15097680 sid15155158 sid15169073 sid15212188 sid15225417 sid15280931 sid15284360 sid15401865 sid15415138 sid15421106 sid15466887 sid15498518 sid15538208 sid15555493 sid15563196 + sid15563947 sid15598816 sid15603199 sid15677708 sid15694643 sid15736436 sid15739015 sid15753763 sid15754494 sid15756591 sid15861397 sid15879863 sid15938273 sid15942804 sid15950647 sid16192730 sid16199269 sid16203853 sid16215127 + sid16329284 sid16335980 sid16342836 sid16347695 sid16350876 sid16396347 sid16452790 sid16456088 sid16479549 sid16521656 sid16539492 sid16661655 sid16675973 sid16737572 sid16744261}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0 +\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{+{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1418\margr1134\margt851\margb851\gutter0\ltrsect +\deftab708\widowctrl tnbjenddoc\hyphhotz425 rackmoves0 rackformatting1\donotembedsysfont1 elyonvml1\donotembedlingdata0\grfdocevents0 alidatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0 +\showxmlerrors1 oxlattoyenxpshrtn oultrlspc\dntblnsbdb ospaceforul ormshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1418\dgvorigin851\dghshow1\dgvshow1 +\jexpand iewkind1 iewscale130\pgbrdrhead\pgbrdrfoot\splytwnine tnlytwnine\htmautsp olnhtadjtbl\useltbalnlntblind\lytcalctblwd\lyttblrtgr\lnbrkrule obrkwrptbl\snaptogridincell empersonalinfollowfieldendsel +\wrppunctsianbrkrule sidroot2891 ewtblstyruls ogrowautofit emdttm\usenormstyforlist oindnmbrts elnbrelev ocxsptable\indrlsweleven oafcnsttblfelev\utinl\hwelev\spltpgpar otcvasp otbrkcnstfrctbl otvatxbx\krnprsnet+ ouicompat et0{\*\wgrffmtfilter 2450} ofeaturethrottle1\ilfomacatclnup0{\* tnsep \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid2891 tlch cs1 f0fs22lang1025 +\ltrch cs0 1 s16\lang1031\langfe1033+\par }}{\* tnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid2891 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+ tlch cs1 f0 \ltrch cs0 \insrsid12388908 +\par }}{\*ftnsep \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid2891 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+ tlch cs1 f0 \ltrch cs0 \insrsid12388908 +\par }}{\*ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0 i0\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid2891 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+ tlch cs1 f0 \ltrch cs0 \insrsid12388908 +\par }}\ltrpar \sectd \ltrsect\psz9\linex0\headery709 ootery709+ qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+\par }}{\h eaderr \ltrpar \pard\plain \ltrpar\s16\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+{ tlch cs1 f0 \ltrch cs0 \insrsid11741436 +\par }}{ ooterl \ltrpar \pard\plain \ltrpar\s17\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+{ tlch cs1 f0 \ltrch cs0 \insrsid11741436 +\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 1 s16\lang1031\langfe1033+{ tlch cs1 f0 \ltrch cs0 \insrsid11741436 +\par }}{\headerf \ltrpar \pard\plain \ltrpar\s16\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+{ tlch cs1 f0 \ltrch cs0 \insrsid11741436 +\par }}{ ooterf \ltrpar \pard\plain \ltrpar\s17\ql \li0 i0\widctlpar qc x4536 qr x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+{ tlch cs1 f0 \ltrch cs0 \insrsid11741436 +\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\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0\pararsid2891 + tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+\par \ltrrow} rowd \irow0\irowband0\lastrow \ltrrow s19 rgaph57 rleft51 rbrdrtrdrsrdrw10 rbrdrlrdrsrdrw10 rbrdrbrdrsrdrw10 rbrdrrrdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth1 rftsWidthB3 rftsWidthA3 rautofit1 rpaddl57 rpaddt28 rpaddb28 rpaddr57 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blrsid5977866 bllkhdrrows bllkhdrcols bllknocolband blind108 blindtype3 +rdrsrdrw10 ++ 1 s24\lang1031\langfe1031+\ql \li0 i0\widctlpar\intbl\wrapdefaultspalphaspnum aautodjustright in0\lin0\pararsid16203853\yts19 tlch cs1 f0fs22lang1025 \ltrch cs0 1 s16\lang1031\langfe1033+\insrsid16203853+ 1 s16\lang1031\langfe1033+rdrsrdrw10 rbrdrhrdrsrdrw10 rbrdrvrdrsrdrw10 + rftsWidth1 rftsWidthB3 rftsWidthA3 rautofit1 rpaddl57 rpaddt28 rpaddb28 rpaddr57 rpaddfl3 rpaddft3 rpaddfb3 rpaddfr3 blrsid5977866 bllkhdrrows bllkhdrcols bllknocolband blind108 blindtype3 +rdrsrdrw10 ++\par }{\* hemedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b03041400060008000000210060ffbff5a4060000a21b0000160000007468656d652f7468656d652f +7468656d65312e786d6cec594f6f1b4514bf23f11d467b6f6327761a4775aad8b11b6852a2d82dea71bc3bde9d66766735334eea1b6a8f484888823850891b07 +04546a252ee5d3048aa048fd0abc99d95defc46b92b411ada039b4f6ec6fdefff79b37ebabd7eec50c1d1221294fda5efd72cd4324f1794093b0eddd1af62fad +79482a9c0498f184b4bd2991deb58df7dfbb8ad755446282607f22d771db8b944ad79796a40fcb585ee62949e0d9988b182bf82ac2a540e023901bb3a5e55a6d +7529c634f150826310bb830595127b1bb9dc1e03e189927ac16762a0a5920a707050d71039955d26d021666d0f7404fc6848ee290f312c153c687b35f3e72d6d +5c5dc2ebd926a616ec2dedeb9bbf6c5fb6213858363a45382a94d6fb8dd695ad42be0130358febf57add5ebd906700d8f7c1556b4b5966a3bf56efe4324b20fb +715e76b7d6ac355c7c49feca9ccdad4ea7d36c65b658a106643f36e6f06bb5d5c6e6b28337208b6fcee11b9dcd6e77d5c11b90c5afcee1fb575aab0d176f4011 +a3c9c11c5a27b4dfcfa417903167db95f03580afd532f80c05d55094975631e6895a586c31becb451f101ac9b0a20952d3948cb10f25dcc5f14850ac35e07582 +4b4fec922fe796b432247d4153d5f63e4c31b4c34cdecb673fbc7cf6041ddf7f7a7cffe7e3070f8eefff640539bbb671129677bdf8eef3bf1e7d82fe7cf2ed8b +875f56e36519ffdb8f9ffefacb17d540e89f9939cfbf7afcfbd3c7cfbffeec8fef1f56c037051e95e1431a13896e9223b4cf6370cc44c5b59c8cc4f9760c234c +cb3b369350e2046b2d15f27b2a72d037a79865d971ece8103782b705f04715f0fae4ae63f0201213452b34df886207b8cb39eb705119851b5a5729ccc3491256 +2b1793326e1fe3c32add5d9c38f9ed4d5260cebc2c1dc7bb1171ccdc63385138240951483fe30784547877875227aebbd4175cf2b1427728ea605a1992211d39 +d534dbb44d63c8cbb4ca67c8b7139bdddba8c35995d75be4d0454257605661fc9030278cd7f144e1b84ae410c7ac1cf01daca22a230753e197713da920d32161 +1cf502a2cfb4f9d2ff4880bfa5a4dfc040599569df65d3d8450a450faa64ee60cecbc82d7ed08d709c5661073489cad80fe4019428467b5c55c177b9db21fa3b +e401270bd37d9b1227dda7b3c12d1a3a26cd0a443f99888a285e27dca9dfc1948d31315403acee70754c937f226e4681b9ad868b236ea0cae7df3caab0fb6da5 +ec4d38bdaa7a66fb04512fc29da4e72e17017dfbd9790b4f923d020d31dfa7efc8f91d397bff79725ed4cf174fc933160682d6b3889db4cddc1d2f1ebbc794b1 +819a32b223cde42de1f009fab0a8379afb2629ee6169041f752b830607170a6cf620c1d5c754458308a730b5d73d2d249499e850a2944bb82e9ae54ad91a0f93 +bfb297cda6be8658ea9058edf2c02eafe8e5fcb65188315685e64e9b2b5ad102ceaa6ce54a26147c7b1565756dd499b5d58d6986151d6d85cb3ac4e65e0e212f +5c83c5229a30d520988520caab70e3d7aae1b683190974dc6d8ef2b4982c5c648a64840392e548fb3d9fa3ba49525e2b738e683f6c31e8abe329512b696b69b1 +afa1ed2c492aab6b2c509767ef75b29457f02c4b20ed643bb2a4dc9c2c41476dafd55c6e7ac8c769db1bc345193ec629645dea4112b3105e35f94ad8b23fb599 +4d97cfb2d9ca1d739ba00e2f3f6cdce71c76782015526d6119d9d2308fb2126089d664ed5f6e42582fca810a363a9b152b6b500c6fcc0a88a39b5a321e135f95 +935d5ad1b1b35f332ae51345c4200a8ed0884dc43e86f4eb52057f022ae17d876104fd05decee9689b472e39674d577e276670761db334c219ddea16cd3bd9c2 +0d211536986f25f3c0b74adb8d73e777c5b4fc05b9522ee3ff992bfa3c81d70f2b81ce800f2f860546ba53da1e172ae2c0426944fdbe80c9c17007540bbce185 +c75054f07adafc2fc8a1fedff69c9561da1a6e916a9f864850388f542408d9035a32d5778ab07a767659912c13642aaa64ae4cadd9237248d85073e0aa3edb3d +1441a91b36c968c0e04ed69ffb3deba051a8879c72bf394c569cbdb607feedc9c7363338e5f2b01968f2f8172616e3c1ec54b5fbcdf6fcec2d3ba21fccc6ac46 +de15a0ac7414b4b2b67f4513ce79d45ac69af378b9991b07599cf718168b812885974848ff03e71f153e23a68cf5813ae4fbc0ad087ebed0c2a06ca0aa2fd9c1 +036982b48b23189ceca22d262dca86361b9d74d4f2c3fa8227dd42ef89606bcbce92ef7306bb18ce5c754e2f5e64b0b3083bb1b66b0b430d993dd9a2b034ce6f +322631e647b2f28f597c741712bd053f1a4c9892a698e0972a8161861e983e80e6b71acdd68dbf010000ffff0300504b0304140006000800000021000dd1909f +b60000001b010000270000007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f +6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b0 +60828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509a +ffb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000 +001c0200001300000000000000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c000 +0000360100000b00000000000000000000000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c +00000000000000000000000000190200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d001400060008000000210060ffbf +f5a4060000a21b00001600000000000000000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021 +000dd1909fb60000001b0100002700000000000000000000000000ae0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000a90a00000000} +{\*+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdpriority59 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdlocked0 Placeholder Text; +\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2; +\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List; +\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1; +\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision; +\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1; +\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1; +\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2; +\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2; +\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3; +\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3; +\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4; +\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4; +\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4; +\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5; +\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000 +4d73786d6c322e534158584d4c5265616465722e362e30000000000000000000000e0000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdffffff04000000feffffff05000000fefffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff010000000c6ad98892f1d411a65f0040963251e500000000000000000000000070b3 +3607969edb0103000000c0020000000000004d0073006f004400610074006100530074006f0072006500000000000000000000000000000000000000000000000000000000000000000000000000000000001a000101ffffffffffffffff02000000000000000000000000000000000000000000000070b33607969edb01 +70b33607969edb010000000000000000000000003000d200c9004900d700d800320041004b00c4003400d300c30046004500cb00d0005300d1005800c50051003d003d000000000000000000000000000000000032000101ffffffffffffffff03000000000000000000000000000000000000000000000070b33607969e +db0170b33607969edb010000000000000000000000004900740065006d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffff04000000ffffffff000000000000000000000000000000000000000000000000 +000000000000000000000000000000000e0100000000000001000000020000000300000004000000feffffff060000000700000008000000090000000a000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e3c623a536f75726365732053656c65637465645374796c653d225c4150412e58534c22205374796c +654e616d653d224150412220786d6c6e733a623d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f6772617068792220786d6c6e733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e +6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879223e3c2f623a536f75726365733e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003c3f786d6c2076657273696f6e3d22312e302220656e636f6469 +6e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e0d0a3c64733a6461746173746f72654974656d2064733a6974656d49443d227b44463438324136422d303038372d343732412d423338432d3531324243313243353739357d2220786d6c6e733a64733d22687474703a2f2f736368656d61732e6f70 +656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f637573500072006f007000650072007400690065007300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000200ffffffffffffffffffffffff000000000000 +0000000000000000000000000000000000000000000000000000000000000500000055010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746f6d586d6c223e3c64733a736368656d61526566733e3c64733a736368656d615265662064733a7572693d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f7267 +2f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222f3e3c2f64733a736368656d61526566733e3c2f64733a6461746173746f72654974656d3e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 21e1b13ca64d..31af508baeca 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2014,6 +2014,20 @@ CPPUNIT_TEST_FIXTURE(Test, test165483Tdf) CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xStyle, u"ParaBottomMargin"_ustr)); } +CPPUNIT_TEST_FIXTURE(Test, tdf165923Tdf) +{ + createSwDoc("tdf165923.rtf"); + uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), + uno::UNO_QUERY); + uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xCell(xTable->getCellByName(u"A1"_ustr), uno::UNO_QUERY); + uno::Reference<container::XEnumerationAccess> xParaEnumAccess(xCell->getText(), uno::UNO_QUERY); + uno::Reference<container::XEnumeration> xParaEnum = xParaEnumAccess->createEnumeration(); + uno::Reference<text::XTextRange> xPara(xParaEnum->nextElement(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPara, u"ParaTopMargin"_ustr)); +} + // 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.cxx b/sw/source/writerfilter/dmapper/DomainMapper.cxx index dffb1d38a971..bf909a287224 100644 --- a/sw/source/writerfilter/dmapper/DomainMapper.cxx +++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx @@ -4252,6 +4252,7 @@ void DomainMapper::ResetStyleProperties() pContext->Insert(ePropertyId, uno::Any(0l)); } break; + case PROP_PARA_TOP_MARGIN: case PROP_PARA_BOTTOM_MARGIN: case PROP_PARA_RIGHT_MARGIN: pContext->Insert(ePropertyId, uno::Any(sal_Int32(0))); commit 63098d0bd802fb0cdbfcd0c9505fe2c4019bf5ad Author: Xisco Fauli <[email protected]> AuthorDate: Thu Mar 27 16:32:52 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 29 14:59:16 2025 +0100 libxml2: upgrade to 2.13.7 Downloaded from https://download.gnome.org/sources/libxml2/2.13/libxml2-2.13.7.tar.xz Change-Id: Ic65581fd80ebc73d052f934afcf61954fc6e6527 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183408 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 65d24acd5f9d..093b4acc201b 100644 --- a/download.lst +++ b/download.lst @@ -527,8 +527,8 @@ XMLSEC_TARBALL := xmlsec1-1.3.6.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -LIBXML_SHA256SUM := f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96 -LIBXML_VERSION_MICRO := 6 +LIBXML_SHA256SUM := 14796d24402108e99d8de4e974d539bed62e23af8c4233317274ce073ceff93b +LIBXML_VERSION_MICRO := 7 LIBXML_TARBALL := libxml2-2.13.$(LIBXML_VERSION_MICRO).tar.xz # three static lines # so that git cherry-pick commit 6cc5bdcdd9156e111e85f63480a6168408280557 Author: خالد حسني <[email protected]> AuthorDate: Fri Mar 28 00:20:49 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 29 14:59:16 2025 +0100 Revert^2 "tdf#163213: do not show OpenType features if the font has "morx" table" This reverts commit 378dd9025e39f7a4e575ba09b7bde8e038fc0b26. Reason for revert: The user report that resulted in the first revert was bogus and based on user misunderstanding Change-Id: I511386fb66bb1026da46cef9939c7108f9516318 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183423 Tested-by: Jenkins Reviewed-by: خالد حسني <[email protected]> (cherry picked from commit 742dbb088b44783c3a4f0fd120b11be3a74fd483) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183433 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/vcl/source/font/FeatureCollector.cxx b/vcl/source/font/FeatureCollector.cxx index 3e8e2e76e8a5..767d8c39aa73 100644 --- a/vcl/source/font/FeatureCollector.cxx +++ b/vcl/source/font/FeatureCollector.cxx @@ -14,6 +14,7 @@ #include <font/OpenTypeFeatureStrings.hrc> #include <svdata.hxx> +#include <hb-aat.h> #include <hb-ot.h> #include <hb-graphite2.h> @@ -195,7 +196,9 @@ bool FeatureCollector::collect() } else { - collectForTable(HB_OT_TAG_GSUB); // substitution + // tdf#163213: Font Features dialog should not show OpenType features if the font has "morx" table + if (!hb_aat_layout_has_substitution(m_pHbFace)) + collectForTable(HB_OT_TAG_GSUB); // substitution collectForTable(HB_OT_TAG_GPOS); // positioning return true; } commit 301db4c8969c1bd55debef3f11c746f66a525354 Author: Oliver Specht <[email protected]> AuthorDate: Wed Mar 26 11:37:59 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 29 14:59:16 2025 +0100 tdf#165329 Improve fix of tdf#163634 Broken loading of text boxes with relatives sizes is fixed here. Change-Id: I180850d746aa9e92d0de13b3eb594f3bb754899e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183341 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins Tested-by: Gabor Kelemen <[email protected]> (cherry picked from commit 80e7e76b25881ca500c51ee91cfba3687a49b1f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183421 Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 24d30ba3b559..12428d1e054f 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -250,8 +250,6 @@ private: LOKSpecialFlags meFlags; }; - - class ImpEditView : public vcl::unohelper::DragAndDropClient { friend class EditView; @@ -653,8 +651,8 @@ private: void ParaAttribsChanged( ContentNode const * pNode, bool bIgnoreUndoCheck = false ); void TextModified(); - void CalcHeight(ParaPortion& rParaPortion); - bool isInEmptyClusterAtTheEnd(ParaPortion& rParaPortion); + void CalcHeight(ParaPortion& rParaPortion, bool bIsScaling = false); + bool isInEmptyClusterAtTheEnd(ParaPortion& rParaPortion, bool bIsScaling); void InsertUndo( std::unique_ptr<EditUndo> pUndo, bool bTryMerge = false ); void ResetUndoManager(); @@ -685,13 +683,13 @@ private: void Clear(); EditPaM RemoveText(); - bool createLinesForEmptyParagraph(ParaPortion& rParaPortion); + bool createLinesForEmptyParagraph(ParaPortion& rParaPortion, bool bIsScaling = false); tools::Long calculateMaxLineWidth(tools::Long nStartX, SvxLRSpaceItem const& rLRItem, const SvxFontUnitMetrics& rMetrics); - bool CreateLines(sal_Int32 nPara, sal_uInt32 nStartPosY); + bool CreateLines(sal_Int32 nPara, sal_uInt32 nStartPosY, bool bIsScaling = false); void CreateAndInsertEmptyLine(ParaPortion& rParaPortion); - bool FinishCreateLines(ParaPortion& rParaPortion); + bool FinishCreateLines(ParaPortion& rParaPortion, bool bIsScaling = false); void CreateTextPortions(ParaPortion& rParaPortion, sal_Int32& rStartPos); void RecalcTextPortion(ParaPortion& rParaPortion, sal_Int32 nStartPos, sal_Int32 nNewChars); sal_Int32 SplitTextPortion(ParaPortion& rParaPortion, sal_Int32 nPos, EditLine* pCurLine = nullptr); @@ -982,7 +980,7 @@ public: void SetMinColumnWrapHeight(tools::Long nVal) { mnMinColumnWrapHeight = nVal; } - tools::Long FormatParagraphs(o3tl::sorted_vector<sal_Int32>& rRepaintParagraphs); + tools::Long FormatParagraphs(o3tl::sorted_vector<sal_Int32>& rRepaintParagraphs, bool bIsScaling); void ScaleContentToFitWindow(o3tl::sorted_vector<sal_Int32>& rRepaintParagraphs); void FormatDoc(); void FormatFullDoc(); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 2cd3d66de41b..9214e79ded13 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4406,7 +4406,7 @@ tools::Long ImpEditEngine::GetXPos(ParaPortion const& rParaPortion, EditLine con } /** Is true if paragraph is in the empty cluster of paragraphs at the end */ -bool ImpEditEngine::isInEmptyClusterAtTheEnd(ParaPortion& rPortion) +bool ImpEditEngine::isInEmptyClusterAtTheEnd(ParaPortion& rPortion, bool bIsScaling) { sal_Int32 nPortion = GetParaPortions().GetPos(&rPortion); @@ -4421,7 +4421,7 @@ bool ImpEditEngine::isInEmptyClusterAtTheEnd(ParaPortion& rPortion) if (nCurrent == nPortion) { OutlinerEditEng* pOutlEditEng{ dynamic_cast<OutlinerEditEng*>(mpEditEngine)}; - if (pOutlEditEng) + if (!bIsScaling && pOutlEditEng) return pOutlEditEng->GetDepth(nCurrent) < 0; else return true; @@ -4431,12 +4431,12 @@ bool ImpEditEngine::isInEmptyClusterAtTheEnd(ParaPortion& rPortion) return false; } -void ImpEditEngine::CalcHeight(ParaPortion& rPortion) +void ImpEditEngine::CalcHeight(ParaPortion& rPortion, bool bIsScaling) { rPortion.mnHeight = 0; rPortion.mnFirstLineOffset = 0; - if (!rPortion.IsVisible() || isInEmptyClusterAtTheEnd(rPortion)) + if (!rPortion.IsVisible() || isInEmptyClusterAtTheEnd(rPortion, bIsScaling)) return; OSL_ENSURE(rPortion.GetLines().Count(), "Paragraph with no lines in ParaPortion::CalcHeight"); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 6b86cbd0962b..be7d64f00c90 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -317,7 +317,7 @@ void ImpEditEngine::FormatFullDoc() FormatDoc(); } -tools::Long ImpEditEngine::FormatParagraphs(o3tl::sorted_vector<sal_Int32>& aRepaintParagraphList) +tools::Long ImpEditEngine::FormatParagraphs(o3tl::sorted_vector<sal_Int32>& aRepaintParagraphList, bool bIsScaling) { sal_Int32 nParaCount = GetParaPortions().Count(); tools::Long nY = 0; @@ -329,7 +329,7 @@ tools::Long ImpEditEngine::FormatParagraphs(o3tl::sorted_vector<sal_Int32>& aRep if (rParaPortion.MustRepaint() || (rParaPortion.IsInvalid() && rParaPortion.IsVisible())) { // No formatting should be necessary for MustRepaint()! - if (CreateLines(nParagraph, nY)) + if (CreateLines(nParagraph, nY, bIsScaling)) { if (!bGrow && GetTextRanger()) { @@ -388,7 +388,7 @@ void ImpEditEngine::ScaleContentToFitWindow(o3tl::sorted_vector<sal_Int32>& aRep if (!maCustomScalingParameters.areValuesDefault()) maScalingParameters = maCustomScalingParameters; - tools::Long nHeight = FormatParagraphs(aRepaintParagraphList); + tools::Long nHeight = FormatParagraphs(aRepaintParagraphList, true); bool bOverflow = nHeight > (maMaxAutoPaperSize.Height() * mnColumns); size_t nCurrentScaleLevel = 0; @@ -407,7 +407,7 @@ void ImpEditEngine::ScaleContentToFitWindow(o3tl::sorted_vector<sal_Int32>& aRep maScalingParameters = constScaleLevels[nCurrentScaleLevel]; // Try again with different scaling factor - nHeight = FormatParagraphs(aRepaintParagraphList); + nHeight = FormatParagraphs(aRepaintParagraphList, true); bOverflow = nHeight > (maMaxAutoPaperSize.Height() * mnColumns); // Increase scale level @@ -439,7 +439,7 @@ void ImpEditEngine::FormatDoc() if (maStatus.DoStretch()) ScaleContentToFitWindow(aRepaintParagraphList); else - FormatParagraphs(aRepaintParagraphList); + FormatParagraphs(aRepaintParagraphList, false); maInvalidRect = tools::Rectangle(); // make empty @@ -593,7 +593,7 @@ tools::Long ImpEditEngine::GetColumnWidth(const Size& rPaperSize) const return (nWidth - mnColumnSpacing * (mnColumns - 1)) / mnColumns; } -bool ImpEditEngine::createLinesForEmptyParagraph(ParaPortion& rParaPortion) +bool ImpEditEngine::createLinesForEmptyParagraph(ParaPortion& rParaPortion, bool bIsScaling) { // fast special treatment... if (rParaPortion.GetTextPortions().Count()) @@ -602,7 +602,7 @@ bool ImpEditEngine::createLinesForEmptyParagraph(ParaPortion& rParaPortion) rParaPortion.GetLines().Reset(); CreateAndInsertEmptyLine(rParaPortion); - return FinishCreateLines(rParaPortion); + return FinishCreateLines(rParaPortion, bIsScaling); } tools::Long ImpEditEngine::calculateMaxLineWidth(tools::Long nStartX, SvxLRSpaceItem const& rLRItem, @@ -627,7 +627,7 @@ tools::Long ImpEditEngine::calculateMaxLineWidth(tools::Long nStartX, SvxLRSpace return nMaxLineWidth; } -bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) +bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY, bool bIsScaling ) { assert(GetParaPortions().exists(nPara) && "Portion paragraph index is not valid"); ParaPortion& rParaPortion = GetParaPortions().getRef(nPara); @@ -644,7 +644,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) // Fast special treatment for empty paragraphs... bool bEmptyParagraph = rParaPortion.GetNode()->Len() == 0 && !GetTextRanger(); if (bEmptyParagraph) - return createLinesForEmptyParagraph(rParaPortion); + return createLinesForEmptyParagraph(rParaPortion, bIsScaling); sal_Int64 nCurrentPosY = nStartPosY; // If we're allowed to skip parts outside and this cannot possibly fit in the given height, @@ -1936,12 +1936,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine(ParaPortion& rParaPortion) } } -bool ImpEditEngine::FinishCreateLines(ParaPortion& rParaPortion) +bool ImpEditEngine::FinishCreateLines(ParaPortion& rParaPortion, bool bIsScaling) { // CalcCharPositions( pParaPortion ); rParaPortion.SetValid(); tools::Long nOldHeight = rParaPortion.GetHeight(); - CalcHeight(rParaPortion); + CalcHeight(rParaPortion, bIsScaling); DBG_ASSERT(rParaPortion.GetTextPortions().Count(), "FinishCreateLines: No Text-Portion?"); bool bRet = rParaPortion.GetHeight() != nOldHeight; commit 67ff28f46d4368d57441dd6a7a198cbe398f7599 Author: Christian Lohmaier <[email protected]> AuthorDate: Fri Mar 14 21:36:55 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 29 14:59:16 2025 +0100 windows arm64 requires SDK 10.0.22000 or newer for clang (skia) since the windows headers themselves use intrinsics that are not available when using clang. Newer SDK solves that problem. (adjusted to the branch for not using pdfium that uses clang) Change-Id: I0fa8cb05650b7cf87c38f8859bd1d0fc4f10c7ad (cherry picked from commit 821a78abc4a472106b1395a6229985ac5cf5a597) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182998 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/configure.ac b/configure.ac index 9486b9b7ea27..8941e61f8a8f 100644 --- a/configure.ac +++ b/configure.ac @@ -7173,9 +7173,18 @@ if test "$_os" = "WINNT"; then echo $WINDOWS_SDK_LIB_SUBDIR # Assuming maximum of 5 digits for each part and ignoring last part SDK_NORMALIZED_VER=$(echo $WINDOWS_SDK_LIB_SUBDIR | awk -F. '{printf("%d%05d%05d ", $1, $2, $3)}') - # 10.0.20348.0 is the minimum required version - if test "$SDK_NORMALIZED_VER" -lt 100000020348; then - AC_MSG_ERROR([You need Windows SDK greater than or equal 10.0.20348.0]) + if test "$SDK_NORMALIZED_VER" -lt 100000022000; then + if test "$WIN_HOST_ARCH" = "arm64" -a "$enable_skia" != "no"; then + AC_MSG_ERROR([You need Windows SDK 10.0.22000 or later to build for Windows arm64 with skia. Install a newer version of the SDK or disable skia]) + fi + # 10.0.20348.0 is the minimum required version, + # but it makes sense to align with arm64 baseline. + # Give people a heads-up to update their systems before enforcing it + if test "$SDK_NORMALIZED_VER" -lt 100000020348; then + AC_MSG_ERROR([You need Windows SDK greater than or equal 10.0.20348.0]) + else + add_warning "build requirements might be bumped to Windows SDK >= 10.0.22000 soon" + fi fi fi
