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

4 files changed, 18 insertions, 3 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: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d4e3ab82d3c0..23152e68747d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -110,6 +110,9 @@ LoggedStream(dmapper_logger, "DomainMapper"),
         PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_SURROUND_TEXT_WRAP_SMALL ),
         uno::makeAny( true ) );
 
+    // Don't load the default style definitions to avoid weird mix
+    m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::makeAny(true));
+
     //import document properties
     try
     {
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index d75e56b6c75b..277f2da2fcca 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -221,9 +221,6 @@ void WriterFilter::setTargetDocument( const uno::Reference< lang::XComponent >&
    xSettings->setPropertyValue( "TabOverflow", uno::makeAny( sal_True ) );
    xSettings->setPropertyValue( "UnbreakableNumberings", uno::makeAny( sal_True ) );
 
-   // Don't load the default style definitions to avoid weird mix
-   xSettings->setPropertyValue( "StylesNoDefault", uno::makeAny( sal_True ) );
-
    xSettings->setPropertyValue("FloattableNomargins", uno::makeAny( sal_True ));
    xSettings->setPropertyValue( "ClippedPictures", uno::makeAny( sal_True ) );
    xSettings->setPropertyValue( "BackgroundParaOverDrawings", uno::makeAny( sal_True ) );