diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-28 11:24:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-09-03 16:38:15 +0200 |
| commit | e72abb9c52570beb560d0fe3589e39a8ddb971b5 (patch) | |
| tree | d76a1efa7e6ba1d5a5354b61ef821da8c03d9d05 /writerfilter | |
| parent | e372338807be890f02ae5d7eb56c795df3516c71 (diff) | |
bnc#816593 DOCX import: fix auto para spacing without compat option
Paragraph auto spacing (before and after) without the
w:doNotUseHTMLParagraphAutoSpacing compat option was incorrect.
(cherry picked from commit 279ff2e03371542d014bf281e73282ba8080cf6b)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I56d6153f7c489de7fceaf6fab7325c42ee8f9cae
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 63f112493363..320cdf224da2 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1157,17 +1157,16 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) uno::makeAny( aLocale ) ); } break; -// This is the value when the compat option is not enabled. No idea where it comes from, the spec doesn't mention it. -#define AUTO_PARA_SPACING sal_Int32(49) + // See SwWW8ImplReader::GetParagraphAutoSpace() on why these are 100 and 280 case NS_ooxml::LN_CT_Spacing_beforeAutospacing: if (!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing()) - 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(280) ) ); else m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); break; case NS_ooxml::LN_CT_Spacing_afterAutospacing: if (!m_pImpl->GetSettingsTable()->GetDoNotUseHTMLParagraphAutoSpacing()) - 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(280) ) ); else m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, false, uno::makeAny( ConversionHelper::convertTwipToMM100(100) ) ); break; |