[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa writerfilter/source

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf78352.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |    9 +++++++++
 writerfilter/source/dmapper/DomainMapper.cxx |    2 ++
 3 files changed, 11 insertions(+)

New commits:
commit fd6a96606d13a18e65af518668e4432af9e54c1a
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Wed May 20 11:48:47 2020 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu May 28 14:13:50 2020 +0200

    tdf#78352: docx import: allow tab at left indent for list
    
    Looks like first tab stop for list bullets is at left paragraph
    boundry. Luckely there is a compatibility option for this.
    
    Change-Id: Iea4bd2b51912746dbd4722ff61eeb2e9293cab31
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94559
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94971

diff --git a/sw/qa/extras/ooxmlexport/data/tdf78352.docx b/sw/qa/extras/ooxmlexport/data/tdf78352.docx
new file mode 100644
index 000000000000..6f85f2e2ab6a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf78352.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index c59bc16709df..f410c889375d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -139,6 +139,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130610, "tdf130610_bold_in_2_styles.ott")
     }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf78352, "tdf78352.docx")
+{
+    CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+    // Ensure that width of first tab is close to zero (previous value was ~1000 twips)
+    int nWidth = parseDump("/root/page/body/txt[1]/Text[@nType='PortionType::TabLeft']", "nWidth").toInt32();
+    CPPUNIT_ASSERT_LESS(150, nWidth);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
 {
     // tdf#120315 cells of the second column weren't vertically merged
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 938cc59be726..fa18bd9326d0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -126,6 +126,8 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
     // Don't load the default style definitions to avoid weird mix
     m_pImpl->SetDocumentSettingsProperty("StylesNoDefault", uno::makeAny(true));
 
+    m_pImpl->SetDocumentSettingsProperty("TabAtLeftIndentForParagraphsInList", uno::makeAny(true));
+
     // Initialize RDF metadata, to be able to add statements during the import.
     try
     {