[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sc/source sw/qa writerfilter/source

[Eike Rathke (via logerrit)]

 sc/source/core/tool/scmatrix.cxx                 |    2 +-
 sw/qa/extras/ooxmlexport/data/tdf83309.docx      |binary
 writerfilter/source/dmapper/NumberingManager.cxx |    2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 33f30a4d27369aa13e84451bff78831ae59286b4
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Wed Jul 8 18:36:59 2020 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Jul 11 12:09:23 2020 +0200

    Resolves: tdf#124454 exec the matrix operator on values converted from strings
    
    Effectively a fallout from the matrix operations rework started
    for tdf#89387 that did not convert strings at all and subsequent
    work converted the string according to settings but did not apply
    the current operator on the result.
    
    Change-Id: I90c8963021396fd9a46b063f6aee96283f89271a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98385
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 7ead920f7015bb8e7a4343b863333bb26187d9a3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98339
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98518
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 34ee65302349..4c81a803b110 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3355,7 +3355,7 @@ public:
 
     double operator()(const svl::SharedString& rStr) const
     {
-        return convertStringToValue( mpErrorInterpreter, rStr.getString());
+        return maOp( convertStringToValue( mpErrorInterpreter, rStr.getString()), mfVal);
     }
 
     TEmptyRes operator()(char) const
commit b2c9f530b9526366eba332d669d3334568c18f38
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Thu Jun 25 11:42:02 2020 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Jul 11 12:09:11 2020 +0200

    tdf#134260: docx import: allow default value for list tab position
    
    It looks like previously used as a testcase document is just
    a specific case with default values. All other readers (incl.
    Office 365) displaying that doc with default tab at zero position.
    
    Change-Id: I50fe00c7f87b6d790fbe6e2f32a306ac59060c72
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97089
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 7221994b9b29659d3290e95eee92b1a3f80c2b7e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98331
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 54b6a6a5c95ed51ce0cd709d9fd3e477ced5ce8f)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98332
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98517
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx b/sw/qa/extras/ooxmlexport/data/tdf83309.docx
index 8dfddb6ed201..e8f59bc81969 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf83309.docx and b/sw/qa/extras/ooxmlexport/data/tdf83309.docx differ
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 7cdc061c0a4b..2e37653f9427 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -231,6 +231,8 @@ uno::Sequence<beans::PropertyValue> ListLevel::GetLevelProperties(bool bDefaults
 
     if (m_nTabstop.has_value())
         aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, *m_nTabstop));
+    else if (bDefaults)
+        aNumberingProperties.push_back(lcl_makePropVal<sal_Int16>(PROP_LISTTAB_STOP_POSITION, 0));
 
     //TODO: handling of nFLegal?
     //TODO: nFNoRestart lower levels do not restart when higher levels are incremented, like: