[Libreoffice-commits] .: 2 commits - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper.cxx |   10 +++-------
 writerfilter/source/filter/ImportFilter.cxx  |    1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 61c94cbe2cbbbcaa1e44edecc4add60eb6d7937d
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Sep 14 14:54:42 2012 +0200

    n#778140 as the comment says, it's 100 twips
    
    Change-Id: If2e0d2f4805cd04bec0dd7983ec544b9922ef796

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index ba6e659..dc04276 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1154,15 +1154,15 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                              uno::makeAny( aLocale ) );
         }
         break;
-#define AUTO_PARA_SPACING sal_Int32(49)
+#define AUTO_PARA_SPACING sal_Int32(100)
         case NS_ooxml::LN_CT_Spacing_beforeAutospacing:
             //TODO: autospacing depends on some document property (called fDontUseHTMLAutoSpacing in old ww8 filter) 100 or 280 twip
             //and should be set to 0 on start of page
-            m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) );
+            m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(AUTO_PARA_SPACING) ) );
         break;
         case NS_ooxml::LN_CT_Spacing_afterAutospacing:
             //TODO: autospacing depends on some document property (called fDontUseHTMLAutoSpacing in old ww8 filter) 100 or 280 twip
-            m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) );
+            m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(AUTO_PARA_SPACING) ) );
         break;
         case NS_ooxml::LN_CT_SmartTagRun_uri:
         case NS_ooxml::LN_CT_SmartTagRun_element:
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Sep 14 13:03:51 2012 +0200

    n#778140 enable AddParaTableSpacing for docx, as it's enabled for ww8 as well
    
    Change-Id: I7523be9f07d378e1c4d88468077653d3fa4161d3

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 8f9476a..ba6e659 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -100,10 +100,6 @@ LoggedStream(dmapper_logger, "DomainMapper"),
         PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_TABS_RELATIVE_TO_INDENT ),
         uno::makeAny( false ) );
 
-    m_pImpl->SetDocumentSettingsProperty(
-        PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_ADD_PARA_TABLE_SPACING ),
-        uno::makeAny( false ) );
-
     //import document properties
 
     try
diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx
index 5d7da99..4aaab65 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -180,6 +180,7 @@ 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 )