diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-27 09:37:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-27 09:46:06 +0200 |
| commit | 526e007bb6340e2c4a2cb96f5612ba268fcd5583 (patch) | |
| tree | e1462da5e706b78332b22c1e3fe33a37e917e753 | |
| parent | 6d64bfd8c0086a9d3e8a05ecf49b1af84ec58436 (diff) | |
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
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 5214b499f0e0..1cefa3937875 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 9bcccf3a6ced..52d8c1ac504c 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: |