oox/source/export/drawingml.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 11ff20073b63443fe31d470fc7e6fef0e8019bf7
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Apr 11 08:51:09 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Apr 11 11:15:47 2025 +0200
crashtesting: out of bounds in export of forum-mso-en4-596154.xlsx to xlsx
and others, e.g.
forum-mso-en4-596019.xlsx
forum-mso-en4-596112.xlsx
probably a problem since:
commit 612891865a74777950ab7355a4d794fa5577c5fc
CommitDate: Thu Mar 20 16:49:11 2025 +0100
tdf#165670 PPTX export: fix glue points export regression
Change-Id: I12af1095115eeca8a8483d5895b716e1a8cc64fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184013
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c9dcbc243014..52acf955fd76 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 && nIdx1 < aEquations.getLength())
+ = (bIsOOXML && nIdx1 >= 0 && 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 && nIdx2 < aEquations.getLength())
+ = (bIsOOXML && nIdx2 >= 0 && nIdx2 <
aEquations.getLength())
? GetFormula(aEquations[nIdx2], "*logheight/", " h
").toUtf8()
: "*/ " + OString::number(nIdx2) + " h " +
OString::number(nHeight);
rGuideList.push_back(aGuideY);
