diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-21 08:36:20 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-21 07:40:27 +0000 |
| commit | 91b18cee97b110fe60391faa945a6fd166f1d8aa (patch) | |
| tree | f4c78b47f6bfaf6e7a182f94551b34634b64b830 /sw | |
| parent | 13758a3d154e8e450fdfe8bcdeb6b3a03996c53a (diff) | |
Related: tdf#65642 RTF filter: import \pgnlcrm
This as a side effect also implements support for DOCX <w:pgNumType
w:fmt="lowerRoman" .../>.
Change-Id: Ifb524b25236a8bc774690266a4fa205154204109
Reviewed-on: https://gerrit.libreoffice.org/24273
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfexport/data/pgnlcrm.rtf | 23 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 6 |
2 files changed, 29 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/pgnlcrm.rtf b/sw/qa/extras/rtfexport/data/pgnlcrm.rtf new file mode 100644 index 000000000000..4ef9b61c80e5 --- /dev/null +++ b/sw/qa/extras/rtfexport/data/pgnlcrm.rtf @@ -0,0 +1,23 @@ +{\rtf1 +\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +{\field\fldedit +{\*\fldinst +{ PAGE \\* MERGEFORMAT } +} +{\fldrslt +{1} +} +} +\sect +\sectd\pgnrestart\pgnlcrm +{\field\fldedit +{\*\fldinst +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid525329 PAGE \\* MERGEFORMAT } +} +{\fldrslt +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid9597790 i} +} +} +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13321744 +\par } +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index c08735bfb6cc..58a35c1a0079 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1019,6 +1019,12 @@ DECLARE_RTFEXPORT_TEST(testPgnucrm, "pgnucrm.rtf") CPPUNIT_ASSERT_EQUAL(style::NumberingType::ROMAN_UPPER, getProperty<sal_Int16>(getStyles("PageStyles")->getByName("Converted1"), "NumberingType")); } +DECLARE_RTFEXPORT_TEST(testPgnlcrm, "pgnlcrm.rtf") +{ + // The second page's numbering type: this was style::NumberingType::ARABIC. + CPPUNIT_ASSERT_EQUAL(style::NumberingType::ROMAN_LOWER, getProperty<sal_Int16>(getStyles("PageStyles")->getByName("Converted1"), "NumberingType")); +} + DECLARE_RTFEXPORT_TEST(testTdf98806, "tdf98806.rtf") { uno::Reference<text::XBookmarksSupplier> xBookmarksSupplier(mxComponent, uno::UNO_QUERY); |