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 /writerfilter | |
| 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 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 3 |
2 files changed, 3 insertions, 3 deletions
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 ) ); |