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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/xlsx/tdf137091.xlsx    |binary
 sc/qa/unit/subsequent_filters-test.cxx |   26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

New commits:
commit 44b5084beb7380996b1eb9c7f946768834779b1c
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Tue Sep 29 11:29:39 2020 +0200
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sun Oct 18 23:51:13 2020 +0200

    tdf#137091: sc_subsequent_filters_test: Add unittest
    
    Change-Id: I435ffbdd82b5a40e56dd5f6ef55c032802184767
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103604
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 7672ac2e8764d9e4fcb5a896ef6210077907dcd0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103657
    (cherry picked from commit 91de839547719b7177518386f9b39bd9e4b1cf73)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104493
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/sc/qa/unit/data/xlsx/tdf137091.xlsx b/sc/qa/unit/data/xlsx/tdf137091.xlsx
new file mode 100644
index 000000000000..abcdf8f27f24
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf137091.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index e005b258d979..0d2f55dcd184 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -75,6 +75,8 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/text/textfield/Type.hpp>
 
+#include <comphelper/scopeguard.hxx>
+#include <unotools/syslocaleoptions.hxx>
 #include "helper/qahelper.hxx"
 #include "helper/shared_test_impl.hxx"
 
@@ -246,6 +248,7 @@ public:
     void testHiddenRowsColumnsXLSXML();
     void testColumnWidthRowHeightXLSXML();
     void testCharacterSetXLSXML();
+    void testTdf137091();
     void testTdf62268();
     void testVBAMacroFunctionODS();
     void testAutoheight2Rows();
@@ -388,6 +391,7 @@ public:
     CPPUNIT_TEST(testColumnWidthRowHeightXLSXML);
     CPPUNIT_TEST(testCharacterSetXLSXML);
     CPPUNIT_TEST(testCondFormatFormulaListenerXLSX);
+    CPPUNIT_TEST(testTdf137091);
     CPPUNIT_TEST(testTdf62268);
     CPPUNIT_TEST(testVBAMacroFunctionODS);
     CPPUNIT_TEST(testAutoheight2Rows);
@@ -4265,6 +4269,28 @@ void ScFiltersTest::testCondFormatFormulaListenerXLSX()
     xDocSh->DoClose();
 }
 
+void ScFiltersTest::testTdf137091()
+{
+    // Set the system locale to Turkish
+    SvtSysLocaleOptions aOptions;
+    OUString sLocaleConfigString = aOptions.GetLanguageTag().getBcp47();
+    aOptions.SetLocaleConfigString("tr-TR");
+    aOptions.Commit();
+    comphelper::ScopeGuard g([&aOptions, &sLocaleConfigString] {
+        aOptions.SetLocaleConfigString(sLocaleConfigString);
+        aOptions.Commit();
+    });
+
+    ScDocShellRef xDocSh = loadDoc("tdf137091.", FORMAT_XLSX);
+    ScDocument& rDoc = xDocSh->GetDocument();
+
+    // Without the fix in place, this test would have failed with
+    // - Expected: 28/4
+    // - Actual  : Err:507
+    CPPUNIT_ASSERT_EQUAL(OUString("28/4"), rDoc.GetString(ScAddress(2,1,0)));
+    xDocSh->DoClose();
+}
+
 void ScFiltersTest::testTdf62268()
 {
     ScDocShellRef xDocSh = loadDoc("tdf62268.", FORMAT_ODS);