diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-30 09:05:04 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-30 09:05:22 +0200 |
commit | 43a17602fb894c10931581b20deec4a47889f310 (patch) | |
tree | 8e58180c048ab7337fb396dd9e5dd7fb671d32ba /sw | |
parent | 1250ad9561e8f7d3227bb97b9e1f7b2968b5c900 (diff) |
Related: tdf#65642 RTF filter: import \pgnlcltr
This as a side effect also implements support for DOCX <w:pgNumType
w:fmt="lowerLetter" .../>.
Change-Id: I47b60a0390ef081dc15b26e40393e35bf7bad130
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/rtfexport/data/pgnlcltr.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/pgnlcltr.rtf b/sw/qa/extras/rtfexport/data/pgnlcltr.rtf new file mode 100644 index 000000000000..6bc303573ccb --- /dev/null +++ b/sw/qa/extras/rtfexport/data/pgnlcltr.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\pgnlcltr +{\field\fldedit +{\*\fldinst +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid525329 PAGE \\* MERGEFORMAT } +} +{\fldrslt +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid9597790 A} +} +} +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid13321744 +\par } +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 8a544ce72934..da0712aaa428 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -1007,6 +1007,12 @@ DECLARE_RTFEXPORT_TEST(testTdf65642, "tdf65642.rtf") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), getProperty<sal_Int32>(getParagraph(2), "PageNumberOffset")); } +DECLARE_RTFEXPORT_TEST(testPgnlcltr, "pgnlcltr.rtf") +{ + // The second page's numbering type: this was style::NumberingType::ARABIC. + CPPUNIT_ASSERT_EQUAL(style::NumberingType::CHARS_LOWER_LETTER_N, getProperty<sal_Int16>(getStyles("PageStyles")->getByName("Converted1"), "NumberingType")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |