summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-04-11 09:53:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-04-11 09:59:46 +0200
commit518bdcce5c397ac2e79b1964b1300d3ea9b9a0e4 (patch)
treeaf9248e35cc425a8feb418e80dbe11e763c020e3 /writerfilter
parent05c5da4c376d676ff89cd40dd0dea9eeb4bc1e75 (diff)
writerfilter: clean up duplicated PROP_PARA_*_MARGIN_*_AUTO_SPACING insertions
Change-Id: If3f7a54a48541935295515bae47233e53c228fe5
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index b9df3b34a840..d4e3ab82d3c0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -562,13 +562,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
if (nIntValue) // If auto spacing is set, then only store set value in InteropGrabBag
{
m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
- m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG );
}
else
{
default_spacing = -1;
- m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG );
}
+ m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG );
}
break;
case NS_ooxml::LN_CT_Spacing_afterAutospacing:
@@ -585,13 +584,12 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
if (nIntValue) // If auto spacing is set, then only store set value in InteropGrabBag
{
m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
- m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG );
}
else
{
default_spacing = -1;
- m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG );
}
+ m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG );
}
break;
case NS_ooxml::LN_CT_SmartTagRun_uri: