diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-14 09:07:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2024-12-02 09:47:22 +0100 |
| commit | 9c0fb299190aa0b362f90a1600500b27c83c170f (patch) | |
| tree | 76dbcd886321fe8a740fff293667d7b476de5e2d | |
| parent | 27804802fc45bc969d95261899f45bdedcb7eb7e (diff) | |
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.mcnamara@collabora.com>
(cherry picked from commit 4890e08519103b0252767e0dd8b810894293f815)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177634
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptooxml.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
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 { |