diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-20 11:29:29 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-02 15:58:47 +0100 |
| commit | d54dc89a531be105dff87700801bb9737623d04e (patch) | |
| tree | f0db4a6f86046a489a8be40bef5975381a1d9321 /writerfilter/source | |
| parent | 11cb4c4521a43d482e16389622720995f8d1d73b (diff) | |
n#793401, fdo#53175: Don't load the default values of the styles in writerfilter
...or we may have some additional properties set on some styles.
(cherry picked from commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a)
Conflicts:
sw/inc/IDocumentSettingAccess.hxx
sw/inc/doc.hxx
sw/source/core/doc/doc.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I5a5d307931a2a6c1f25bd2da93381d8de65c2480
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index 1789b20ef51f..47e663fe4d27 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -200,6 +200,8 @@ void WriterFilter::setTargetDocument( const uno::Reference< lang::XComponent >& xSettings->setPropertyValue(rtl::OUString::createFromAscii("FloattableNomargins"), uno::makeAny( sal_True )); xSettings->setPropertyValue( rtl::OUString::createFromAscii("BackgroundParaOverDrawings"), uno::makeAny( sal_True ) ); xSettings->setPropertyValue( rtl::OUString::createFromAscii( "ClippedPictures" ), uno::makeAny( sal_True ) ); + // Don't load the default style definitions to avoid weird mix + xSettings->setPropertyValue( "StylesNoDefault", uno::makeAny( sal_True ) ); } void WriterFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc ) |