summaryrefslogtreecommitdiffstats
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-09-14 14:54:42 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-09-28 15:33:26 +0200
commit47eadacc10999bc60c731dcf4b80a62c4354afcb (patch)
tree8da6c7a8af97ee0ca848a6d67db829589c8d8deb /writerfilter
parentn#778140 enable AddParaTableSpacing for docx, as it's enabled for ww8 as well (diff)
downloadcore-47eadacc10999bc60c731dcf4b80a62c4354afcb.tar.gz
core-47eadacc10999bc60c731dcf4b80a62c4354afcb.zip
n#778140 as the comment says, it's 100 twips
Change-Id: If2e0d2f4805cd04bec0dd7983ec544b9922ef796 (cherry picked from commit 61c94cbe2cbbbcaa1e44edecc4add60eb6d7937d)
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 669aed65c973..33640ec4b9de 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1220,15 +1220,15 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
uno::makeAny( aLocale ) );
}
break;
-#define AUTO_PARA_SPACING sal_Int32(49)
+#define AUTO_PARA_SPACING sal_Int32(100)
case NS_ooxml::LN_CT_Spacing_beforeAutospacing:
//TODO: autospacing depends on some document property (called fDontUseHTMLAutoSpacing in old ww8 filter) 100 or 280 twip
//and should be set to 0 on start of page
- 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(AUTO_PARA_SPACING) ) );
break;
case NS_ooxml::LN_CT_Spacing_afterAutospacing:
//TODO: autospacing depends on some document property (called fDontUseHTMLAutoSpacing in old ww8 filter) 100 or 280 twip
- 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(AUTO_PARA_SPACING) ) );
break;
case NS_ooxml::LN_CT_SmartTagRun_uri:
case NS_ooxml::LN_CT_SmartTagRun_element: