diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-05-10 19:48:06 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-13 11:02:10 +0200 |
| commit | f829f34cff62c60a25b2c05015c4d1deb568fd6b (patch) | |
| tree | 390d77252b8b0e45823097e08b7fd80958bdbbf9 | |
| parent | Bump for 3.6-21 (diff) | |
| download | core-f829f34cff62c60a25b2c05015c4d1deb568fd6b.tar.gz core-f829f34cff62c60a25b2c05015c4d1deb568fd6b.zip | |
bnc#758621: Kill unused aPlacementId, it is never set.
Based on work of Felix Zhang <fezhang@suse.com>, thank you!
Change-Id: I733a2b69d01f86bcaf0fa401671d475d9b4641a6
| -rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 1 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 3 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 8a6d1edbc452..da82d7fbca9a 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -206,7 +206,6 @@ struct PptSlideLayoutAtom { sal_Int32 eLayout; // 0..18 sal_uInt8 aPlaceholderId[ 8 ]; - sal_uLong aPlacementId[ 8 ]; public: PptSlideLayoutAtom() { Clear(); } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f6eb87a6b59e..487055989d6a 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -295,10 +295,7 @@ void PptSlideLayoutAtom::Clear() { eLayout = 0; for ( sal_uInt16 i = 0; i < 8; i++ ) - { aPlaceholderId[ i ] = 0; - aPlacementId[ i ] = 0; - } } SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom ) diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index e456a4e1b5f9..f587b06da0bd 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2330,6 +2330,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) ) { + sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId; sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId; sal_uInt16 i = 0; if ( eAktPageKind == PPT_SLIDEPAGE ) @@ -2409,7 +2410,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj ApplyAttributes( rStCtrl, aSet ); pPresObj->SetMergedItemSet(aSet); - if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (sal_uLong)-1 ) ) + if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( nPlacementId != 0xffffffff ) ) { SdrObject* pTitleObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE ); SdrObject* pOutlineObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE ); @@ -2428,7 +2429,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj Rectangle aLogicRect( pPresObj->GetLogicRect() ); Size aLogicSize( aLogicRect.GetSize() ); - switch ( pSlideLayout->aPlacementId[ i ] ) + switch ( nPlacementId ) { case 0 : // Lage im Titelbereich { |