diff options
| author | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-11 14:45:53 +0000 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-12-12 08:07:07 +0000 |
| commit | f5c5bab09f2e3a7e13a6b397faf4bdfcb898f295 (patch) | |
| tree | d6214c09038ca6f4d9256d35ec840986ddda0527 /filter | |
| parent | c953690b9adaf632f830dbf67e078ea00747894d (diff) | |
fdo#84938 replace PPT_LAYOUT_ constants with enum
Change-Id: I3c77e7e551bd4b657cb58fdfeead73d50441e890
Reviewed-on: https://gerrit.libreoffice.org/13437
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0400f5bce454..c74fc490b3cc 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -293,14 +293,16 @@ SvStream& ReadPptDocumentAtom(SvStream& rIn, PptDocumentAtom& rAtom) void PptSlideLayoutAtom::Clear() { - eLayout = 0; + eLayout = PptSlideLayout::TITLESLIDE; for ( sal_uInt16 i = 0; i < 8; i++ ) aPlaceholderId[ i ] = 0; } SvStream& ReadPptSlideLayoutAtom( SvStream& rIn, PptSlideLayoutAtom& rAtom ) { - rIn.ReadInt32( rAtom.eLayout ); + sal_Int32 nTmp; + rIn.ReadInt32(nTmp); + rAtom.eLayout = static_cast<PptSlideLayout>(nTmp); rIn.Read( rAtom.aPlaceholderId, 8 ); return rIn; } @@ -988,7 +990,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi case TSS_TYPE_PAGETITLE : case TSS_TYPE_TITLE : { - if ( GetSlideLayoutAtom()->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE ) + if ( GetSlideLayoutAtom()->eLayout == PptSlideLayout::TITLEMASTERSLIDE ) nDestinationInstance = TSS_TYPE_TITLE; else nDestinationInstance = TSS_TYPE_PAGETITLE; |