diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-03 08:49:43 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-03 11:56:29 +0100 |
| commit | a9e029ace41562e28e9242d63230ad1ca275f5d3 (patch) | |
| tree | 605fee980e467c8a5896bdf5053fd7422865091a /sw | |
| parent | c9c5c94771f22919ec82351b3b9b3096af96a508 (diff) | |
tdf#104744 RTF import: fix unexpected zero para left margin wrt style dedup
See commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305:
writerfilter RTF import: override style properties like Word,
2014-06-17) for the details on style override in RTF.
Here the problem was that we added an unneeded "reset to 0" property, the
opposite situation that commit 657c6cc3acec0528209a8584b838cd6de581c437
(tdf#104228 RTF import: fix override of style left/right para margin,
2016-12-13) was fixing (there a "reset to 0" was missing).
Change-Id: I37f079b9cb4773214d2531c2e34920b3b8927211
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfimport/data/tdf104744.rtf | 24 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 7 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf104744.rtf b/sw/qa/extras/rtfimport/data/tdf104744.rtf new file mode 100644 index 000000000000..ef329982bf3b --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf104744.rtf @@ -0,0 +1,24 @@ +{\rtf1 +{\fonttbl +{\f3\fcharset2 Symbol;} +} +{\stylesheet +{\s15\li720 List Paragraph;} +} +{\*\listtable +{\list\listtemplateid1145476866\listhybrid +{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelspace360\levelindent0 +{\leveltext\leveltemplateid67698689\'01\u-3913 ?;} +{\levelnumbers;} +\f3\li720 } +\listid1805847239} +} +{\*\listoverridetable +{\listoverride\listid1805847239\listoverridecount0\ls1} +} +{\pard\plain \ltrpar\s15\li720\ls1 bullet +\par +} +{\pard\plain after} +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 2f554e1595fc..c860f3dcebcf 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2721,6 +2721,13 @@ DECLARE_RTFIMPORT_TEST(testTdf104317, "tdf104317.rtf") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xDrawPage->getCount()); } +DECLARE_RTFIMPORT_TEST(testTdf104744, "tdf104744.rtf") +{ + // This was 0, as an unexpected "left margin is 0" token was created during + // import. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1270), getProperty<sal_Int32>(getParagraph(1), "ParaLeftMargin")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |