diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-03 22:00:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-06-06 14:49:30 +0200 |
| commit | 6325cdb735effc5c9ff85819b20aec4271158519 (patch) | |
| tree | 271ed135966473dc081e1117f6a407d78b71975a /include/filter | |
| parent | 06a6f3b352d4471892c6516aebf2e948cac329b0 (diff) | |
filter: PPT import: PptPlaceholder is 1 byte large
The array of 8 bytes corresponds to 8 enum values and is read directly
in ReadPptSlideLayoutAto(); this was wrongly converted to enum.
(regression from e5a03da8eb02c333502d6b427625e7bf554ff203)
Change-Id: I5757e06459467b3c84c4a404493fa3be23e4e9a0
Diffstat (limited to 'include/filter')
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 5efa503394cb..c3c2d38e72e7 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -58,7 +58,7 @@ class PPTTextObj; class DffRecordHeader; class SvxBulletItem; enum class PptSlideLayout; -enum class PptPlaceholder; +enum class PptPlaceholder : sal_uInt8; #define PPT_IMPORTFLAGS_NO_TEXT_ASSERT 1 @@ -1456,7 +1456,7 @@ enum class PptSlideLayout }; // the following table describes the placeholder id's (values from reality followed by values taken from the documentation) -enum class PptPlaceholder +enum class PptPlaceholder : sal_uInt8 { NONE = 0, // 0 None MASTERTITLE = 1, // 1 Master title |