diff options
author | László Németh <nemeth@numbertext.org> | 2019-07-09 21:36:29 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-07-10 10:31:01 +0200 |
commit | d828429f81e63d3c6beb4574fe3c52b001ea0a5b (patch) | |
tree | 78c5e37992c845b251c4712fc785aa551f2eabd8 /writerfilter/source | |
parent | 2388ffc6d7f10bf0413bd2350e808a3337a99ff2 (diff) |
tdf#121663 DOCX import: fix missing space in line numbering
Auto distance of line numbering is 0.5 cm, not zero.
Change-Id: Ic451424bffb3eb3fe386bcaef5a476a5679faff2
Reviewed-on: https://gerrit.libreoffice.org/75317
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 9 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 1b24e0624dc8..972ee68eeb15 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1949,8 +1949,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext ) xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_IS_ON ), uno::makeAny(true) ); if( aSettings.nInterval ) xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_INTERVAL ), uno::makeAny(static_cast<sal_Int16>(aSettings.nInterval)) ); - if( aSettings.nDistance ) + if( aSettings.nDistance != -1 ) xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) ); + else + { + // set Auto value (0.5 cm) + xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_DISTANCE ), uno::makeAny(static_cast<sal_Int32>(500)) ); + if( pSectionContext ) + pSectionContext->SetdxaLnn( static_cast<sal_Int32>(283) ); + } xLineNumberingPropSet->setPropertyValue(getPropertyName( PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) ); } catch( const uno::Exception& ) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 09b35a360008..1c4c4f3038a3 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -348,7 +348,7 @@ struct LineNumberSettings sal_Int32 nInterval; bool bRestartAtEachPage; LineNumberSettings() : - nDistance(0) + nDistance(-1) ,nInterval(0) ,bRestartAtEachPage(true) {} |