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 /filter | |
| parent | vcl: "sgf" filter: replace manual byte-swapping with SvStream methods (diff) | |
| download | core-6325cdb735effc5c9ff85819b20aec4271158519.tar.gz core-6325cdb735effc5c9ff85819b20aec4271158519.zip | |
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 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 9c27674850a0..3b5670f0eb76 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -309,6 +309,7 @@ SvStream& ReadPptSlideLayoutAtom( SvStream& rIn, PptSlideLayoutAtom& rAtom ) sal_Int32 nTmp; rIn.ReadInt32(nTmp); rAtom.eLayout = static_cast<PptSlideLayout>(nTmp); + static_assert(sizeof(rAtom.aPlaceholderId) == 8, "wrong size of serialized array"); rIn.Read( rAtom.aPlaceholderId, 8 ); return rIn; } |