[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    1 +
 writerfilter/source/filter/ImportFilter.cxx       |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68338abfd657ad5511a8a77b431ace8ad465c35e
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.
    
    Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c371723..edf66f5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3667,6 +3667,7 @@ void DomainMapper_Impl::ApplySettingsTable()
                 xSettings->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_EMBED_FONTS ), uno::makeAny(true) );
             if( m_pSettingsTable->GetEmbedSystemFonts())
                 xSettings->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_EMBED_SYSTEM_FONTS ), uno::makeAny(true) );
+            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 8d9b244..e482d5b 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -192,7 +192,6 @@ void WriterFilter::setTargetDocument( const uno::Reference< lang::XComponent >&
    xSettings->setPropertyValue("FloattableNomargins", uno::makeAny( sal_True ));
    xSettings->setPropertyValue( "ClippedPictures", uno::makeAny( sal_True ) );
    xSettings->setPropertyValue( "BackgroundParaOverDrawings", uno::makeAny( sal_True ) );
-   xSettings->setPropertyValue( "AddParaTableSpacing", uno::makeAny( sal_True ) );
 }
 
 void WriterFilter::setSourceDocument( const uno::Reference< lang::XComponent >& xDoc )