sd/source/filter/eppt/pptx-epptooxml.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 9c0fb299190aa0b362f90a1600500b27c83c170f
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jun 14 09:07:16 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Dec 2 09:47:22 2024 +0100
crashtesting: out of bounds on reexport of forum-mso-en4-290152.pptx to pptx
probably since:
commit 805fd61f8efaaac119bbe28ab51617c07f0d7058
Date: Thu Jun 6 19:47:45 2024 +0200
tdf#160591 PPTX export: fix colormap mapping in slide master
Change-Id: I154f0ff1769fbda361ec62f1dd589ca0d7686bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168506
Change-Id: I3ec45b2a0b78324e8512acbcc3a7544c196f670d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168851
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 4890e08519103b0252767e0dd8b810894293f815)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177634
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index fa659b432b59..6b752d9b0592 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1507,9 +1507,9 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32
nPageNum, Reference< XPro
std::vector<OUString> aClrMap;
aClrMap.reserve(12);
+ uno::Sequence<beans::PropertyValue> aClrMapPropValue;
if(aGrabBag.hasElements())
{
- uno::Sequence<beans::PropertyValue> aClrMapPropValue;
for (const auto& rProp : aGrabBag)
{
if (rProp.Name == "OOXColorMap")
@@ -1518,7 +1518,10 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32
nPageNum, Reference< XPro
break;
}
}
+ }
+ if (aClrMapPropValue.getLength())
+ {
OUString sName;
sal_Int32 nToken = XML_TOKEN_INVALID;
for(const auto& item : aClrMapPropValue)
@@ -1541,6 +1544,7 @@ void PowerPointExport::ImplWriteSlideMaster(sal_uInt32
nPageNum, Reference< XPro
}
aClrMap.push_back(sName);
}
+ assert(aClrMap.size() == 12 && "missing entries for ClrMap");
}
else
{
