sc/qa/unit/data/ods/tdf158921.ods      |binary
 sc/qa/unit/subsequent_export_test4.cxx |   21 +++++++++++++++++++++
 sc/qa/unit/ucalc_range.cxx             |    8 ++++++++
 3 files changed, 29 insertions(+)

New commits:
commit 51b07c37249ac709b6276138db177c64c16dc9f1
Author:     Xisco Fauli <[email protected]>
AuthorDate: Mon Nov 24 17:06:48 2025 +0100
Commit:     Xisco Fauli <[email protected]>
CommitDate: Tue Nov 25 09:54:55 2025 +0100

    tdf#158921: sc_subsequent_export_test4: Add test
    
    Change-Id: I95917fc556329db889271d4df6016040abb610d7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194463
    Code-Style: Xisco Fauli <[email protected]>
    Reviewed-by: guilhem <[email protected]>
    Reviewed-by: Xisco Fauli <[email protected]>
    Tested-by: Jenkins

diff --git a/sc/qa/unit/data/ods/tdf158921.ods 
b/sc/qa/unit/data/ods/tdf158921.ods
new file mode 100644
index 000000000000..a0fc3944455b
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf158921.ods differ
diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index f72bb6e6b4e8..cefbc483b8ca 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -284,6 +284,27 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf120502)
     assertXPath(pSheet1, "/x:worksheet/x:cols/x:col", "max", 
OUString::number(nMaxCol + 1));
 }
 
+CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf158921_exportPivotTable)
+{
+    createScDoc("ods/tdf158921.ods");
+
+    // Without the fix in place, this test would have failed with
+    // - Expected: 0
+    // - Actual  : 1
+    // - validation error in OOXML export: Errors: 1
+    saveAndReload(TestFilter::XLSX);
+
+    ScDocument* pDoc = getScDoc();
+
+    // There should be a pivot table
+    CPPUNIT_ASSERT(pDoc->HasPivotTable());
+
+    // DP collection is not lost after export and has one entry
+    ScDPCollection* pDPColl = pDoc->GetDPCollection();
+    CPPUNIT_ASSERT(pDPColl);
+    CPPUNIT_ASSERT_EQUAL(size_t(1), pDPColl->GetCount());
+}
+
 CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf131372)
 {
     createScDoc("ods/tdf131372.ods");
commit 758d8e2f700b56fae7f7dd86ccc469c893726017
Author:     Tomaž Vajngerl <[email protected]>
AuthorDate: Mon Nov 24 23:21:21 2025 +0900
Commit:     Tomaž Vajngerl <[email protected]>
CommitDate: Tue Nov 25 09:54:46 2025 +0100

    sc: add testExtendTo unit test for ScRange
    
    Change-Id: I328d22371e04476e00251324a19bd7fe84a96120
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194450
    Code-Style: Tomaž Vajngerl <[email protected]>
    Reviewed-by: Tomaž Vajngerl <[email protected]>
    Tested-by: Jenkins

diff --git a/sc/qa/unit/ucalc_range.cxx b/sc/qa/unit/ucalc_range.cxx
index 4c515e402698..e118a039f79e 100644
--- a/sc/qa/unit/ucalc_range.cxx
+++ b/sc/qa/unit/ucalc_range.cxx
@@ -41,6 +41,14 @@ CPPUNIT_TEST_FIXTURE(ScRangeTest, testOverlap)
     CPPUNIT_ASSERT(!aRange1.Intersects( aRange3 ));
 }
 
+CPPUNIT_TEST_FIXTURE(ScRangeTest, testExtendTo)
+{
+    ScRange aRange({2, 5, 1}, {9, 5, 1});
+    aRange.ExtendTo(ScRange({2, 7, 1}, {9, 7, 1}));
+    CPPUNIT_ASSERT_EQUAL(ScAddress(2, 5, 1), aRange.aStart);
+    CPPUNIT_ASSERT_EQUAL(ScAddress(9, 7, 1), aRange.aEnd);
+}
+
 CPPUNIT_TEST_FIXTURE(ScRangeTest, testRangeParsing)
 {
     ScRange aRange;

Reply via email to