From e348d752613dc30e33a48e26865ac195a4b4991b Mon Sep 17 00:00:00 2001
From: Vissarion Fisikopoulos <fisikop@gmail.com>
Date: Wed, 12 Nov 2025 15:42:27 +0200
Subject: [PATCH] tdf#62248 fix multiple groupings on same field issue in
 reportbuilder

In a reportbuilder report, when grouping on the same field multiple times
(with different interval/prefix characters setting), the two groupings interact
and in the end it does not work right; both grouping levels behave like one of
them.

That's because the report function created by Report Builder for each of the
groupings share the same name. Choose unique function name in
ORptExport::exportGroupsExpressionAsFunction and sync OXMLGroup::OXMLGroup to
parse that name. Keep supporting legacy names for backwards compatibility.

Change-Id: Ic91e51743a407225d50b14f85d02c58ca0a243c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193993
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>
---
 .../qa/unit/ReportDesignBasicTests.cxx        |  57 ++++++++++++++++++
 .../ReportBuilder_grouping_same_field.odb     | Bin 0 -> 16689 bytes
 reportdesign/source/filter/xml/xmlExport.cxx  |   4 +-
 reportdesign/source/filter/xml/xmlGroup.cxx   |  31 +++++++++-
 4 files changed, 88 insertions(+), 4 deletions(-)
 create mode 100644 reportdesign/qa/unit/data/ReportBuilder_grouping_same_field.odb

diff --git a/reportdesign/qa/unit/ReportDesignBasicTests.cxx b/reportdesign/qa/unit/ReportDesignBasicTests.cxx
index 03489b24501b..875aca028be9 100644
--- a/reportdesign/qa/unit/ReportDesignBasicTests.cxx
+++ b/reportdesign/qa/unit/ReportDesignBasicTests.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
 #include <comphelper/namedvaluecollection.hxx>
+#include <com/sun/star/text/XTextDocument.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -58,6 +59,62 @@ CPPUNIT_TEST_FIXTURE(RptBasicTest, roundTripTest)
     testLoadingAndSaving(u"calc8"_ustr, aReportNames[1], xComponentLoader, xActiveConnection);
 }
 
+CPPUNIT_TEST_FIXTURE(RptBasicTest, multiGroupingSameFieldIntervals)
+{
+    // ODB fixture must contain a table and a report that groups on the same field twice
+    // with different settings (e.g., INTERVAL 5 and INTERVAL 10). The report should be
+    // prepared to reproduce the original failure (Column not found: INT_count_...).
+    loadURLCopy(u"ReportBuilder_grouping_same_field.odb");
+
+    Reference<frame::XModel> xModel(mxComponent, UNO_QUERY_THROW);
+    Reference<frame::XController> xController(xModel->getCurrentController());
+    Reference<sdb::application::XDatabaseDocumentUI> xUI(xController, UNO_QUERY_THROW);
+
+    xUI->connect();
+    Reference<XConnection> xActiveConnection = xUI->getActiveConnection();
+
+    Reference<XReportDocumentsSupplier> xSupp(xModel, UNO_QUERY_THROW);
+    Reference<container::XNameAccess> xNameAccess = xSupp->getReportDocuments();
+    const Sequence<OUString> aReportNames(xNameAccess->getElementNames());
+    CPPUNIT_ASSERT(aReportNames.getLength() > 0);
+
+    Reference<frame::XComponentLoader> xComponentLoader(xNameAccess, UNO_QUERY_THROW);
+
+    // Execute all reports via writer export. This will fail the test if any report
+    // throws ReportExecutionException like "Column not found: INT_count_Number_*".
+    for (const OUString& rName : aReportNames)
+        testLoadingAndSaving(u"writer8"_ustr, rName, xComponentLoader, xActiveConnection);
+
+    // Additionally, load the textual outputs of all reports and compare their lengths.
+    // They should be identical.
+    if (aReportNames.getLength() >= 2)
+    {
+        ::comphelper::NamedValueCollection aLoadArgs;
+        aLoadArgs.put(u"ActiveConnection"_ustr, xActiveConnection);
+
+        Reference<lang::XComponent> xComp1 = xComponentLoader->loadComponentFromURL(
+            aReportNames[0], u"_blank"_ustr, 0, aLoadArgs.getPropertyValues());
+        Reference<lang::XComponent> xComp2 = xComponentLoader->loadComponentFromURL(
+            aReportNames[1], u"_blank"_ustr, 0, aLoadArgs.getPropertyValues());
+        Reference<text::XTextDocument> xTextDoc1(xComp1, UNO_QUERY);
+        Reference<text::XTextDocument> xTextDoc2(xComp2, UNO_QUERY);
+
+        if (xTextDoc1.is() && xTextDoc2.is())
+        {
+            sal_Int32 nLen1 = xTextDoc1->getText()->getString().getLength();
+            sal_Int32 nLen2 = xTextDoc2->getText()->getString().getLength();
+            CPPUNIT_ASSERT_EQUAL_MESSAGE("Report textual output length differs", nLen1, nLen2);
+        }
+
+        Reference<util::XCloseable> xClose1(xComp1, UNO_QUERY);
+        if (xClose1.is())
+            xClose1->close(true);
+        Reference<util::XCloseable> xClose2(xComp2, UNO_QUERY);
+        if (xClose2.is())
+            xClose2->close(true);
+    }
+}
+
 void RptBasicTest::testLoadingAndSaving(const OUString& rFilterName, const OUString& rReportName,
                                         Reference<frame::XComponentLoader>& xComponentLoader,
                                         Reference<XConnection>& xActiveConnection)
