diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-08-28 11:43:36 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-09-03 16:38:26 +0200 |
| commit | c1bf8f7dbaee8d5633f6bdf06e6a50ea597c821b (patch) | |
| tree | 61e2893de857c4fb69378524ae56ed21551bcf90 /writerfilter | |
| parent | e72abb9c52570beb560d0fe3589e39a8ddb971b5 (diff) | |
bnc#816593 DOCX import: let w:before not overwrite w:beforeAutospacing
And do the same for w:after / w:afterAutospacing. The spec says that if
w:beforeAutospacing is read, w:before should be ignored, this implies
that if we already had w:beforeAutospacing, w:before should not
overwrite the already existing top margin.
(cherry picked from commit de516780bf2d5f74afe643033bfc528c53013902)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I9437cb5c6fc352a360e27aa279d0a789706c5578
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 320cdf224da2..4d0d7217cb2a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -972,13 +972,15 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) break; case NS_ooxml::LN_CT_Spacing_before: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + // Don't overwrite NS_ooxml::LN_CT_Spacing_beforeAutospacing. + m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ), false); break; case NS_ooxml::LN_CT_Spacing_beforeLines: break; case NS_ooxml::LN_CT_Spacing_after: if (m_pImpl->GetTopContext()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) )); + // Don't overwrite NS_ooxml::LN_CT_Spacing_afterAutospacing. + m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, true, uno::makeAny( ConversionHelper::convertTwipToMM100( nIntValue ) ), false); break; case NS_ooxml::LN_CT_Spacing_afterLines: break; |