[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    3 ++-
 writerfilter/source/filter/ImportFilter.cxx       |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47d444083785df4e042cc6d2056285f1fbd51135
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Oct 29 14:31:32 2012 +0100

    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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 00f69d9..4cc997b 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 abad2b2..1789b20 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 ) );
 }