diff --git a/reportdesign/qa/unit/data/ReportBuilder_grouping_same_field.odb b/reportdesign/qa/unit/data/ReportBuilder_grouping_same_field.odb
new file mode 100644
index 0000000000000000000000000000000000000000..bba06e5aa285d18da4b13b3747c2c75008ae89dd
GIT binary patch
literal 16689
zcmeHuWmH|uvMw&co!}On;O-8=o!}DO-QC?acyM=j3GM`U4GzJAzm>huKFQ8b&b#;D
z8*iK*W34fntomkmb<e8mud8GwK*3OffS`bYmW=Jyzh=VSkO2V!eft1z0a=(>7}&d5
z8|YeFo15tC+M8He(mGncdu^p_XJYr-%G$v4ot3_Wg@L90Ydu{%1KB^oprD}s00YSX
zyP*KC-s#%we)|=zwJku>*51UxPE(HGw1*C{^&ZW4IUr%y0_romAVQvOYKyAGp>q*+
zQ>?j|wl;If%16=BlaZrv7Fzt%iX$Lstl$AtC!!$9GhEsx^03h=?1lH4^Y!m?7L#P|
z4`M!D(RVZ`P4>~6VU_bc6_Ucnw8r`JUQ`dDM3!Iie+Z?BmZqFy9YPh+aBjyZkkfyT
zt2yUt(DEuyJPLKN3BzJ|jb}I$qe5EHc+#LljDC}&YaimeO;$GW3Km5*MGkB$oqLVk
z39m!GW^#yIv`Na*Yc8W4sSlapfKO1qDF824L&uLMoTX^lg+*)+ct?141cpcU38Jz@
z&DE;#71Px1CZwzcB-H&1^yF87S{i|YfPSwygdY{Br>k$~U=92Z?ESqna6lrbISM~w
z;OUsry?Z^%D*fpe?kY5t4XW6NoGO&in<0OlLAkW~P$&}QfZ=!w3gXFJdq00;F<|5g
z9m3G~crhl5>8=OPRc9-Ao~Z4s<JGY}FT=f$MsKGAQ}qnwN3dCF<}n}culBm)7SzhB
zgZIz2FE=%;Pn8UGi;%<Dl0T}Q&mLPp7@pN$ZyG#afzYVV&hs+d!P60{_wzsso(x`Y
zzB#jYG=x7~ynKS7sjUhwqk!!}F#XzR>ycf}pk2YZiq(VHgSyuD)cwJ=tR9(5E!9d9
z-N`B5sbVHzg)yik6vGd<-D}Qtk$S%BX^J}t7?-!sErP|;CM~%~9;H#<=Gt~yyD`Wj
z@zcfq2!-Xv@eu<XrDtbtMtDwv(PyoAKj$<`569%VTm82SQp0b&0)mEM?07tBWi`P2
zY}&7^jrm`y=Cdm~=O$poIS$|?(2;orod{pC0hiS_-*(|7u7LUW$fn6GDNSurRWb_P
z<luY-fVYNDR(}EJs>X~a;d}>AMt#y+PY(0y&i)Gw>4*vNhB!QAs<l>;(vBtJX%Wjj
z-!|P@Qw^RHl+9IK>V)UWq<%4+{~J+SGC73Imf1ds<RsU-S%imWxS@V{Dj%Nh&_mIL
zup-e{tKx<Dm6CR>1bO6FXD-4AL0i@Z^Gh@#w=9T)u{|z{SAs2wGL9+IyMjTY%~RPt
z6&ucxrT9lg609)@&2+ovQ#E86an@QBI%*tXdRAOyIYAe|&m(wuT*RzjY$Y!1gcBan
zgFRwDyqFfB@@s@0<^t90*gmtv+ULdP-p;)3X@U?jQSZk>gd{1j(|Wu|P|dH(@Y5Vi
z63l$>SimoG5Y)zSm}^k_9)FvnB^(FXM$EP`YVeL8OpJTMfIx&K=-zb1W#gu;;X!hv
zHEUFB`j$d`%!HaGJ!!9st>DeFIPRS8j))(wt>@i!<`L;Vf1JrG38E;8kq+-AS2<`|
z*!_dt;Qo@=dJ=ZuONT>>HD3mTNb#}GC(uNbCOLvg32Dh^UD{LDeUtSO4x34wL^B{8
z0o$(#EZLs5c<%Q?XTyAH@i^r@$#?v;W2ez!blN*)(Kusv-4`cG?5|fa*vl1Sw~7LS
z@zAsMR6nrQJ4b5lfZo-vckM{1G{Zw)<9CeUaNixUa}!_nUgBSSd$ot+*l6&W_?^3T
zza4xz@73u`$kW<?=8_(l)_&E~^m#YPL<iVL%NF7~Q<EFjC_ADVY!d{+xU%Qe$uHlt
zB5qF@8&R}s<`I9!^#uxFVNlOD>=AE(66v;+7=k9o;<`q!j;*3!xZ5*@q&3dOJFLSd
z687SAvMa&7pw><r>3xn?YWAqAb)lyYV_;8IK^xF3LA#z%g|kK?_T@d4Rj*DEjPs4u
z3p*v-M);j)jEDTsHKR}Koq+<S`nFPldj`++k6Hb6Zg8v>`h3R=8&N5&QY{z0w1@p?
zex%c(*nHu-d<Zi*vs+KO2Cd`IkmfRW&)=-n=l8h~CSU;L4fy;It(2X<t%<dLL=3%E
zHyvVtlV{%`Oh`Oo#0!JAdC^Kbmg@8=`w-&<LS(uu`_CPxz!nM0xXr8g_NOOpd`PGw
z)bxmAMzA8s)WOA^_%~$qF&T8oU`;u2-Sw{{61^QX*ef!vN-57_;s(+{w2YwqSMWJw
zpvu6Ev5SZhW`!&3=qs;W{n~w)nHS*vMK5gwcv5yuNV~01nm6WTuY2yJ<n9`57VzPp
zSu90WNoPFQ71)sUu8zM>rGpDuU_&s-W!~w!ooLg7iLdI%3M=QP*s};ljqn)@v}iQc
zK&o=cG*@GM*j^$Bmy!7L?p1&d--Gx%>Bp{fsnCpkrwg1f`>Ji8H$~_-Vc@93o(4QM
zg`m&ajnuHZd#xaZqzR%tk?(y!tG1Lcx!@Kly{q(b;kgB<6%vZoX)>1*;0RuT{H11~
ze|b^HymFBtP#_?0cpxCSADzKBcbcH`hYx7Gy0PUU+lcFZh&qFL2J@!_m;Z`NPSkAx
z@BtKZI7`(4A0Yf@DE_+-kQeg{AlJwj%CSj-zdl~RJ8I(8X4`kHIZSu5GF%;%g7wpW
zJT(8%Ijckn>C@$^;j%ADoA{;=D-krHX)*TVvs6{9yglj3h%T+$si)^=`9;p<fy0i)
z+l8p-grqcF3@eyDJ<PlOJyWx>>Au^%vAz8ZB^TC8pAR-yon)`L&fn%~XsDMf4xPAs
zRM{Y-n^#DXHyKS)ds~ifcD$D9fREAcu%r!3^n5Ppp^3PWd@dT1&UUaK*!sR#y^-yF
zus+i>t(O)*^2WV;u--Ub%i<pYuv5G!V!JgnDor2e3lBlsj8#aLKIY(xqXyL8MFx$H
zc^%R{-VmhfikT`2dn5r5f;$_%=&A!Pk1AD%qfX2h>-Ji7l1O295u)37@lm#bTeJLA
zZ08g1%m%2oUo7dDIjAKg<HCnj9@;Q&oI&T`ENZPnlPU6^i(B+tV;>~IeB2)l+AMX6
zfoH@4+^&=`S1@Ph?G3%uw@b5+_w@eMrtILm)%$oy$ctQ4t{GXTUildz5@9Ziz-y|6
zfiaUyYp``}u5;tdPW$qpL+=MSDR+oxPVM!Hw!pp^!Lw}VP9A3R)0dl|xcpnYq|}kN
zY3*V>Eh~pJu+)(@IKvhAN#o_}cFLM=)=S-Z)R95kR2saUUoKt(1_tK^Hyh=q#ly*c
z(g(@d7(z-N$Q~J7%$tVrX%8t<KWGPLoRxLujyM>*9UnClr~hTdP?E`1c(XBjtu|R}
z^BcD8E66p7c^?G~OJH;|cIkKAOj2JIE^;`$Lbv>9@#n812+K1v7##e34bpbmVy^yB
za@q!4_8t9Ao)p@-&EukzjiR=F;ucBH<%e6H`fc+f&n=vOB;7k7O9sfm(`rTcv~{+d
zfux<ygJv<$^gTAiWY2g6`3_};rLFhjX<d5pTSBw=VHF7(wAN|fcUub|SO*#(5gIpg
zcsBIT+$IHiQ@}_4?l6bu@&pfq^fvlLwP&m};K$q$9&2w0JX*33AJAZD8jiT_eGj9u
zwFu7!c3a&Khm}3LG5bSGdFz*q_~O1UDSHenMKU7i<GaN^3{*b_ebv}v6AaoUhGOL`
zad1xG;zF2-BDg=Qf5sgi>)sTxPILPVsoELf_4WOxUEEeL$QAJb<O6NiCh_Njr`BD&
zu&rLut7((|JNhagd@HxLbo`6cMF$=NZHo@o=QJgc6}CVjNceN{2YZ_*;6H8aUvW6#
zJ^y!u09+Yb*;?4q{`DIupjdNr^>ng2%6NcPt_6gMFo56aTUpwF3&fo*%+poWt(I6&
zJ=ZGen9OB9nDh@u8{33BSa<`A!!W(9Z15$eNWm7SBtctx_6*7;nJ(WcbgSyMYq#qN
zZue*?+ulyVrm9slyx6CHZ!OG>QmkR<#l807@MvWPp`n=^Y=?ciwy4oI*mP%|9T*VB
z*Q*&u$Tg8F&uhelE-g=L%xO3vyM&QMmIm**RHB;9EC#3>n(ZCnY>gT+u2APM#(%wq
zx#rsbI=ca{iS==t;<C@YzVp>J`b5e4dwkB2<3%O1SG%mNtZde9g=nC~dtXocgUFh9
z(f9@4ilXkgQC!z6BD}6GIs$qE5p{$#Y{r^_h3eHNtm9skCpKlRM@33U?|zR*bzD_s
zF1+kY&_DMTDS2b>JiDhq5X-F0qN6uswwZMgoG52_>{aBR$2)x*i!z~rz^8K4&E7Y7
z*ehvu&Gg+i(@APCu1>ADTr9PX1zC&)Q^za&NirsCGGvKND%=suu!%u~<wjoJ_^5Mb
zj@_Ssv8A)LXqH@va?i#FuK_p98O2|lU4|MbVhG-W#F}b-+YtA`47anWcIo~izml`M
zH0+!P!WN@V3M7wrO`ny`d+J5xs;_qd_<N3_5#I<5?MlVjnUnBLmH9I@>?G;idgf1l
zGM^O9I`o*RbT;@^4qbIFkImSd>nnCTjVGDuKa}8fLegwf(Km|@#2klmGAPgME4(dw
z?ys$7mto4KR8lBwyv?9JU?o<7dcDwyWu~~W1>&|}Se_vH8Y*c)(+N9R8!^mH0Js4}
z5pf7<OL4Jf>9eX#MsLlHe#(jwig8fnTj(Zr!<V1C1&7o)Ows}?BC^Ph56k@5Kw%We
zYZ513Le&MK$4li^OEbL6!TQn}fwEkmL*qf5{M=2GKgU}8!jsf+{A*{B`?~x!-b`=w
zRJ3b)Dy_Y$QLvbtz`@2Cu;4?4E?075V%3!S9Deit+zO3)0BChHJyXVpd;!~)R2bJ`
zvY~UYbaxV!Ha7h5r)soOb|z~5v>mg1q6JDbBuf=Rh|)q+)i}1oxMoyS5ZdmXRMnQr
zK%dPd5lnbEbwm?TRD{N!aBnT4L{3PU8CNMsBixD!BuLjmMvv0qqU-HxSWs9xZJc-S
z6CApkU)MTXVSDG6=Vj@7%5936qJsnnz!sCJ<f#)=P&NWx`bg$bCNH4F<dLBFjm-;E
zRtt+*b;^IxNg6S#p>{?xctO~;<xhZ`0LR%C3^q{W7u0-D@$Q_2Y6HiNGchEd6&abo
z{}Hu=v;O!)@$AsEfw!P!=Y9Ue)#m0G4o>4jWhgJL$C}2pO!K^GWij3$6q|=idm~tn
zI<pnAYlprdDJ_o*ad*_u5}->7r)y4bygUJYmVOM@HAF8scJ{Y=`gt?RcsrODAJLJ{
zJ-*ye13Ta$bO6R45j18*^Y}Ep*PnQyCH8Wy8E867&yH`P65&C#m$jRYtjHG%hPL;F
zwODHPrVt@|B|59JPquo%!|&XeX)0hP1Rki;;J&O%1%9}%0_==r*&gAGC(Z#A&(ni7
z=50~32-rQe=Xg=&eP5gQ;8z{}EuZIQr{{kgxIc}To63xRA|TcY!Uh6@1sE?o1ABWD
zOC!5)*6aA~aO5H#>dFmO^i8yXkQ&i|F<z>poD{wwr&%0k<-vT+arDONAsZOIAVV@2
zrBWPPFAq<9`%MN4vZ2a2;l2eDM)D-PH3Z9N!h;&1=_{NEwdEULAF9)y@G|9jQOnK;
zHX+4p@K||%AsL#2?mU}DA$NE^X-x=lWnwy^?u7PXBB2Wd%Ru-ne}NMy+bhq7EPn}K
z$(KxDogFG$-(9>yrBx0q<2Vu-8mKEJ5r-Hw?)<ulwODUa)P%Fk*xYS49l>yU&N2=*
z%`1$}KD|FPRl^=n?+BE?{PyXh@T0P$2j3ypbmw*5jL&fgK659gvrF9tkz38<+v+Hu
zL~=>atOk5(*7u-j)h&JG?3WO9>Nmt9IK&E<ekZkhmlE4n)RhOZnbb%GnK3P5qdJs6
zd-FZ#BOI^TWgak*s9$ZarF6<0lm&Y*;HAc9W}M>@BPWvz`HAk{I-?!O()$vCXKd3K
zCq|8@^-YeJhdYCZ6b_V*J4(^HYw{B|9nh^CtgO#}`fT;mrQ2s26|IseFVZ>N7;C##
zAyP?XpFFJi<6Q(~@S5)G_J;mJfv>ZyN*{R5h&Yz?CQ+MyJml_*j(}<W1Ke(@Xo=0?
zY6Yr8m(Bq$hV#&wrrS_%P5hWVhlI(je43L5g|rbxdY*lv-aCrARuQAg%Uf|jsqlT9
zo>()1RMvd5(u|2XTBr)vYFX}{(3N<kq*PI<)e2)JoRfZz(lRD5kv1K<xbymgPwMC*
zl35Mgi@CX2X>>>$cNyf^!R(UUms1!bU?-~7w3?qHDQZ`1rAm&%!#;gQn+Y9QtgA%l
zYDjcks!6-MQHYxZHu@ATU6&I$SQyviMHzI!Z6gi8GxEGm>hgs)ROy;F^#<eb&esw+
zS+f$be)*w+fL;RDudRW#m94!Ut&E;2BQrg%oxO{>!5@pcO<5vpkq)u_Mup(U9LKT2
zG{jpe&(x}|uAmq)jxD6lbI=Cr;XYEI3=FEJ$==EtZ*7E?w%Uc~O%)rRx?Nelah>FZ
zZ;|AlMuPg~{T$3wV1`pBOEbCi$0-e?h<8I9i|Jq`80)16Gm~vP>NBbdrfL@)N{S4K
zMnx==S3LUzY{wwrKBn6l3r#2N4z(~mfrzQNnnIO3(FOoFb=^rVQ2jwS(G3mFB$r75
zQ!tTbyboPzEG0g=-XiIE3%PSpFqSJe_AA$!PtCR6>7)U3(nq)efpG`!Sr7~?BQ>mb
zM<q$8*S+`YjX7!Ri({6c^WDK343)O!Ee*K$vq83wJMcTWC$o*&x~ud|jaG{odMT5$
zSF@sBpAHrMR1U9F?H5-S%^o4nP@qqN8*Kp%q;d|vGkr^A*G7l)<N1xTP3A=T+LS;~
zAUcyin^8)k(|bA#KWC&>o>_E{hBN^I+1XV-TN{qy{&FopiF}=qYMN>_c?VtH#^GWb
z4%xGSU4rVRXg79Y7d8@)P<AR~;!T(R7=3}fy!_1+NVw1{x%Dr^jUVnawkgfsr#=F|
z>}PaOiOPP}<C|f>^%~@n$u@vAys~P7?T~HxqX4ATupOkZi>d)KTzBYswXcnbDs6|W
z3z!wjbqPOz%|SpQ2$5rAhBegF9ynzOT_RQgQI6qQ7wN1Qq+3PjqOI4i1}m=T3C&J<
z7;O<vQ@1oW6uw<(b(^DX5O$SLKnv2M7{QyH#oeb+sxsBwlpx-i?U9Od<MO4L$qd7a
zyelItM>XTKATA|~!hr4Z^m0t_vx)aqZ?l;dbv2xL2R&TkD2N70V%{~Q4nFUQo}h$}
z@Wk4)qTu&@jm2$R$h|0DJuy@i`-=FPFfbxQAnJ0~1oQOBI8PK~^F_L(7x3}-IP_05
zO@wJDVhh-ob^tb@82?=60CHIOo5hZZ8@BYLLlnMwd?C~V&IwJZ1H7Q9sdSK^&>R;2
zGFZJbhCb@a!^J;XQ7#}F7H=&5@MYloJX+JFcX1<Xc2iZAiMI~J1`*6?)D6ZkW7MP|
z!E`($LC8A?U;%Y-W7A7{IV3p@`of9Q1cF%Q)~E>(%AA)muY%tSkaA?FD&LVoGPp|d
zOKsuI8e(qbaVUt#2JOB*j3t<<FIzb=FJh?ea}Hu)QdNTsx;{UE1nd^)Y9tzjCLJBB
zxR+RMDP-~}XNMpii^@{X%W6ewNW)@Hp9<8AXXdovy7!029v6wh^Auh4ThhW#-P%^Z
zwnu$zV5H1@Agl7re@wu0G8=9RUsL_K<3e8(`EnGLW5fUzmTHjCJ4dZJYztB2kd+j3
zIY$ML${9P3SJ1D%ysgg0YqFI~;o)*fcqN^O`(~Ttqc3;D8&BZrfh(Kvww^8{O!D>k
zDv$2#$8_Jl3Fn%gnG2j&go)$q4?rvN{wI$<lRs?*LTe<lJ_DwS6A}mr;86czjec;h
zbxKlJOLVYprz&90oYIT%s^Puhi`h%MpuP^r*{pqr$hwKfV)khd_mkQ_$IU(}_GC+&
zZc*;2uV}5JI8tyrIRXq{?M|m8dxy{|8#W-zbl|trZn8Yo_8uz>Blcn%V8Ob;2V-uM
zO0vGDOIh{S3>irU%2Q}1Vs7-#0aBoYqbZ!IBH8~O&nLTEf-Y`}j9DV<yL1FKs(k!$
ziprjh6UW5f_G5ihRl=?DVfapa-M)IQD|K6EebWiuBBNj%lmn&sm8+3LeLLA3&^6lN
zPg*jQCl4hHM>ST2!V++I$>bM%;o}$XsoF{Nw|Z4)!^WV(y)fOZo>v|sN!t3yGoWu5
z3)j>Y+=;sl-@O-yOS&poL6AZEtQSspWgBDus&RWgi+~rQ5p&xl#dWCH+P`tw%kTso
ze$GlpaI$;|CdV@xDH~17TbcrLxqUvwn&&;u;~dcz_3DS&sa~^T&AMEj#^u+0^irs0
zlN6f}H>UFWg`Zt{nsdu95!zoIs7X7a+d(?gI8CrhCproGYu_F?YiGD^uj)@#uZ&jm
zOY&hM#g49fP_zqndoZkfZf0ApgKp#BBtH)!e@5to6!WT~^t64>-WB-zwrO+d*6G}*
zPcJP9v~252xsj(T$zNL&>q*_K{p_a&!a8Y!K@3<N9CScHSpQrgKWrV3u?B6IST0v9
z*6HFT8E`|@EZ$b7iyxRLX~bT~4m#@~lhBg_Lx9y?8r{)9R`CFl2*1gt8IVtPO!L#<
zJmy5t>`)`EV(#Z64%eFZ(^{*iyGoWZcGi7<+DT`u)7E^l9rN{ecHU*Am7zn6>@W0w
zrpd}*kj#3IsXfnLz!=C7J4*hBj@peeQBMtd)O3LHl{oDLS5ud}iY-2Le27w<@W`1w
zDvq;i(aXv-5T0b^%HCmAJ0gDa3^bNcY%^~Imv6RUIFX6cn@;qqKGTSB>zu&fKgM7;
z%Oe;`pKXeZXV)%%3a3E<si)d!2ut_ohl)itU$V|u<=lJ{GfzIUtDR?u^@d@es`Vyo
ziIrI9uwX%Ox?biws!T7)d67&q1N_>L#fDw_CC0032GYxVnohr(8b%d<3B`}|xZ(Zf
zPvw}RL?)v+qpAW_A49EGhQs`o&@npZD4oo;6AiHV95{f#RBq|hj=dgts8<?Jd`hf-
zeKeOwAPcpuMnpoQRW^5+i@fQdEP&*K!D0lR0~a0-McZ7t2W3piR`2F=;<&F^`auH-
zo1aVcyeM9Y7d!L?Q=vZ^N3oV(63M}^ID2Cxj4vaVP7U_<N}$Fyuvls`|9d2yNorx7
zhvLhUki*2|D#wLblZ**Cv`alr6gZk$j9!fOyso08WMew6Mu@-{;qa%v?I{pjer6M=
zaHERJI2r+QtG$u|am2mZtPIl|mrya7?~CZT-MKHN;RJ0Qt#R|)in8JTo{;ox^a^`6
zmbMBZx29yndKv~ytd?015L?aUt?TC}fRyX|hWnu6=#Uv;6$BS>;pZjl<wVytr*&y3
z4GjibcDuEz;kZ}n5w4NBStOiSnW3*yc$ni>=z*_eJy@6ySsP1M*4b96?Nk{SQP9Kp
zkk<sO{Pd8!A=E1sDGPnPLj@wIjQwi3<PyMA_%uqzQ42%L>U&KqB)ecxBZX{xG^^z}
z_8HL(P^tK`PvY9|REmoy-o9QR02zapP1}GFE9WEv3F{F%t(HjC6w^zn-^isV7Qkh_
zlPTlxc&@FwwZb8LbHVV1j2b?$NY;!V9mEdO{kRA_Fm;kXM>kSnnU1x<x5AVv)yPC(
zTKBELd%dw7Hb_KMb%n0`pru@{?qEd%gKj$(y&__24VT%SXFH5?PmgADfS)CO!4Ut_
zWNQrBw1w)UKLnXL7{6;Efevj28*%&9%h*BJpiNcM4v1x&dMfsJC6ep!?t@jjOZ>EO
z1p`}!CVXfmsX#Qk4{RujRv^@Z+~LX~i_v>H5ntSI_wk1(-DFzMC8zTg(lxiqX4l?j
z`_{YUps8L6!>#T_z@sJzr$IZ=?|L&-lcbJ<k(v10?^`ONShvYV7{bKzx5W3gFJQ7o
zLc_lSaX8$LqmGC<TH@*_jp#57BE$9qmSeSB6i+>v=5rYCZ#rYcz}xHI(r`|Ld0uGB
z$_x#~AU1O2K}}z!Jew`+>HnnniK~2d5gSJ$-d{FI)<+O=GcGz9wpL}amb|ikbG3cw
zH4y8Fwi5mwTK8rVkWwsISM8+5m0RTPP&sHP!7K8TlY5j{ors7jra*QQ{hhI*HHC4=
zw!0F38Q0pJOW9)e%lBMdFX8*A52^KBj<naj&9=>?H@aCFhKYg8V?x2$uSim+-oU4G
ziCBO2i>koq^=MLVZ^gT;sLSwsVm(wb%d#LqH3W&3QDQD`4>XZ0!^wSrnh5)DJadik
zDPX4?(N#C6FC%p(J{k3095=V@<ol&HRGPBPBa??j<RWuXBoVsf*W*_`Wp^g~Ys^vO
z$xxD3Z?We4Ts<ycX<J~`_VuaH*3S#jYHPjQSsC`J5r%1Mja-Tb!|ssx()<X{*>s<U
zdS5;3BUJyvUV;J9irQy+_l3K~t@P`GGJ|6GOny-Blx_a9VxO|q6)fK*ivASOxsuq)
zVpXPf+pC_#@eU8?$Nk5plD+ZvJ;~N1NfS6v-8s}|*49&(jQsxaQ`wJBqRW##wz|d{
zFg<Rz{1wi&B|+J7D$!Er38XEb*$!r_Heg!ErgHS7UtJG(j1=<WZ^Vu3`Wfw$c+WzG
zej2#svb7FJ5mr%;!v;?tRb+w`+7(U%BP!5EU!PYYG}+p&H&zNcvESi-ZC+Gsh{szw
zLyAyXTkQ1|@4&)RSQ7$#GKf$yIQhhUD>&pZ?F3oAKBy18#!MCQqA}~10_J)q3#tI3
z(FlQR{#?InRkPA62IH+)7F)k?-_!Hqr+$!_#unvr)CaLWzjpo;1PD<<Jf6~0QW}>g
ziBC8r22rsEsr!@Fb)S|u@|(VdN<b}e=+wC+!$Xm?->ZdtTU~n^p1v~>3<E{oc@6EL
zw_0GPE;MauK2xCX`euQD7B2t(=D-=3j`XA>73xdJ^BqM6sr2(`NywCw<(8K1V;L>Y
zN@T}F#{=N-{?C+&KSN}WE2>Y|fSq70IuH=~KV2(eLujCHFK=LNuB&hGEm6Xb_RqcI
zvFf-P3P0v!y@j4>6$`X4a&N+c(juRns?dizUb^E~7Do=%DfKZ@zTzyht%~%N%DsLs
zhy>2J`)Y!SoKYXJd$qWOwOXA+tPIIkq~uBTRMkfP8*X>?ciV0}TGTnjwWY^sBu$v4
z$0o=F4+$p6TEQ`75NUKr0UTWPLEJE_qGCmh9GqNMmt8-nN$KQ1dJd9pKX|2fSWM7q
zcKoBqE=3Noklt<t=fWZH^OJ3hQ*)Km!2$dE+TimA&dE+oYX`@I-IU#z(>Cq4n})sI
zz24EwQ_n_Y@rr1>DYkO<M*lbwmR(n4gHK!q@k_zdZ^r3e&=wqQugw^c%{`9at?J<u
z@I;*gr6<e@QS?*yFF6rF_jqtRLP8qP*?9G@a4Tux`kheX%5$vcc4KI)$%j^;Hnp>v
zQCEJ_%XlfTqD{R$qL+ARM?q}zzKMETp;Xo~H$vPqJ<lSA5m`A9ZT7Nv+4lwR3w@rX
z@p%Iy?WtrMMQ4+glxWI}So%?z)}e55YU*-wX#GHSC9S~}hM|j4BL&kkjSUyU*gR*7
zh9gu)5>Axp9kvgv6(FN<ZRy#&V_!cx+>pD2HmL+>=&$S{%EiA+P%?ab*P1?l7R$p!
zIwg0$4219P=d6VXy3~p6%mXYJ&kAY|w3l@OU+7~`9$eSSLg(uJnc4ayQVxhxutG?2
z??AU`flD=o%*&KdHY4~7qdm5BH8<=Q<=X+l1gQP#!L=$3gw-*x(UJGFf<r{0V<O);
z`+g=Ri46+wwhu@taZP>8qQV^f4pV}~XPUqRI$Vzx5@hJgP3OfCzK<^38VGV0Y}Yw4
zLFn~+LUDv~(z0#?wdRJ6riG3#cqaq*OgR;Zcl45|xq%x5JVI99Y{{M=heJnt9U615
zF^<Ge;v2()aM^F)N0UBBe-e|zeSI8NdZ?>i2GeBuwgc<xQ*-oT;?)7tw;LUGtIjgS
zqBo~*%?=}T^)T!ao1+#{r?c1BnWimY5Tr54)jGU>VgdgXi^B9@7UjPz%KslM%71bZ
zfMxz)7x7;g@n0A58yE4P7)Zdo^Irz?{|yGRk<fMy5kN3u{(@ivOw*49liCu1U_$gb
zRk2PMCryDD)&ww2Y2pXVS`V?cv?<aMr2H@Rk#+cGV=ovVlb=*EfW%`^O<=0yb8+{&
z=&LZ&R{BmhH!oBU*{Tzh3;ZXWxIbT6z$irB`Ul$G-;AH86+IqoCfT8b_4Y7ky1Wf9
zvgQ&2f3Wglk}?9(6m_;VN*lv`BhK-G{3G4bsH(3CAyWz6_>82hx8XVSZcFIBSeD}Q
ztdbCHg>bn~(5n$|1JtiwwHmLq$dXaS1tzH*igL1x8MfQ;M~?##2S*%KN|daa4}5H$
z=1-%RClc7wUUij_1^5fpmAq6Z1v6KfbiiT<_CxH2o}abOpJxNGOiYs3>}tn25bFWV
z@(teoEuj*t#pcbh0G5dXz%r5Lz$T*tSSH_ZEE6UM_zefqW&XcdCOH^o0Lv5#V3}T{
z(F!d$+t%ud)1XmxY0`{ilvcAnx5YN;-{*);165B$M+f2JyUDrQl&h$-o9|n(&n<h7
zLWA(F&-xOQP97V!Qc_Y#2UC#5ur{!VA(h#X2swu}wFwcxbXBc{*)_l@@I*2In}VI=
z<Q0IGc+PsiU?L|QrY~00!yp2%Ol;p+CItY?WVXHHuQ3a(%7o;{K+Kk7;>-3`X`@7P
zj=Q0MaWC;rO)?9?=PpWQsnLFwKUpS>_XL=DI6j2llN*{7tb%krY`&gW#t^!;)=*?^
zAus*^B$;}wUH!$vM+qbmG7;Jo06Dn0I6bwj%)NA<@d?q%0x{vW@kF_elLE=%wTTMa
zY}N_|&dQ~`7K(j<MCuEY{9q)z1EO`4vBp+5yxVqJilJIdIFFd?-eP?zZ?BwN4#YeC
z4CyAt&7ywRT7q)KdOKr&5(y9Zhml~7t6$3yTx5=6YESfJ2AxW4`~zMn4r&Y{%e?O^
z<SbGUsu%2U(BVeE2q{73g4k3c$>nl1EFzb*F@V#`vLO$`Ic1CJP8m@Skt_S-{6RAD
zDIHOxSib|_10#Q96G76CTLl!>6R>K4LD`brYccgPt}-6VVfiy}9mM0)^x|%ZV;cF0
z#2_ms4lGLcM<QylUHGqy3aqebABcr|U;`QrEk(dP%EFD)1E3v(@?f@Wlwi!En0ANS
zQ_lmMmD*upJj!C}FO<TveJ8>VOjd4&H5*OwPBuqy?fux5;1?rz>$p-Zr;Ev$*u;sT
zrWnD1-CPD=o|nl~CYL&qhi-4q`E!mr1_WNRps}s;Y@%I$$x_*gCZxr*U$>k70)$a(
zn)XGkA%=x;O}50Rxc3Y`aGA%&265x+v0w?#r~u(jq$O=Ub(tr5kwu2_D`j`NY$ulw
ze!^u$WB$#Uc0l2hA+GdYHr0F_4h_}NwOS<tHNxWA8bj}_&><p;ef<RZRyb}+q=-lk
zS;i~HH%=Ef2D>vAW=7K-V-uUP3Qce4G4SrY^|hUkV4^%Wc$Y9P737}uw#{#XTBp?6
z*YfSZHsVl+_3x;+WLN2gKs!L8vH6R;BO}LvxCZ2dckYI|-BWUsX)r$5KTK30qRW8s
zh3JE=h$Ja_q-eexIc62QuG3&3rJpS&7bh|nV30kDz2m-eoG9UWd6~;8A&&5>nWtm0
zJ8r|8tB&T@JI?JmLSr5Vcs1G%^5qpt4G7V_BswA6X;*(zluBj?<&6jKWrr38{)5S*
zDIAlrKsGeNEsIjjzFBHUp|F<g)yZ4_&$kz2McS&b?b9$wp{@nwfazS4_v6}VGMV52
zw2~8w08z;p2(hs##@?NW@?-7gsahYIBv?KxHT02tYjb~W6eIJ(gC~szws}kv0yRU|
z$*0bRVquNdW@ba*M@=7XBeQa8O9t}3c1aV&7$vfW)R+F)f^=3MVD0tpWRTnN407c%
zgyY#)&d~|Qv?Zza+3OD7HpQ8zUz}C*e6f@wJpqhT142c`YDb&<(@{luND{8ZTNLei
zG`gF>Ywq#b?c^%lq4|>mPS<%3%+w0M4emp}C}&&NplsEoc+v(nq81$-2mR7p5G!S4
zEvf;m`#yZ__}r+o!KBKdnoDGFU#Lz>z2+S@w(hFflJLPcpjvIp131DfbO5dNK^JR%
z06;5EZ`Ws07W_#o4OZWAJlUAA+@{o+n@1a<fUd@!X2g7WWc<=XVg_K8#?}V)@9-!+
zyf*E*nZ>$_fKL~CrW_uU%bf}i)wgL%d1d1_xU`?27Y_7&#Aec|l0rRm?fBPpjsa|v
zJ{}Ks87a-7ZBi-wKrHtV$4VMuRJEG=C@#xr0;{UPz!dO@D`I;-pzR|GPs93~8dox6
zGXnVNxR%lalnVyU1^m=my$=j4^75e|)kU-`9Z3ZT-t;!l5kk?A7dJ94#5Q-tRwOUh
zn(Ea1M;qE>?Kz*ypEtGt&L&j}9_w5IPV(Y@agz6KNBq-C-Xb4j+l@+A8@6DUd}U`$
zD&=u@jI4?6fJGIgYF~@~aU}i2eR)T;1+0UdZMD;08*3)sI6gcB))7Cpk7?J(9wcn<
z7j&qmEjqMb8EJ0U>s~2ahQuIe0<g%?p*WyI=z0)|<>3X$O%QE5A<B5R#7A&RI$STf
z!uge$D)@rZ8ngAmv`#7-N!lZ`Dg@xmYd{sTtBxgTC*V%4vsTAw>c`-iW!wrZtLiNs
z?jY)pB*rTp$`@|N76j6P3`WFjO$+qj-$jyNYp@cdx8dciHamToR8bKOPo=yhL_T=*
zmzlOtmbN`|W_jP#ROd^yiMCOso+k78VTLu`mf(VE=w=aBCPh2KoVn<!^~m+y8q8<p
zqqD4*(HQzj;L$O7ZUL}SI@h4SXdxmzBFk+>qFaFe)?EK<Gld;EIi7QG*_t7~{&}pC
z*N6VRcoDlNO#>YPnN6NS*5JSk0(G?k)kD+m&3k!nLKICek`^5$;=E57nAl6$kZXmA
zU-vO)NS;_pTqSAJ8&LOKVJU#R4mM1@CO26!*!60l+GpX7GIk4<qdCqGV%7uGpwF}i
zX=wTi9a9zuauI&-2!c=0v8a2;8Ir|qj!*C?7<Sg@E-;dERzkNxdGB=|Ic%QR0#`SF
z9ow`FHs?Q{7~{4db?^-SeYM<if8_(vjX(hE@sCCZ_!hLXG&C`Cu>GS@%Z`CoS6|=2
z+yL;Wl`XBlgRSkq(nCT2mC66BY*U<HzyRvCjBE|;?DTYP|9!6bXT8{;kN)%f+qvS;
z9k8?4wRiZx$YK6M&fdz({D1#6Yb$F9YXHaU@E>}K|BI)YSm+uV*wG4@*jwmYe^0ah
z=MaC@RYP+tU3-K7tzy0n&|25h!2CaS^;b{(HoEVM`BkMI8eo7@!ixMf;?g3t7P^)u
zh6Z+jBn9^+4oU-R?E+7^gty)F)O`I*^SKFZgayuk${C>{`s-U2kC*g=Uh6{VsJn)W
z;(0xfIDZ^^S8py<4W!=`3yx(lM-DuwIB1}mm9!Uh2|t>z5*PSJ%g5nejaWCkNrRzJ
zYmAWGFilJ?umleA8$W8a3pg>+_PaP`6Eg>pfk`YHRBBcYg*doEd9B15@Y6a(YGzEl
zhC+hkVm8nz!rC{}CGV01`oMF$R!SX#6}5sD6>iiBma*r`p=51Sn-c;-<jTN}Ecl!W
zhfB-&XQjB`E5JaVq6msbe^gL?&&LqycO1hT%~^1?ayZRE!>G|R&9JpeB9xyS=7hxY
zA!tvaX1%cuW6sx3SNUkL3!;``Y_tD%Y4jLMy#d+UF#!UH+l>@d=}3e1Ns83nyNPVV
zmmzq|^1MJairmT=cUNszwCL$cB;xs2<SniK+iHg_NXS@(sia%s&@==(xLZ2SR0Jmb
z+gJBrv<5@xR%@9!KgQD|B1#(2U3`4d+}^6amK?tbcYv02_w{<vlj8lO>H~(Y04oY$
z?b88SWU>;#AgDmUFU15*>ksX(!py&<{#pq?78QQ0x%}Rw0GGe0!2B8D$9kV{wTItZ
zAfTiF2KciQ@n_*5t62UnOby6l|F`g;1wwxb|E|#G`;)&p!+#5ZyZA2p&v*1&y8QPR
z49JZCD|!Ae{r)<A{<};mK<0-H>-UHKI(7BCpb6sN6Ip+j{F(0lE=d8HtKX&&{tWXo
zCGs5x5pV|e6U<)($<H7^rwn}uX#ga8{RHx3*zq&a&#5Kff#v~;kv{?b2etl8l77cw
zB>V@?Zz<ECd-r>lTao-7^;>lH@2t(AVSe8^Wq{xPagYF*|8eJjKasJN|3LlSME=aY
zeAgR0^*=!VgZ_VxJip`kF#ZGQcMIZILCJTZ3g&-C2)_wYzE8kE-|%lC%J+8t3(&s@
zEPuWC|3vy0vV3oJEdT7@j{(f@alU!#@6GrZINt-B-=qA!HyOV``7yxxJ<hif=X;y|
z1<pSLp5KH0eP}4G|5VZU0O<E9e;=CoFHn9Ah<=ar_ulyY0_S^x^e4(+j`2rV`z=KJ
e-WmWXzYLgUCBXl1COAMiK(PQ96vF;Z=>GsE|MM9D

literal 0
HcmV?d00001

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 455b46648769..7d09758dbcbf 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1415,7 +1415,9 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
                         sFunction = "INT";
                         uno::Reference< XFunction> xCountFunction = xFunctions->createFunction();
                         xCountFunction->setInitialFormula(beans::Optional< OUString>(true,u"rpt:0"_ustr));
-                        OUString sCountName = sFunction + "_count_" + sExpression;
+                        OUString sCountName = sFunction + "_count_"
+                            + OUString::number(xGroup->getGroupInterval())
+                            + "_" + sExpression;
                         xCountFunction->setName(sCountName);
                         xCountFunction->setFormula( "rpt:[" + sCountName + "] + 1" );
                         exportFunction(xCountFunction);
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index b25a31fa8089..a3799c19905e 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -73,6 +73,14 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
                 case XML_ELEMENT(REPORT, XML_SORT_ASCENDING):
                     m_xGroup->setSortAscending(IsXMLToken(aIter, XML_TRUE));
                     break;
+                case XML_ELEMENT(REPORT, XML_SORT_EXPRESSION):
+                    {
+                        // Use the explicit sort field as the group's expression
+                        OUString sExpr = aIter.toString();
+                        if (sExpr.indexOf("INT_count") == -1)// for backward compatibility
+                            m_xGroup->setExpression(sExpr);
+                    }
+                    break;
                 case XML_ELEMENT(REPORT, XML_GROUP_EXPRESSION):
                     {
                         OUString sValue = aIter.toString();
@@ -138,7 +146,21 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
                                 {
                                     nGroupOn = report::GroupOn::INTERVAL;
                                     _rImport.removeFunction(sExpression);
-                                    sExpression = sExpression.copy(std::string_view("INT_count_").size());
+                                    // sExpression can be either:
+                                    //  - "INT_count_<digits>_<Field>" (new)
+                                    //  - "INT_count_<Field>"          (legacy)
+                                    const OUString aPrefix = u"INT_count_"_ustr;
+                                    const sal_Int32 nStart = aPrefix.getLength();
+                                    const sal_Int32 nEnd = sExpression.indexOf(u'_', nStart);
+                                    const sal_Int32 nDigitsOfInterval = (nEnd >= 0 && nEnd > nStart)
+                                        ? (nEnd - nStart) : 0;
+
+                                    // Cut after prefix; if digits found, also skip the following '_'
+                                    sal_Int32 nCut = nStart;
+                                    if (nDigitsOfInterval > 0 && nEnd >= 0)
+                                        nCut = nEnd + 1;
+                                    if (nCut <= sExpression.getLength())
+                                        sExpression = sExpression.copy(nCut);
                                     OUString sInterval = sCompleteFormula.getToken(1,'/');
                                     sInterval = sInterval.getToken(0,')');
                                     m_xGroup->setGroupInterval(sInterval.toInt32());
@@ -146,10 +168,13 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
 
                                 m_xGroup->setGroupOn(nGroupOn);
 
+                                // Drop only the reference name; keep functions for export
                                 _rImport.removeFunction(sValue);
-                                sValue = sExpression;
+
+                                // Only set expression from fallback if not already provided via sort-expression
+                                if (m_xGroup->getExpression().isEmpty())
+                                    m_xGroup->setExpression(sExpression);
                             }
-                            m_xGroup->setExpression(sValue);
                         }
                     }
                     break;