summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filter/source/msfilter/svdfppt.cxx80
-rw-r--r--include/filter/msfilter/svdfppt.hxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx64
3 files changed, 74 insertions, 74 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index c9997744421b..32061a83a7c6 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1316,11 +1316,11 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
m_pMasterPages ( nullptr ),
m_pSlidePages ( nullptr ),
m_pNotePages ( nullptr ),
- nAktPageNum ( 0 ),
+ nCurrentPageNum ( 0 ),
nDocStreamPos ( 0 ),
nPageColorsNum ( 0xFFFF ),
ePageColorsKind ( PPT_MASTERPAGE ),
- eAktPageKind ( PPT_MASTERPAGE )
+ eCurrentPageKind ( PPT_MASTERPAGE )
{
if ( bOk )
{
@@ -1887,7 +1887,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
if ( !pRet && ( rOe.nType == PPT_PST_ExControl ) )
{
uno::Reference< frame::XModel > xModel( rOe.pShell->GetModel() );
- PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, eAktPageKind );
+ PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, eCurrentPageKind );
css::uno::Reference< css::drawing::XShape > xShape;
if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) )
pRet = GetSdrObjectFromXShape( xShape );
@@ -2420,19 +2420,19 @@ bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream&
sal_uInt32 SdrPowerPointImport::GetAktPageId()
{
- PptSlidePersistList* pList = GetPageList( eAktPageKind );
- if ( pList && nAktPageNum < pList->size() )
- return (*pList)[ nAktPageNum ].aPersistAtom.nSlideId;
+ PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
+ if ( pList && nCurrentPageNum < pList->size() )
+ return (*pList)[ nCurrentPageNum ].aPersistAtom.nSlideId;
return 0;
}
bool SdrPowerPointImport::SeekToAktPage( DffRecordHeader* pRecHd ) const
{
bool bRet = false;
- PptSlidePersistList* pList = GetPageList( eAktPageKind );
- if ( pList && ( nAktPageNum < pList->size() ) )
+ PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
+ if ( pList && ( nCurrentPageNum < pList->size() ) )
{
- sal_uLong nPersist = (*pList)[ static_cast<sal_uInt16>(nAktPageNum) ].aPersistAtom.nPsrReference;
+ sal_uLong nPersist = (*pList)[ static_cast<sal_uInt16>(nCurrentPageNum) ].aPersistAtom.nPsrReference;
if ( nPersist > 0 && nPersist < nPersistPtrCnt )
{
sal_uLong nFPos = 0;
@@ -2459,8 +2459,8 @@ sal_uInt16 SdrPowerPointImport::GetPageCount( PptPageKind ePageKind ) const
void SdrPowerPointImport::SetPageNum( sal_uInt16 nPageNum, PptPageKind eKind )
{
- eAktPageKind = eKind;
- nAktPageNum = nPageNum;
+ eCurrentPageKind = eKind;
+ nCurrentPageNum = nPageNum;
pPPTStyleSheet = nullptr;
@@ -2497,7 +2497,7 @@ void SdrPowerPointImport::SetPageNum( sal_uInt16 nPageNum, PptPageKind eKind )
Size SdrPowerPointImport::GetPageSize() const
{
- Size aRet( IsNoteOrHandout( nAktPageNum ) ? aDocAtom.GetNotesPageSize() : aDocAtom.GetSlidesPageSize() );
+ Size aRet( IsNoteOrHandout( nCurrentPageNum ) ? aDocAtom.GetNotesPageSize() : aDocAtom.GetSlidesPageSize() );
Scale( aRet );
// PPT works with units of 576 dpi in any case. To avoid inaccuracies
// I do round the last decimal digit away.
@@ -2527,14 +2527,14 @@ Size SdrPowerPointImport::GetPageSize() const
bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const
{
- if ( nPageColorsNum != nAktPageNum || ePageColorsKind != eAktPageKind )
+ if ( nPageColorsNum != nCurrentPageNum || ePageColorsKind != eCurrentPageKind )
{
sal_uInt16 nSlideFlags = 0;
- PptSlidePersistList* pPageList = GetPageList( eAktPageKind );
- if ( pPageList && ( nAktPageNum < pPageList->size() ) )
+ PptSlidePersistList* pPageList = GetPageList( eCurrentPageKind );
+ if ( pPageList && ( nCurrentPageNum < pPageList->size() ) )
{
- assert( !pPageList->is_null( nAktPageNum ) );
- const PptSlidePersistEntry& rE = (*pPageList)[ nAktPageNum ];
+ assert( !pPageList->is_null( nCurrentPageNum ) );
+ const PptSlidePersistEntry& rE = (*pPageList)[ nCurrentPageNum ];
nSlideFlags = rE.aSlideAtom.nFlags;
if ( ! ( nSlideFlags & 2 ) )
const_cast<SdrPowerPointImport*>(this)->aPageColors = rE.aColorScheme;
@@ -2545,13 +2545,13 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor )
if ( pPageList2 )
{
PptSlidePersistEntry* pMasterPersist = nullptr;
- if ( eAktPageKind == PPT_MASTERPAGE )
- pMasterPersist = &(*pPageList2)[ nAktPageNum ];
+ if ( eCurrentPageKind == PPT_MASTERPAGE )
+ pMasterPersist = &(*pPageList2)[ nCurrentPageNum ];
else
{
- if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
+ if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
if ( nMasterNum < pPageList2->size() )
pMasterPersist = &(*pPageList2)[ nMasterNum ];
}
@@ -2577,8 +2577,8 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor )
}
}
// register current color scheme
- const_cast<SdrPowerPointImport*>(this)->nPageColorsNum = nAktPageNum;
- const_cast<SdrPowerPointImport*>(this)->ePageColorsKind = eAktPageKind;
+ const_cast<SdrPowerPointImport*>(this)->nPageColorsNum = nCurrentPageNum;
+ const_cast<SdrPowerPointImport*>(this)->ePageColorsKind = eCurrentPageKind;
}
rColor = aPageColors.GetColor( nNum );
return true;
@@ -2593,9 +2593,9 @@ bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal_uIn
PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
if ( rPersistEntry.ePageKind == PPT_SLIDEPAGE )
{
- if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
+ if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && ( nMasterNum < pPageList->size() ) )
{
@@ -2735,10 +2735,10 @@ void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, SdrPage*
void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* pMasterPersist )
{
sal_uInt32 nMerk = rStCtrl.Tell();
- PptSlidePersistList* pList = GetPageList( eAktPageKind );
- if ( ( !pList ) || ( pList->size() <= nAktPageNum ) )
+ PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
+ if ( ( !pList ) || ( pList->size() <= nCurrentPageNum ) )
return;
- PptSlidePersistEntry& rSlidePersist = (*pList)[ nAktPageNum ];
+ PptSlidePersistEntry& rSlidePersist = (*pList)[ nCurrentPageNum ];
if ( rSlidePersist.bStarDrawFiller )
return;
@@ -2796,9 +2796,9 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
tools::Rectangle aPageSize( Point(), pRet->GetSize() );
if ( rSlidePersist.aSlideAtom.nFlags & 4 ) // follow master background?
{
- if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
+ if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
PptSlidePersistEntry* pE = &(*pPageList)[ nMasterNum ];
while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId )
@@ -2960,19 +2960,19 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
const PptSlideLayoutAtom* SdrPowerPointImport::GetSlideLayoutAtom() const
{
- PptSlidePersistList* pPageList = GetPageList( eAktPageKind );
- if ( pPageList && nAktPageNum < pPageList->size() )
+ PptSlidePersistList* pPageList = GetPageList( eCurrentPageKind );
+ if ( pPageList && nCurrentPageNum < pPageList->size() )
{
- assert( !pPageList->is_null( nAktPageNum ) );
- return &(*pPageList)[ nAktPageNum ].aSlideAtom.aLayout;
+ assert( !pPageList->is_null( nCurrentPageNum ) );
+ return &(*pPageList)[ nCurrentPageNum ].aSlideAtom.aLayout;
}
return nullptr;
}
bool SdrPowerPointImport::IsNoteOrHandout( sal_uInt16 nPageNum ) const
{
- bool bNote = eAktPageKind == PPT_NOTEPAGE;
- if ( eAktPageKind == PPT_MASTERPAGE )
+ bool bNote = eCurrentPageKind == PPT_NOTEPAGE;
+ if ( eCurrentPageKind == PPT_MASTERPAGE )
bNote = ( nPageNum & 1 ) == 0;
return bNote;
}
@@ -6544,7 +6544,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
nTextRulerAtomOfs = 0xffffffff;
sal_uInt32 nInstance = 0;
- switch( rSdrPowerPointImport.eAktPageKind )
+ switch( rSdrPowerPointImport.eCurrentPageKind )
{
case PPT_NOTEPAGE :
nInstance++;
@@ -6601,10 +6601,10 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
rIn.Seek( nOldPos );
}
// now pHd points to the right SlideListWithText Container
- PptSlidePersistList* pPageList = rSdrPowerPointImport.GetPageList( rSdrPowerPointImport.eAktPageKind );
+ PptSlidePersistList* pPageList = rSdrPowerPointImport.GetPageList( rSdrPowerPointImport.eCurrentPageKind );
PptSlidePersistEntry* pE = nullptr;
- if ( pPageList && ( rSdrPowerPointImport.nAktPageNum < pPageList->size() ) )
- pE = &(*pPageList)[ rSdrPowerPointImport.nAktPageNum ];
+ if ( pPageList && ( rSdrPowerPointImport.nCurrentPageNum < pPageList->size() ) )
+ pE = &(*pPageList)[ rSdrPowerPointImport.nCurrentPageNum ];
if ( (!pE) || (!pE->nSlidePersistStartOffset) || ( pE->aPersistAtom.nSlideId != nSlideId ) )
bStatus = false;
else
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index fe6a294cd9b1..f125dc1b9604 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -569,11 +569,11 @@ protected:
std::unique_ptr<PptSlidePersistList> m_pMasterPages;
std::unique_ptr<PptSlidePersistList> m_pSlidePages;
std::unique_ptr<PptSlidePersistList> m_pNotePages;
- sal_uInt16 nAktPageNum;
+ sal_uInt16 nCurrentPageNum;
sal_uLong nDocStreamPos;
sal_uInt16 nPageColorsNum;
PptPageKind ePageColorsKind;
- PptPageKind eAktPageKind;
+ PptPageKind eCurrentPageKind;
protected:
using SdrEscherImport::ReadObjText;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 249de3d1d09e..c48f08287982 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -578,11 +578,11 @@ bool ImplSdPPTImport::Import()
SdPage* pPage = static_cast<SdPage*>(MakeBlancPage( true ));
if ( pPage )
{
- bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ].bNotesMaster;
- bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ].bStarDrawFiller;
+ bool bNotesMaster = (*GetPageList( eCurrentPageKind ) )[ nCurrentPageNum ].bNotesMaster;
+ bool bStarDrawFiller = (*GetPageList( eCurrentPageKind ) )[ nCurrentPageNum ].bStarDrawFiller;
PageKind ePgKind = bNotesMaster ? PageKind::Notes : PageKind::Standard;
- bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ].bHandoutMaster;
+ bool bHandout = (*GetPageList( eCurrentPageKind ) )[ nCurrentPageNum ].bHandoutMaster;
if ( bHandout )
ePgKind = PageKind::Handout;
@@ -728,19 +728,19 @@ bool ImplSdPPTImport::Import()
SetPageNum( i, PPT_MASTERPAGE );
// importing master page objects
- PptSlidePersistList* pList = GetPageList( eAktPageKind );
- PptSlidePersistEntry* pPersist = ( pList && ( nAktPageNum < pList->size() ) )
- ? &(*pList)[ nAktPageNum ] : nullptr;
+ PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
+ PptSlidePersistEntry* pPersist = ( pList && ( nCurrentPageNum < pList->size() ) )
+ ? &(*pList)[ nCurrentPageNum ] : nullptr;
if ( pPersist )
{
- if ( pPersist->bStarDrawFiller && pPersist->bNotesMaster && ( nAktPageNum > 2 ) && ( ( nAktPageNum & 1 ) == 0 ) )
+ if ( pPersist->bStarDrawFiller && pPersist->bNotesMaster && ( nCurrentPageNum > 2 ) && ( ( nCurrentPageNum & 1 ) == 0 ) )
{
- pSdrModel->DeleteMasterPage( nAktPageNum );
+ pSdrModel->DeleteMasterPage( nCurrentPageNum );
SdrPage* pNotesClone = static_cast<SdPage*>(pSdrModel->GetMasterPage( 2 ))->Clone();
- pSdrModel->InsertMasterPage( pNotesClone, nAktPageNum );
+ pSdrModel->InsertMasterPage( pNotesClone, nCurrentPageNum );
if ( pNotesClone )
{
- OUString aLayoutName( static_cast<SdPage*>(pSdrModel->GetMasterPage( nAktPageNum - 1 ))->GetLayoutName() );
+ OUString aLayoutName( static_cast<SdPage*>(pSdrModel->GetMasterPage( nCurrentPageNum - 1 ))->GetLayoutName() );
static_cast<SdPage*>(pNotesClone)->SetPresentationLayout( aLayoutName, false, false );
static_cast<SdPage*>(pNotesClone)->SetLayoutName( aLayoutName );
}
@@ -767,7 +767,7 @@ bool ImplSdPPTImport::Import()
pMPage->NbcInsertObject( pObj );
bool bNewAnimationsUsed = false;
- ProcessData aProcessData( (*pList)[ nAktPageNum ], SdPageCapsule(pMPage) );
+ ProcessData aProcessData( (*pList)[ nCurrentPageNum ], SdPageCapsule(pMPage) );
sal_uInt32 nFPosMerk = rStCtrl.Tell();
DffRecordHeader aPageHd;
if ( SeekToAktPage( &aPageHd ) )
@@ -901,8 +901,8 @@ bool ImplSdPPTImport::Import()
// importing slide pages
{
sal_uInt32 nFPosMerk = rStCtrl.Tell();
- PptPageKind ePageKind = eAktPageKind;
- sal_uInt16 nPageNum = nAktPageNum;
+ PptPageKind ePageKind = eCurrentPageKind;
+ sal_uInt16 nPageNum = nCurrentPageNum;
SdPage* pHandoutPage = static_cast<SdPage*>(MakeBlancPage( false ));
pHandoutPage->SetPageKind( PageKind::Handout );
@@ -919,7 +919,7 @@ bool ImplSdPPTImport::Import()
PptSlidePersistEntry* pMasterPersist = nullptr;
if ( HasMasterPage( nPage ) ) // try to get the LayoutName from the masterpage
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
pPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nMasterNum));
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && nMasterNum < pPageList->size() )
@@ -991,7 +991,7 @@ bool ImplSdPPTImport::Import()
}
// creating the corresponding note page
- eAktPageKind = PPT_NOTEPAGE;
+ eCurrentPageKind = PPT_NOTEPAGE;
SdPage* pNotesPage = static_cast<SdPage*>(MakeBlancPage( false ));
sal_uInt16 nNotesMasterNum = GetMasterPageIndex( nPage ) + 1;
sal_uInt32 nNotesPageId = GetNotesPageId( nPage );
@@ -1036,7 +1036,7 @@ bool ImplSdPPTImport::Import()
else
{
// that can happen by document templates
- eAktPageKind = PPT_SLIDEPAGE;
+ eCurrentPageKind = PPT_SLIDEPAGE;
SdrPage* pPage = MakeBlancPage( false );
pSdrModel->InsertPage( pPage );
@@ -1064,7 +1064,7 @@ bool ImplSdPPTImport::Import()
}
static_cast<SdPage*>(pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, true, true );
- eAktPageKind = PPT_NOTEPAGE;
+ eCurrentPageKind = PPT_NOTEPAGE;
SdrPage* pNPage = MakeBlancPage( false );
pSdrModel->InsertPage( pNPage );
}
@@ -1413,17 +1413,17 @@ bool ImplSdPPTImport::Import()
void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist )
{
sal_uInt32 i;
- PptSlidePersistList* pList = GetPageList( eAktPageKind );
- if ( ( !pList ) || ( pList->size() <= nAktPageNum ) )
+ PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
+ if ( ( !pList ) || ( pList->size() <= nCurrentPageNum ) )
return;
- PptSlidePersistEntry& rSlidePersist = (*pList)[ nAktPageNum ];
+ PptSlidePersistEntry& rSlidePersist = (*pList)[ nCurrentPageNum ];
HeaderFooterEntry* pHFE = rSlidePersist.xHeaderFooterEntry.get();
if (pHFE)
{
for ( i = 0; i < 4; i++ )
{
bool bVisible = pHFE->IsToDisplay( i );
- if ( ( eAktPageKind == PPT_SLIDEPAGE )
+ if ( ( eCurrentPageKind == PPT_SLIDEPAGE )
&& ( rSlidePersist.aSlideAtom.aLayout.eLayout == PptSlideLayout::TITLESLIDE )
&& ( aDocAtom.bTitlePlaceholdersOmitted ) )
{
@@ -1509,11 +1509,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
// set PageKind at page (up to now only PageKind::Standard or PageKind::Notes)
if ( pPage->GetPageKind() == PageKind::Standard )
{
- PptSlidePersistList* pPersistList = GetPageList( eAktPageKind );
- PptSlidePersistEntry* pActualSlidePersist = ( pPersistList && ( nAktPageNum < pPersistList->size() ) )
- ? &(*pPersistList)[ nAktPageNum ] : nullptr;
+ PptSlidePersistList* pPersistList = GetPageList( eCurrentPageKind );
+ PptSlidePersistEntry* pActualSlidePersist = ( pPersistList && ( nCurrentPageNum < pPersistList->size() ) )
+ ? &(*pPersistList)[ nCurrentPageNum ] : nullptr;
- if ( pActualSlidePersist && ( eAktPageKind == PPT_SLIDEPAGE ) )
+ if ( pActualSlidePersist && ( eCurrentPageKind == PPT_SLIDEPAGE ) )
{
if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ?
{
@@ -1530,7 +1530,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
{
sal_uLong nPageRecEnd = SanitizeEndPos(rStCtrl, aPageRecHd.GetRecEndFilePos());
- bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE );
+ bool bTryTwice = ( eCurrentPageKind == PPT_SLIDEPAGE );
bool bSSSlideInfoAtom = false;
while ( true )
{
@@ -1543,7 +1543,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
case PPT_PST_SSSlideInfoAtom:
{
bSSSlideInfoAtom = true;
- if ( eAktPageKind == PPT_MASTERPAGE )
+ if ( eCurrentPageKind == PPT_MASTERPAGE )
{
if ( pActualSlidePersist )
pActualSlidePersist->aPersistAtom.nReserved = aHd.GetRecBegFilePos();
@@ -1813,9 +1813,9 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
if ( bTryTwice && !bSSSlideInfoAtom )
{
bTryTwice = false;
- if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
+ if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && ( nMasterNum < pPageList->size() ) )
{
@@ -2298,7 +2298,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
if ( pPlaceHolder && pPlaceHolder->nPlaceholderId != PptPlaceholder::NONE )
{
- if ( eAktPageKind == PPT_MASTERPAGE )
+ if ( eCurrentPageKind == PPT_MASTERPAGE )
{
bool bCreatePlaceHolder = ( pTextObj->GetInstance() != TSS_Type::Unused );
bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) || (ePresKind == PRESOBJ_FOOTER)
@@ -2355,7 +2355,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
else
{
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
- if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) )
+ if ( pSlideLayout || ( eCurrentPageKind == PPT_NOTEPAGE ) )
{
sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId;
PptPlaceholder nPlaceholderId = pPlaceHolder->nPlaceholderId;
@@ -2445,7 +2445,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
pPresObj->SetMergedItemSet(aSet);
- if ((eAktPageKind != PPT_NOTEPAGE) && (nPlacementId != 0xffffffff) && pPage->TRG_HasMasterPage())
+ if ((eCurrentPageKind != PPT_NOTEPAGE) && (nPlacementId != 0xffffffff) && pPage->TRG_HasMasterPage())
{
SdrObject* pTitleObj = static_cast<SdPage&>(pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE );
SdrObject* pOutlineObj = static_cast<SdPage&>(pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE );
generated by cgit (git 2.34.1) at 2024-07-06 05:31:25 +0000