diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-22 12:34:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-22 16:36:33 +0100 |
| commit | 74249cb6f4f52b7c10ebaa92f943920f6f94aaf4 (patch) | |
| tree | e43e346a975b646720c0b2ec8e0d2a7829f930e2 /sw/qa | |
| parent | f2f171a4dbec9e3adac7ff66c1417ced84cd0d8e (diff) | |
RTF import: fix handling of multiple \lfolevel control words
Change-Id: I242853d491c2ef83f192486fa6fe5a3407700047
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/rtfexport/data/num-override-start.rtf | 29 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 7 |
2 files changed, 36 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/num-override-start.rtf b/sw/qa/extras/rtfexport/data/num-override-start.rtf new file mode 100644 index 000000000000..aa1a2d4d023f --- /dev/null +++ b/sw/qa/extras/rtfexport/data/num-override-start.rtf @@ -0,0 +1,29 @@ +{\rtf1 +{\*\listtable +{\list\listtemplateid-1627985480 +{\listlevel\levelnfc0 +\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\'02\'00.;} +{\levelnumbers\'01;} +\rtlch\fcs1 \af0 \ltrch\fcs0 \s15\fi-360\li720\lin720 } +{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levellegal\levelspace0\levelindent0 +{\leveltext\'03\'00.\'01;} +{\levelnumbers\'01\'03;} +\rtlch\fcs1 \af0 \ltrch\fcs0 \fbias0 \fi-360\li360\lin360 } +{\listname ;} +\listid94861222} +} +{\*\listoverridetable +{\listoverride\listid94861222\listoverridecount2 +{\lfolevel\listoverridestartat\levelstartat1} +{\lfolevel\listoverridestartat\levelstartat3} +\ls1} +} +\pard\plain \ltrpar\s16\ql \fi-360\li360\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls1\ilvl1\adjustright\rin0\lin360\itap0\pararsid16599941 \rtlch\fcs1 \ab\af0\afs24\alang1025 \ltrch\fcs0 +\b\fs28\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 +{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang2057\langfe3082\langnp2057\insrsid16599941 This should be 1.3} +{\rtlch\fcs1 \af0\afs20 \ltrch\fcs0 +\fs20\lang2057\langfe3082\langnp2057\insrsid14181417\charrsid16599941 +\par } +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 12fbfd1269a0..c4118c6ddf2e 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -836,6 +836,13 @@ DECLARE_RTFEXPORT_TEST(testTableRtl, "table-rtl.rtf") CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getProperty<sal_Int16>(xTable, "WritingMode")); } +DECLARE_RTFEXPORT_TEST(testNumOverrideStart, "num-override-start.rtf") +{ + // The numbering on the second level was "3.1", not "1.3". + uno::Reference<container::XIndexAccess> xRules = getProperty< uno::Reference<container::XIndexAccess> >(getStyles("NumberingStyles")->getByName("WWNum1"), "NumberingRules"); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1), comphelper::SequenceAsHashMap(xRules->getByIndex(0))["StartWith"].get<sal_Int16>()); + CPPUNIT_ASSERT_EQUAL(sal_Int16(3), comphelper::SequenceAsHashMap(xRules->getByIndex(1))["StartWith"].get<sal_Int16>()); +} CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |