mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1559857 Illegal address computation

Browse Source 
Follow up of commit: bff76421e2

Change-Id: I1abfcea1c7ca8e55f8a4b19b66d80b901f575bcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161179
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Balazs Varga
2023-12-22 13:55:42 +01:00
committed by Caolán McNamara
parent 71c28942fb
commit c5cc7af60d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sd/source/filter/eppt/epptbase.hxx
View File

@@ -73,7 +73,8 @@ enum class EppLayout
TITLERIGHT2BODIESLEFT = 18 /* Vertical title on the right, body on the left split into 2 rows */ 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 struct PHLayout
{ {

2
sd/source/filter/eppt/epptooxml.hxx
View File

@@ -139,7 +139,7 @@ private:
::sax_fastparser::FSHelperPtr mPresentationFS; ::sax_fastparser::FSHelperPtr mPresentationFS;
LayoutInfo mLayoutInfo[EPP_LAYOUT_SIZE]; LayoutInfo mLayoutInfo[OOXML_LAYOUT_SIZE];
std::vector< ::sax_fastparser::FSHelperPtr > mpSlidesFSArray; std::vector< ::sax_fastparser::FSHelperPtr > mpSlidesFSArray;
sal_Int32 mnLayoutFileIdMax; sal_Int32 mnLayoutFileIdMax;

2
sd/source/filter/eppt/pptx-epptooxml.cxx
View File

@@ -196,7 +196,7 @@ struct PPTXLayoutInfo
} }
const PPTXLayoutInfo aLayoutInfo[EPP_LAYOUT_SIZE] = const PPTXLayoutInfo aLayoutInfo[OOXML_LAYOUT_SIZE] =
{ {
{ 0, "Title Slide", "title" }, { 0, "Title Slide", "title" },
{ 1, "Title and text", "tx" }, { 1, "Title and text", "tx" },