core.git: Branch 'distro/collabora/co-24.04' - sc/qa sc/source

[Gülşah Köse (via logerrit)]

 sc/qa/unit/data/xlsx/sortconditionref2.xlsx |binary
 sc/qa/unit/subsequent_export_test2.cxx      |   14 ++++++++++++++
 sc/source/filter/oox/autofilterbuffer.cxx   |    2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit e188f74dc6a37c5bd8ebc7faca4b877722327b2a
Author:     Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Fri Feb 7 16:05:16 2025 +0300
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Feb 11 08:56:03 2025 +0100

    Fix wrong detection of sortCondition reference
    
    Signed-off-by: Gülşah Köse <gulsah.k...@collabora.com>
    Change-Id: I877ede71f9487ba35efd7da6aeeee954560272cc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181248
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/sc/qa/unit/data/xlsx/sortconditionref2.xlsx 
b/sc/qa/unit/data/xlsx/sortconditionref2.xlsx
new file mode 100644
index 000000000000..748e894ac0a7
Binary files /dev/null and b/sc/qa/unit/data/xlsx/sortconditionref2.xlsx differ
diff --git a/sc/qa/unit/subsequent_export_test2.cxx 
b/sc/qa/unit/subsequent_export_test2.cxx
index b0d4b16b41a7..5a3c87e4548f 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -420,6 +420,20 @@ CPPUNIT_TEST_FIXTURE(ScExportTest2, testSortConditionRef)
                 "B3:B2");
 }
 
+CPPUNIT_TEST_FIXTURE(ScExportTest2, testSortConditionRef2)
+{
+    // Ascending sortCondition reference detected wrong without fix.
+    //- Expected: A11:A300
+    //- Actual  : J11:J300
+    //- In <>, attribute 'ref' of 
'//x:worksheet/x:autoFilter/x:sortState/x:sortCondition' incorrect value.
+    createScDoc("xlsx/sortconditionref2.xlsx");
+    save("Calc Office Open XML");
+    xmlDocUniquePtr pDoc = parseExport("xl/worksheets/sheet1.xml");
+
+    assertXPath(pDoc, 
"//x:worksheet/x:autoFilter/x:sortState/x:sortCondition"_ostr, "ref"_ostr,
+                "A11:A300");
+}
+
 CPPUNIT_TEST_FIXTURE(ScExportTest2, testDateAutofilterXLSX)
 {
     // XLSX Roundtripping autofilter with date list
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx 
b/sc/source/filter/oox/autofilterbuffer.cxx
index efe85ff4096c..95ffb0faaf68 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -846,7 +846,7 @@ void AutoFilter::finalizeImport( const Reference< 
XDatabaseRange >& rxDatabaseRa
     if (!aParam.bUserDef)
         return;
 
-    SCCOLROW nStartPos = aParam.bByRow ? maRange.aStart.Col() : 
maRange.aStart.Row();
+    SCCOLROW nStartPos = aParam.bByRow ? maRange.aStart.Row() : 
maRange.aStart.Col();
     // descending sort - need to enable 1st SortParam slot
     if (rSorConditionLoaded.mbDescending)
         assert(aParam.GetSortKeyCount() == DEFSORT);