sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 +- writerfilter/source/dmapper/DomainMapper.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 526e007bb6340e2c4a2cb96f5612ba268fcd5583 Author: Miklos Vajna <[email protected]> Date: Thu Sep 27 09:37:36 2012 +0200 n#781825 fix DOCX import of bottom para margin autospacing If w:doNotUseHTMLParagraphAutoSpacing is enabled, it should be 100, not 200, see SwWW8ImplReader::GetParagraphAutoSpace(). Change-Id: I29c5e97c828f0f55b655410198bfa03dc42a196d diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 5214b49..1cefa39 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -841,7 +841,7 @@ void Test::testN778140() load("n778140.docx"); CPPUNIT_ASSERT_EQUAL(sal_Int32(176), getProperty<sal_Int32>(getParagraph(0), "ParaTopMargin")); - CPPUNIT_ASSERT_EQUAL(sal_Int32(353), getProperty<sal_Int32>(getParagraph(0), "ParaBottomMargin")); + CPPUNIT_ASSERT_EQUAL(sal_Int32(176), getProperty<sal_Int32>(getParagraph(0), "ParaBottomMargin")); } void Test::testN778828() diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 9bcccf3..52d8c1a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1166,7 +1166,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) if (!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing()) m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( AUTO_PARA_SPACING ) ); else - m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(200) ) ); + m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); break; case NS_ooxml::LN_CT_SmartTagRun_uri: case NS_ooxml::LN_CT_SmartTagRun_element: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
