diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-12 16:15:28 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-12 16:46:26 +0200 |
| commit | 2df53ef5002270bfe788e383e95002f636a242d9 (patch) | |
| tree | b7b73e49593e563d58026e1ef69dfdd98efd40be /sw/qa/extras | |
| parent | 30e0e6ff95417295874e23376f83fc5ff26bf3d7 (diff) | |
fdo#74599 RTF import: enable StylesNoDefault compat setting
The Writer 'Heading 3' paragraph style is gray by default, but (just
like in case of DOCX) that shouldn't have any influence on the RTF
import result.
Fix this by moving the compat setting from the DOCX filter
implementation to the common dmapper.
Change-Id: I86c7cf1a66f82b438ce8379467773a88c9e229af
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/rtfimport/data/fdo74599.rtf | 8 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo74599.rtf b/sw/qa/extras/rtfimport/data/fdo74599.rtf new file mode 100644 index 000000000000..b47728fdd8c6 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo74599.rtf @@ -0,0 +1,8 @@ +{\rtf1 +{\stylesheet +{\s3 heading 3;} +} +\pard\plain \s3 +This is gray +\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index d06d8fdf3b81..67f86bdeca93 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1641,6 +1641,13 @@ DECLARE_RTFIMPORT_TEST(testFdo74823, "fdo74823.rtf") CPPUNIT_ASSERT_EQUAL(sal_Int16(5391), getProperty< uno::Sequence<text::TableColumnSeparator> >(xTableRows->getByIndex(1), "TableColumnSeparators")[2].Position); } +DECLARE_RTFIMPORT_TEST(testFdo74599, "fdo74599.rtf") +{ + uno::Reference<beans::XPropertySet> xPropertySet(getStyles("ParagraphStyles")->getByName("Heading 3"), uno::UNO_QUERY); + // Writer default styles weren't disabled, so the color was gray, not default (black). + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-1), getProperty<sal_Int32>(xPropertySet, "CharColor")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |