diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2013-05-10 19:48:06 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2013-05-13 10:50:02 +0200 |
| commit | a6b3cc0212a13615909be47dd06d537d5d9429d5 (patch) | |
| tree | 867f05f6d4bb516d325113d8d4f04f5f3255b2b0 /sd | |
| parent | 71fa700450e6fee186bc117e6d95a382d53ad2c4 (diff) | |
bnc#758621: Kill unused aPlacementId, it is never set.
Based on work of Felix Zhang <fezhang@suse.com>, thank you!
Change-Id: I733a2b69d01f86bcaf0fa401671d475d9b4641a6
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 8fa0545e430f..9d5b20e7e66a 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -2311,6 +2311,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 ) @@ -2390,7 +2391,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 ); @@ -2409,7 +2410,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 { |