diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-03 22:00:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-07 07:24:12 +0000 |
| commit | 0480d6b366fb52d44b19545e3f9511750ad15abd (patch) | |
| tree | b2292ff4f954093d5e19681cdfda71f598b22d7c /include | |
| parent | 06235b5e79de9da786423ba3496b73d978a4e6c5 (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
(cherry picked from commit 6325cdb735effc5c9ff85819b20aec4271158519)
Reviewed-on: https://gerrit.libreoffice.org/25990
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -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 4bef1890b4a7..42db74ad598d 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 @@ -1459,7 +1459,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 |