core.git: Branch 'libreoffice-25-2' - oox/source

[Caolán McNamara (via logerrit)]

 oox/source/export/drawingml.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42c722600c324737d911fe9a42e1268e7bb8f173
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Apr 6 15:34:03 2025 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Apr 7 14:42:25 2025 +0200

    crashtesting: out of bounds in export of tdf128404-1.ppt to pptx
    
    and others, e.g.
    
    bugtrackers/pptx/ooo119584-1.pptx
    bugtrackers/pptx/novell499654-1.pptx
    bugtrackers/pptx/tdf112868-1.pptx
    bugtrackers/pptx/tdf104787-1.pptx
    bugtrackers/pptx/ooo96911-2.pptx
    bugtrackers/pptx/rhbz615970-1.pptx
    bugtrackers/pptx/tdf136754-2.pptx
    bugtrackers/pptx/tdf65724-6.pptx
    bugtrackers/pptx/tdf128404-1.pptx
    bugtrackers/docx/fdo51321-2.docx
    bugtrackers/docx/tdf103964-2.docx
    bugtrackers/ppt/tdf128404-1.pptx
    
    Change-Id: I73d75d714f2cecca9e728b3ba99e8c152e0f7685
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183760
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 61e1e38595e95e228168e8385662fe3bcd4c80e1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183770
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index dd2cab050495..10f0842d63c1 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -4724,7 +4724,7 @@ void prepareGluePoints(std::vector<Guide>& rGuideList,
                 Guide aGuideX;
                 aGuideX.sName = "GluePoint"_ostr + OString::number(nIndex) + 
"X";
                 aGuideX.sFormula
-                    = (bIsOOXML && aEquations.hasElements())
+                    = (bIsOOXML && nIdx1 < aEquations.getLength())
                           ? GetFormula(aEquations[nIdx1], "*logwidth/", " w 
").toUtf8()
                           : "*/ " + OString::number(nIdx1) + " w " + 
OString::number(nWidth);
                 rGuideList.push_back(aGuideX);
@@ -4732,7 +4732,7 @@ void prepareGluePoints(std::vector<Guide>& rGuideList,
                 Guide aGuideY;
                 aGuideY.sName = "GluePoint"_ostr + OString::number(nIndex) + 
"Y";
                 aGuideY.sFormula
-                    = (bIsOOXML && aEquations.hasElements())
+                    = (bIsOOXML && nIdx2 < aEquations.getLength())
                           ? GetFormula(aEquations[nIdx2], "*logheight/", " h 
").toUtf8()
                           : "*/ " + OString::number(nIdx2) + " h " + 
OString::number(nHeight);
                 rGuideList.push_back(aGuideY);