From fdf6777e02f4897bdb798457d3e6b8fbd343f8ab Mon Sep 17 00:00:00 2001
From: Balazs Varga <balazs.varga@collabora.com>
Date: Tue, 30 Sep 2025 19:05:23 +0200
Subject: [PATCH] tdf#168589 - sc fix xls import with subtotal function

Check if the trimmed data range of Subtotal double references
is valid otherwise do not trim.

regression after: b89047a0f0100fb30121084cf42815aa792c1f88
(tdf#164843 - sc optimize "SubTotal" function's reference ranges)

Change-Id: I5f1fa4f67a685deb4a391e19e3acd9849b03c1b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191691
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga@collabora.com>
---
 sc/qa/unit/data/xls/tdf168589.xls       | Bin 0 -> 5632 bytes
 sc/qa/unit/subsequent_filters_test5.cxx |   9 +++++++++
 sc/source/core/tool/compiler.cxx        |  14 +++++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 sc/qa/unit/data/xls/tdf168589.xls

diff --git a/sc/qa/unit/data/xls/tdf168589.xls b/sc/qa/unit/data/xls/tdf168589.xls
new file mode 100644
index 0000000000000000000000000000000000000000..103b35f64f6c21679ccc0361ff4fd5d90cf672b3
GIT binary patch
literal 5632
zcmeHLU1(fI6h3#eyS<yF*-e_%nrgh(W|KCl7>d{;HQS`E7OV|z#Ucf}*`G9a+k`ZN
zia*=hyjf8C;7dUYc@f1Q3i@Ed&4b{Bq9}b(6cXQxA{(hlp~?Dv=icq!-0qT%M5U6m
zIWu#=J2U6ZnKNh3%{N~+PG9_}bw)h&u++$WAtXT;ZlG-zpCckZw293Z3WXw!<_g_L
z7MOE%<sSO6i2*S8d=;2j$f<9mC9SBs1PdIH5&Xu*lHGC=^_aYX9j~6&!eiXxsu}5y
z7uED%tj~)4k_8sC72mt<&-l$aUIX@?f5v*A|5|VzxE{P3+yD-PaRo>txCy)l+zf63
zuLa)$UI)Gt+zMU~z6*RexD9*{n0nmn)NF4=yWM&2aO%>^R$Bjr1wtlvF&L0fSAWTn
zud#my9`T`nO8w$zU`J$>zR@4gB&>gn`c#LwLEp^5Nq3-S$OWJc@`0k4wcMfJhfXoE
zwxME1a?OaT?&q}Jpk)I}Lq5?lKPb`zzx)FI3$MPRhu}8}7&{UFh9xc;@w}Dgd)wx(
zmr35QkETwh#^RZ2JvWo`N5P`{4&^N3R7~+})#0>Ox&D=K&RVYj{}-QxO)W0Zp`x9;
zY&+z=_@)YYcLjWN1w3>Me%^;Om6ZbPNVZ1n#%xgQrmSD<HQ7~KH)jKdqw2d8@c$Pv
zkSF!vu~cfj=XIRTjrdI&CRpUqIYWMtrx~I12Xr~XJR>oWF#Ui&<>swYmuCe347t52
zrwv4WGlvr-W=z^<8RHT2O~if^G2Q$VVgClAJMRn5hC3piJf(k_bV~u3g()$J;$@LA
zTfk^I#LI!?<BeiRp2&j8Q;#{5(41$rQRk0fx*PAze!FjQp!XTYvy|yjJ8g*NoW`3e
z|7IQ0rR5pz+l+ID9?|~j&K78drA7M(;zKDbI`EoyJF8_BQ*Kqd+S}o3ccPtE%J*(^
zwJ*vB%$0<a{GE|*quVHsFV==UiMdUASuG*P**adCAYTJj(hJeA>9*;M0AahG`-0_!
zg;+o_2ykJ+G8mVLw0%K8vkVq0gK>L7I@WUJ@=Et&bPzAbE8mMT1@L0dt}l?m6v5k%
zDT5bN$MxvPl)~Gu)wMRRV-9{uo7y%HN>r`s?0~F`=?q9<+CtJE#6{rG`Ez}~!^SIc
zP1-oD7a^Z$-LR%We4<^$ngCG(EgDwi@rgRvPru3lTE6^a5CaF!(_wY_*!Zy2<R8Fu
zSp4};#Y1^#7w}XfpVaC&Ov>GrM|@54v3`xmN}Z5SVLmzv1q8TA{}9gUQ0a)k2@NI=
z9K>ViAp==h4RCgem^{(AZ?%*?%-Qx0C&orjjikq|-Ondd8EgAPTMoqsQ<+RkEz~!h
zPTSY6J!Z)z%wh{&@<@BYJQik@nS$n?o_PEB>-&#I-hI=Qu8vFJ)9f#SX+^%L;>>Sj
zV4CJ}F!S8QV1}<GnECD~m`YxqvvXIr9|Xt1vi*q}RxuV1#Zdor>ATBEdwygbmC-#D
zpC{2q^A@V4KV|r?e0Al*{p%y=--7<#*Wcd-Ea1V80OKLy<Yc-M$5PiyI9}hR<^29r
z`5qs-Dah5}-BI+#r||VTCdXw^zeA6^dR5nK!fLr*o`9m8S2J=}vt8P(ACgaCkM~1|
zXR8^ypbzD9J(Nva@Up^#1$?jb&VbyEq$>1W9Il0YTe4j)K0<JL+23mH8<2zY9M*pV
zSuel+_u{_*Y26bd<H&|bfK;YVM?OPTwd=nRecyAY49G4>NT?1e{SU;_^x5_|)*prJ
SaYz1gR7<tL`}_O9mj4%35fx_u

literal 0
HcmV?d00001

diff --git a/sc/qa/unit/subsequent_filters_test5.cxx b/sc/qa/unit/subsequent_filters_test5.cxx
index 5c9d74205171..7bcb4e9bc32a 100644
--- a/sc/qa/unit/subsequent_filters_test5.cxx
+++ b/sc/qa/unit/subsequent_filters_test5.cxx
@@ -276,6 +276,15 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest5, testTdf161948_NaturalSortSaveLoad)
     CPPUNIT_ASSERT(!aSortParam.bNaturalSort);
 }
 
+CPPUNIT_TEST_FIXTURE(ScFiltersTest5, testTdf168589)
+{
+    // Open xls document with Subtotal function
+    createScDoc("xls/tdf168589.xls");
+    ScDocument* pDoc = getScDoc();
+    CPPUNIT_ASSERT(pDoc);
+    ASSERT_DOUBLES_EQUAL(6.0, pDoc->GetValue(4, 5, 0));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index cbf61eb55d5c..e3b9fadf79f5 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -6879,17 +6879,21 @@ void ScCompiler::AnnotateTrimOnDoubleRefs()
             if (pTok->GetType() == svDoubleRef)
             {
                 ScComplexRefData* pRefData = pTok->GetDoubleRef();
-                // no need to set pRefData->SetTrimToData(true); because we already trim here
+                // do no set pRefData->SetTrimToData(true); because we need to trim here if possible
                 ScRange rRange = pRefData->toAbs(rDoc, aPos);
                 SCCOL nTempStartCol = rRange.aStart.Col();
                 SCROW nTempStartRow = rRange.aStart.Row();
                 SCCOL nTempEndCol = rRange.aEnd.Col();
                 SCROW nTempEndRow = rRange.aEnd.Row();
                 rDoc.ShrinkToDataArea(rRange.aStart.Tab(), nTempStartCol, nTempStartRow, nTempEndCol, nTempEndRow);
-                rRange.aStart.Set(nTempStartCol, nTempStartRow, rRange.aStart.Tab());
-                rRange.aEnd.Set(nTempEndCol, nTempEndRow, rRange.aEnd.Tab());
-                rRange.PutInOrder();
-                pRefData->SetRange(rDoc.GetSheetLimits(), rRange, aPos);
+                // check if range is still valid
+                if (nTempStartRow <= nTempEndRow && nTempStartCol <= nTempEndCol)
+                {
+                    rRange.aStart.Set(nTempStartCol, nTempStartRow, rRange.aStart.Tab());
+                    rRange.aEnd.Set(nTempEndCol, nTempEndRow, rRange.aEnd.Tab());
+                    if (rRange.IsValid())
+                        pRefData->SetRange(rDoc.GetSheetLimits(), rRange, aPos);
+                }
             }
             --ppTok;
         }