diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-29 14:31:32 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-29 14:48:47 +0100 |
| commit | 47d444083785df4e042cc6d2056285f1fbd51135 (patch) | |
| tree | f78fcd686ac6ef9b8c8b0bf0ab5c9cc9aa487b9c | |
| parent | 6333b2b92873a47d95cef49d7289cf301de84ef1 (diff) | |
DOCX: w:doNotUseHTMLParagraphAutoSpacing should affect AddParaTableSpacing
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled
AddParaTableSpacing doc setting, which broke the layout of some
documents, e.g. n#778836. Fix this by doing what the WW8 importer does:
enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing
tag is present.
(cherry picked from commit 68338abfd657ad5511a8a77b431ace8ad465c35e)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/filter/ImportFilter.cxx | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 00f69d9369ac..4cc997bb7890 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3637,11 +3637,12 @@ void DomainMapper_Impl::ApplySettingsTable() xViewDataSupplier->setViewData(xIndexAccess); } + uno::Reference< beans::XPropertySet > xSettings(m_xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY); if (m_pSettingsTable->GetUsePrinterMetrics()) { - uno::Reference< beans::XPropertySet > xSettings(m_xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY); xSettings->setPropertyValue("PrinterIndependentLayout", uno::makeAny(document::PrinterIndependentLayout::DISABLED)); } + xSettings->setPropertyValue("AddParaTableSpacing", uno::makeAny(m_pSettingsTable->GetDoNotUseHTMLParagraphAutoSpacing())); } catch(const uno::Exception& ) { diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index abad2b211a3a..1789b20ef51f 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -199,7 +199,6 @@ void WriterFilter::setTargetDocument( const uno::Reference< lang::XComponent >& xSettings->setPropertyValue( rtl::OUString::createFromAscii( "UnbreakableNumberings" ), uno::makeAny( sal_True ) ); 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("AddParaTableSpacing"), uno::makeAny( sal_True ) ); xSettings->setPropertyValue( rtl::OUString::createFromAscii( "ClippedPictures" ), uno::makeAny( sal_True ) ); } |