[Libreoffice-commits] core.git: sw/qa writerfilter/source

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf121663.docx      |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx        |    7 +++++++
 writerfilter/source/dmapper/DomainMapper.cxx      |    9 ++++++++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |    2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit d828429f81e63d3c6beb4574fe3c52b001ea0a5b
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Tue Jul 9 21:36:29 2019 +0200
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Wed Jul 10 10:31:01 2019 +0200

    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 at numbertext.org>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf121663.docx b/sw/qa/extras/ooxmlexport/data/tdf121663.docx
new file mode 100644
index 000000000000..dd2614169a8b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf121663.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index d09a367f2536..b34a20b7990c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -449,6 +449,13 @@ DECLARE_OOXMLEXPORT_TEST(testImageCommentAtChar, "image-comment-at-char.docx")
                          getProperty<OUString>(getRun(xPara, 5), "TextPortionType"));
 }
 
+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 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)
     {}