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>
(cherry picked from commit d828429f81e63d3c6beb4574fe3c52b001ea0a5b)
Reviewed-on: https://gerrit.libreoffice.org/79053
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf121663.docx b/sw/qa/extras/ooxmlexport/data/tdf121663.docx
new file mode 100644
index 0000000..dd26141
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf121663.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 27dd95d..cb06ef8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -435,6 +435,13 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence<OUString> >(xPropertySet, "StringItemList").getLength());
}
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121663, "tdf121663.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
// auto distance of line numbering is 0.5 cm
assertXPath(pXmlDoc, "//w:lnNumType", "distance", "283");
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index a6ad783..ffcc6f4 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1952,8 +1952,15 @@
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 7936315..e5bd1ef 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -348,7 +348,7 @@
sal_Int32 nInterval;
bool bRestartAtEachPage;
LineNumberSettings() :
nDistance(0)
nDistance(-1)
,nInterval(0)
,bRestartAtEachPage(true)
{}
