sd/source/filter/eppt/epptbase.hxx | 3 ++-
sd/source/filter/eppt/epptooxml.hxx | 2 +-
sd/source/filter/eppt/pptx-epptooxml.cxx | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2a0faeebbafd972d67b48046aa912c8c5090218f
Author: Balazs Varga <balazs.varga.ext...@allotropia.de>
AuthorDate: Fri Dec 22 13:55:42 2023 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Dec 26 09:31:40 2023 +0100
cid#1559857 Illegal address computation
Follow up of commit: bff76421e234df7246a7f49c71a11432f86e09d1
Change-Id: I1abfcea1c7ca8e55f8a4b19b66d80b901f575bcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161179
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit c5cc7af60d4b93d4247fd88f941a323f4a56dfcd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161221
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/source/filter/eppt/epptbase.hxx
b/sd/source/filter/eppt/epptbase.hxx
index 64709fa14f39..70bcd3a4b6ce 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -73,7 +73,8 @@ enum class EppLayout
TITLERIGHT2BODIESLEFT = 18 /* Vertical title on the right, body on the
left split into 2 rows */
};
-#define EPP_LAYOUT_SIZE 36
+#define EPP_LAYOUT_SIZE 25
+#define OOXML_LAYOUT_SIZE 36
struct PHLayout
{
diff --git a/sd/source/filter/eppt/epptooxml.hxx
b/sd/source/filter/eppt/epptooxml.hxx
index 2d67ebce2c77..d9d65a2e8300 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -139,7 +139,7 @@ private:
::sax_fastparser::FSHelperPtr mPresentationFS;
- LayoutInfo mLayoutInfo[EPP_LAYOUT_SIZE];
+ LayoutInfo mLayoutInfo[OOXML_LAYOUT_SIZE];
std::vector< ::sax_fastparser::FSHelperPtr > mpSlidesFSArray;
sal_Int32 mnLayoutFileIdMax;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 41ef744c1799..2148653dcd20 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -196,7 +196,7 @@ struct PPTXLayoutInfo
}
-const PPTXLayoutInfo aLayoutInfo[EPP_LAYOUT_SIZE] =
+const PPTXLayoutInfo aLayoutInfo[OOXML_LAYOUT_SIZE] =
{
{ 0, "Title Slide", "title" },
{ 1, "Title and text", "tx" },
