[Libreoffice-commits] core.git: filter/source include/filter sd/source
Julien Nabet (via logerrit)
logerrit at kemper.freedesktop.org
Mon Sep 9 13:35:00 UTC 2019
filter/source/msfilter/svdfppt.cxx | 226 ++++++++++++++++++------------------
include/filter/msfilter/svdfppt.hxx | 26 ++--
sd/source/filter/ppt/pptin.cxx | 108 ++++++++---------
3 files changed, 180 insertions(+), 180 deletions(-)
New commits:
commit b32ac08a12380228202c396fba36d8ecd85252da
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Sep 8 13:10:33 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Sep 9 15:34:19 2019 +0200
sd: prefix members of SdrPowerPointImport
Change-Id: Ia758c5c5bb0c448a5e051557c3ae48e8349c0c92
Reviewed-on: https://gerrit.libreoffice.org/78762
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 3d47c924bc66..92b8a7392dcd 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1328,16 +1328,16 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const OUString& rBaseURL ) :
SdrEscherImport ( rParam, rBaseURL ),
- bOk ( rStCtrl.GetErrorCode() == ERRCODE_NONE ),
- nPersistPtrCnt ( 0 ),
- pDefaultSheet ( nullptr ),
- nCurrentPageNum ( 0 ),
- nDocStreamPos ( 0 ),
- nPageColorsNum ( 0xFFFF ),
- ePageColorsKind ( PPT_MASTERPAGE ),
- eCurrentPageKind ( PPT_MASTERPAGE )
+ m_bOk ( rStCtrl.GetErrorCode() == ERRCODE_NONE ),
+ m_nPersistPtrCnt ( 0 ),
+ m_pDefaultSheet ( nullptr ),
+ m_nCurrentPageNum ( 0 ),
+ m_nDocStreamPos ( 0 ),
+ m_nPageColorsNum ( 0xFFFF ),
+ m_ePageColorsKind ( PPT_MASTERPAGE ),
+ m_eCurrentPageKind ( PPT_MASTERPAGE )
{
- if ( bOk )
+ if ( m_bOk )
{
rStCtrl.Seek( STREAM_SEEK_TO_END );
nStreamLen = rStCtrl.Tell();
@@ -1346,9 +1346,9 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
sal_uInt32 nCurrentUserEdit = rParam.aCurrentUserAtom.nCurrentUserEdit;
if (nCurrentUserEdit && checkSeek(rStCtrl, nCurrentUserEdit))
{
- ReadPptUserEditAtom( rStCtrl, aUserEditAtom );
+ ReadPptUserEditAtom( rStCtrl, m_aUserEditAtom );
}
- if ( !aUserEditAtom.nOffsetPersistDirectory )
+ if ( !m_aUserEditAtom.nOffsetPersistDirectory )
{ // if there is no UserEditAtom try to search the last one
rStCtrl.Seek( 0 );
@@ -1360,34 +1360,34 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
if ( pHd->nRecType == PPT_PST_UserEditAtom )
{
pHd->SeekToBegOfRecord( rStCtrl );
- ReadPptUserEditAtom( rStCtrl, aUserEditAtom );
+ ReadPptUserEditAtom( rStCtrl, m_aUserEditAtom );
break;
}
}
if ( !pHd )
- bOk = false;
+ m_bOk = false;
}
}
if ( rStCtrl.GetError() != ERRCODE_NONE )
- bOk = false;
+ m_bOk = false;
- if ( bOk )
+ if ( m_bOk )
{
- nPersistPtrCnt = aUserEditAtom.nMaxPersistWritten + 1;
- if ( ( nPersistPtrCnt >> 2 ) > nStreamLen ) // sj: at least nPersistPtrCnt is not allowed to be greater than filesize
- bOk = false; // (it should not be greater than the PPT_PST_PersistPtrIncrementalBlock, but
+ m_nPersistPtrCnt = m_aUserEditAtom.nMaxPersistWritten + 1;
+ if ( ( m_nPersistPtrCnt >> 2 ) > nStreamLen ) // sj: at least m_nPersistPtrCnt is not allowed to be greater than filesize
+ m_bOk = false; // (it should not be greater than the PPT_PST_PersistPtrIncrementalBlock, but
// we are reading this block later, so we do not have access yet)
- if ( bOk && ( nPersistPtrCnt < ( SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) -1 ) )
- pPersistPtr.reset( new (std::nothrow) sal_uInt32[ nPersistPtrCnt + 1 ] );
- if ( !pPersistPtr )
- bOk = false;
- if ( bOk )
+ if ( m_bOk && ( m_nPersistPtrCnt < ( SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) -1 ) )
+ m_pPersistPtr.reset( new (std::nothrow) sal_uInt32[ m_nPersistPtrCnt + 1 ] );
+ if ( !m_pPersistPtr )
+ m_bOk = false;
+ if ( m_bOk )
{
- memset( pPersistPtr.get(), 0x00, (nPersistPtrCnt+1) * sizeof(sal_uInt32) );
+ memset( m_pPersistPtr.get(), 0x00, (m_nPersistPtrCnt+1) * sizeof(sal_uInt32) );
// SJ: new search mechanism from bottom to top (Issue 21122)
- PptUserEditAtom aCurrentEditAtom( aUserEditAtom );
+ PptUserEditAtom aCurrentEditAtom( m_aUserEditAtom );
sal_uInt32 nCurrentEditAtomStrmPos = aCurrentEditAtom.aHd.GetRecEndFilePos();
while( nCurrentEditAtomStrmPos )
{
@@ -1399,33 +1399,33 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
if ( aPersistHd.nRecType == PPT_PST_PersistPtrIncrementalBlock )
{
sal_uLong nPibLen = aPersistHd.GetRecEndFilePos();
- while (bOk && rStCtrl.good() && (rStCtrl.Tell() < nPibLen))
+ while (m_bOk && rStCtrl.good() && (rStCtrl.Tell() < nPibLen))
{
sal_uInt32 nOfs(0);
rStCtrl.ReadUInt32( nOfs );
sal_uInt32 nCnt = nOfs;
nOfs &= 0x000FFFFF;
nCnt >>= 20;
- while (bOk && rStCtrl.good() && (nCnt > 0) && (nOfs <= nPersistPtrCnt))
+ while (m_bOk && rStCtrl.good() && (nCnt > 0) && (nOfs <= m_nPersistPtrCnt))
{
sal_uInt32 nPt(0);
rStCtrl.ReadUInt32( nPt );
- if ( !pPersistPtr[ nOfs ] )
+ if ( !m_pPersistPtr[ nOfs ] )
{
- pPersistPtr[ nOfs ] = nPt;
- if ( pPersistPtr[ nOfs ] > nStreamLen )
+ m_pPersistPtr[ nOfs ] = nPt;
+ if ( m_pPersistPtr[ nOfs ] > nStreamLen )
{
- bOk = false;
+ m_bOk = false;
OSL_FAIL("SdrPowerPointImport::Ctor(): Invalid Entry in Persist-Directory!");
}
}
nCnt--;
nOfs++;
}
- if ( bOk && nCnt > 0 )
+ if ( m_bOk && nCnt > 0 )
{
OSL_FAIL("SdrPowerPointImport::Ctor(): Not all entries of Persist-Directory read!");
- bOk = false;
+ m_bOk = false;
}
}
}
@@ -1439,28 +1439,28 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
}
}
if ( rStCtrl.GetError() != ERRCODE_NONE )
- bOk = false;
- if ( bOk )
+ m_bOk = false;
+ if ( m_bOk )
{ // check Document PersistEntry
- nDocStreamPos = aUserEditAtom.nDocumentRef;
- if ( nDocStreamPos > nPersistPtrCnt )
+ m_nDocStreamPos = m_aUserEditAtom.nDocumentRef;
+ if ( m_nDocStreamPos > m_nPersistPtrCnt )
{
- OSL_FAIL("SdrPowerPointImport::Ctor(): aUserEditAtom.nDocumentRef invalid!");
- bOk = false;
+ OSL_FAIL("SdrPowerPointImport::Ctor(): m_aUserEditAtom.nDocumentRef invalid!");
+ m_bOk = false;
}
}
- if ( bOk )
+ if ( m_bOk )
{ // check Document FilePos
- nDocStreamPos = pPersistPtr[ nDocStreamPos ];
- if ( nDocStreamPos >= nStreamLen )
+ m_nDocStreamPos = m_pPersistPtr[ m_nDocStreamPos ];
+ if ( m_nDocStreamPos >= nStreamLen )
{
- OSL_FAIL("SdrPowerPointImport::Ctor(): nDocStreamPos >= nStreamLen!");
- bOk = false;
+ OSL_FAIL("SdrPowerPointImport::Ctor(): m_nDocStreamPos >= nStreamLen!");
+ m_bOk = false;
}
}
- if ( bOk )
+ if ( m_bOk )
{
- rStCtrl.Seek( nDocStreamPos );
+ rStCtrl.Seek( m_nDocStreamPos );
aDocRecManager.Consume( rStCtrl );
DffRecordHeader aDocHd;
@@ -1474,9 +1474,9 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
ReadPptDocumentAtom( rStCtrl, aDocAtom );
}
else
- bOk = false;
+ m_bOk = false;
- if ( bOk )
+ if ( m_bOk )
{
if (!m_pFonts)
ReadFontCollection();
@@ -1581,9 +1581,9 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
{
PptSlidePersistEntry& rE2 = (*pPageList)[ nPageNum ];
sal_uLong nPersist = rE2.aPersistAtom.nPsrReference;
- if ( ( nPersist > 0 ) && ( nPersist < nPersistPtrCnt ) )
+ if ( ( nPersist > 0 ) && ( nPersist < m_nPersistPtrCnt ) )
{
- sal_uLong nFPos = pPersistPtr[ nPersist ];
+ sal_uLong nFPos = m_pPersistPtr[ nPersist ];
if ( nFPos < nStreamLen )
{
rStCtrl.Seek( nFPos );
@@ -1625,7 +1625,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
aTxSI = aTxSIStyle.aList[ 0 ];
rE2.xStyleSheet.reset(new PPTStyleSheet(aSlideHd, rStCtrl, *this, aTxPFStyle, aTxSI));
- pDefaultSheet = rE2.xStyleSheet.get();
+ m_pDefaultSheet = rE2.xStyleSheet.get();
}
if ( SeekToRec( rStCtrl, PPT_PST_ColorSchemeAtom, aSlideHd.GetRecEndFilePos() ) )
ReadPptColorSchemeAtom( rStCtrl, rE2.aColorScheme );
@@ -1662,9 +1662,9 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O
}
}
}
- if ( ( rStCtrl.GetError() != ERRCODE_NONE ) || ( pDefaultSheet == nullptr ) )
- bOk = false;
- pPPTStyleSheet = pDefaultSheet;
+ if ( ( rStCtrl.GetError() != ERRCODE_NONE ) || ( m_pDefaultSheet == nullptr ) )
+ m_bOk = false;
+ m_pPPTStyleSheet = m_pDefaultSheet;
rStCtrl.Seek( 0 );
}
@@ -1906,7 +1906,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, eCurrentPageKind );
+ PPTConvertOCXControls aPPTConvertOCXControls( this, xModel, m_eCurrentPageKind );
css::uno::Reference< css::drawing::XShape > xShape;
if ( aPPTConvertOCXControls.ReadOCXStream( xObjStor, &xShape ) )
pRet = GetSdrObjectFromXShape( xShape );
@@ -1986,9 +1986,9 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId,
std::unique_ptr<SvMemoryStream> SdrPowerPointImport::ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const
{
std::unique_ptr<SvMemoryStream> pRet;
- if ( nPersistPtr && ( nPersistPtr < nPersistPtrCnt ) )
+ if ( nPersistPtr && ( nPersistPtr < m_nPersistPtrCnt ) )
{
- sal_uInt32 nOldPos, nOfs = pPersistPtr[ nPersistPtr ];
+ sal_uInt32 nOldPos, nOfs = m_pPersistPtr[ nPersistPtr ];
nOldPos = rStCtrl.Tell();
rStCtrl.Seek( nOfs );
DffRecordHeader aHd;
@@ -2078,9 +2078,9 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
tools::SvRef<SotStorageStream> xOriginal = xSubVBA->OpenSotStream( "_MS_VBA_Overhead2" );
if ( xOriginal.is() && ( xOriginal->GetError() == ERRCODE_NONE ) )
{
- if ( nPersistPtr && ( nPersistPtr < nPersistPtrCnt ) )
+ if ( nPersistPtr && ( nPersistPtr < m_nPersistPtrCnt ) )
{
- rStCtrl.Seek( pPersistPtr[ nPersistPtr ] );
+ rStCtrl.Seek( m_pPersistPtr[ nPersistPtr ] );
ReadDffRecordHeader( rStCtrl, *pHd );
xOriginal->WriteUInt32( nIDoNotKnow1 )
@@ -2138,10 +2138,10 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt
PptExOleObjAtom aAt;
ReadPptExOleObjAtom( rStCtrl, aAt );
- if ( aAt.nPersistPtr && ( aAt.nPersistPtr < nPersistPtrCnt ) )
+ if ( aAt.nPersistPtr && ( aAt.nPersistPtr < m_nPersistPtrCnt ) )
{
sal_uInt32 nId;
- rStCtrl.Seek( pPersistPtr[ aAt.nPersistPtr ] );
+ rStCtrl.Seek( m_pPersistPtr[ aAt.nPersistPtr ] );
DffRecordHeader aHd;
ReadDffRecordHeader( rStCtrl, aHd );
if ( aHd.nRecType == DFF_PST_ExOleObjStg )
@@ -2374,7 +2374,7 @@ bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const
{
bool bRet;
sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it should the situation arise
- rStCtrl.Seek( nDocStreamPos );
+ rStCtrl.Seek( m_nDocStreamPos );
DffRecordHeader aDocHd;
ReadDffRecordHeader( rStCtrl, aDocHd );
bRet = aDocHd.nRecType == PPT_PST_Document;
@@ -2442,22 +2442,22 @@ bool SdrPowerPointImport::SeekToContentOfProgTag( sal_Int32 nVersion, SvStream&
sal_uInt32 SdrPowerPointImport::GetCurrentPageId()
{
- PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
- if ( pList && nCurrentPageNum < pList->size() )
- return (*pList)[ nCurrentPageNum ].aPersistAtom.nSlideId;
+ PptSlidePersistList* pList = GetPageList( m_eCurrentPageKind );
+ if ( pList && m_nCurrentPageNum < pList->size() )
+ return (*pList)[ m_nCurrentPageNum ].aPersistAtom.nSlideId;
return 0;
}
bool SdrPowerPointImport::SeekToCurrentPage( DffRecordHeader* pRecHd ) const
{
bool bRet = false;
- PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
- if ( pList && ( nCurrentPageNum < pList->size() ) )
+ PptSlidePersistList* pList = GetPageList( m_eCurrentPageKind );
+ if ( pList && ( m_nCurrentPageNum < pList->size() ) )
{
- sal_uLong nPersist = (*pList)[ nCurrentPageNum ].aPersistAtom.nPsrReference;
- if ( nPersist > 0 && nPersist < nPersistPtrCnt )
+ sal_uLong nPersist = (*pList)[ m_nCurrentPageNum ].aPersistAtom.nPsrReference;
+ if ( nPersist > 0 && nPersist < m_nPersistPtrCnt )
{
- sal_uLong nFPos = pPersistPtr[ nPersist ];
+ sal_uLong nFPos = m_pPersistPtr[ nPersist ];
if ( nFPos < nStreamLen )
{
rStCtrl.Seek( nFPos );
@@ -2480,10 +2480,10 @@ sal_uInt16 SdrPowerPointImport::GetPageCount( PptPageKind ePageKind ) const
void SdrPowerPointImport::SetPageNum( sal_uInt16 nPageNum, PptPageKind eKind )
{
- eCurrentPageKind = eKind;
- nCurrentPageNum = nPageNum;
+ m_eCurrentPageKind = eKind;
+ m_nCurrentPageNum = nPageNum;
- pPPTStyleSheet = nullptr;
+ m_pPPTStyleSheet = nullptr;
bool bHasMasterPage = true;
sal_uInt16 nMasterIndex = 0;
@@ -2509,16 +2509,16 @@ void SdrPowerPointImport::SetPageNum( sal_uInt16 nPageNum, PptPageKind eKind )
if ( nMasterIndex != PPTSLIDEPERSIST_ENTRY_NOTFOUND )
pMasterPersist = &(*pPageList)[ nMasterIndex ];
}
- pPPTStyleSheet = pMasterPersist->xStyleSheet.get();
+ m_pPPTStyleSheet = pMasterPersist->xStyleSheet.get();
}
}
- if ( !pPPTStyleSheet )
- pPPTStyleSheet = pDefaultSheet;
+ if ( !m_pPPTStyleSheet )
+ m_pPPTStyleSheet = m_pDefaultSheet;
}
Size SdrPowerPointImport::GetPageSize() const
{
- Size aRet( IsNoteOrHandout( nCurrentPageNum ) ? aDocAtom.GetNotesPageSize() : aDocAtom.GetSlidesPageSize() );
+ Size aRet( IsNoteOrHandout( m_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.
@@ -2548,17 +2548,17 @@ Size SdrPowerPointImport::GetPageSize() const
bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const
{
- if ( nPageColorsNum != nCurrentPageNum || ePageColorsKind != eCurrentPageKind )
+ if ( m_nPageColorsNum != m_nCurrentPageNum || m_ePageColorsKind != m_eCurrentPageKind )
{
sal_uInt16 nSlideFlags = 0;
- PptSlidePersistList* pPageList = GetPageList( eCurrentPageKind );
- if ( pPageList && ( nCurrentPageNum < pPageList->size() ) )
+ PptSlidePersistList* pPageList = GetPageList( m_eCurrentPageKind );
+ if ( pPageList && ( m_nCurrentPageNum < pPageList->size() ) )
{
- assert( !pPageList->is_null( nCurrentPageNum ) );
- const PptSlidePersistEntry& rE = (*pPageList)[ nCurrentPageNum ];
+ assert( !pPageList->is_null( m_nCurrentPageNum ) );
+ const PptSlidePersistEntry& rE = (*pPageList)[ m_nCurrentPageNum ];
nSlideFlags = rE.aSlideAtom.nFlags;
if ( ! ( nSlideFlags & 2 ) )
- const_cast<SdrPowerPointImport*>(this)->aPageColors = rE.aColorScheme;
+ const_cast<SdrPowerPointImport*>(this)->m_aPageColors = rE.aColorScheme;
}
if ( nSlideFlags & 2 ) // follow master colorscheme?
{
@@ -2566,13 +2566,13 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor )
if ( pPageList2 )
{
PptSlidePersistEntry* pMasterPersist = nullptr;
- if ( eCurrentPageKind == PPT_MASTERPAGE )
- pMasterPersist = &(*pPageList2)[ nCurrentPageNum ];
+ if ( m_eCurrentPageKind == PPT_MASTERPAGE )
+ pMasterPersist = &(*pPageList2)[ m_nCurrentPageNum ];
else
{
- if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
+ if ( HasMasterPage( m_nCurrentPageNum, m_eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( m_nCurrentPageNum, m_eCurrentPageKind );
if ( nMasterNum < pPageList2->size() )
pMasterPersist = &(*pPageList2)[ nMasterNum ];
}
@@ -2593,15 +2593,15 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor )
break;
}
}
- const_cast<SdrPowerPointImport*>(this)->aPageColors = pMasterPersist->aColorScheme;
+ const_cast<SdrPowerPointImport*>(this)->m_aPageColors = pMasterPersist->aColorScheme;
}
}
}
// register current color scheme
- const_cast<SdrPowerPointImport*>(this)->nPageColorsNum = nCurrentPageNum;
- const_cast<SdrPowerPointImport*>(this)->ePageColorsKind = eCurrentPageKind;
+ const_cast<SdrPowerPointImport*>(this)->m_nPageColorsNum = m_nCurrentPageNum;
+ const_cast<SdrPowerPointImport*>(this)->m_ePageColorsKind = m_eCurrentPageKind;
}
- rColor = aPageColors.GetColor( nNum );
+ rColor = m_aPageColors.GetColor( nNum );
return true;
}
@@ -2614,9 +2614,9 @@ bool SdrPowerPointImport::SeekToShape( SvStream& rSt, SvxMSDffClientData* pClien
PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
if ( rPersistEntry.ePageKind == PPT_SLIDEPAGE )
{
- if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
+ if ( HasMasterPage( m_nCurrentPageNum, m_eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( m_nCurrentPageNum, m_eCurrentPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && ( nMasterNum < pPageList->size() ) )
{
@@ -2758,10 +2758,10 @@ static void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, Sd
void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry* pMasterPersist )
{
sal_uInt32 nOldPos = rStCtrl.Tell();
- PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
- if ( ( !pList ) || ( pList->size() <= nCurrentPageNum ) )
+ PptSlidePersistList* pList = GetPageList( m_eCurrentPageKind );
+ if ( ( !pList ) || ( pList->size() <= m_nCurrentPageNum ) )
return;
- PptSlidePersistEntry& rSlidePersist = (*pList)[ nCurrentPageNum ];
+ PptSlidePersistEntry& rSlidePersist = (*pList)[ m_nCurrentPageNum ];
if ( rSlidePersist.bStarDrawFiller )
return;
@@ -2819,9 +2819,9 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
tools::Rectangle aPageSize( Point(), pRet->GetSize() );
if ( rSlidePersist.aSlideAtom.nFlags & 4 ) // follow master background?
{
- if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
+ if ( HasMasterPage( m_nCurrentPageNum, m_eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( m_nCurrentPageNum, m_eCurrentPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
PptSlidePersistEntry* pE = &(*pPageList)[ nMasterNum ];
while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId )
@@ -2983,19 +2983,19 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
const PptSlideLayoutAtom* SdrPowerPointImport::GetSlideLayoutAtom() const
{
- PptSlidePersistList* pPageList = GetPageList( eCurrentPageKind );
- if ( pPageList && nCurrentPageNum < pPageList->size() )
+ PptSlidePersistList* pPageList = GetPageList( m_eCurrentPageKind );
+ if ( pPageList && m_nCurrentPageNum < pPageList->size() )
{
- assert( !pPageList->is_null( nCurrentPageNum ) );
- return &(*pPageList)[ nCurrentPageNum ].aSlideAtom.aLayout;
+ assert( !pPageList->is_null( m_nCurrentPageNum ) );
+ return &(*pPageList)[ m_nCurrentPageNum ].aSlideAtom.aLayout;
}
return nullptr;
}
bool SdrPowerPointImport::IsNoteOrHandout( sal_uInt16 nPageNum ) const
{
- bool bNote = eCurrentPageKind == PPT_NOTEPAGE;
- if ( eCurrentPageKind == PPT_MASTERPAGE )
+ bool bNote = m_eCurrentPageKind == PPT_NOTEPAGE;
+ if ( m_eCurrentPageKind == PPT_MASTERPAGE )
bNote = ( nPageNum & 1 ) == 0;
return bNote;
}
@@ -3418,7 +3418,7 @@ bool PPTNumberFormatCreator::ImplGetExtNumberFormat( SdrPowerPointImport const &
const PPTExtParaProv* pParaProv = pExtParaProv.get();
if ( !pExtParaProv )
pParaProv = pPara ? pPara->mrStyleSheet.pExtParaProv.get()
- : rManager.pPPTStyleSheet->pExtParaProv.get();
+ : rManager.m_pPPTStyleSheet->pExtParaProv.get();
if ( pPara )
{
nBuFlags = pPara->mxParaSet->mnExtParagraphMask;
@@ -6491,7 +6491,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
if ( ( pObjData == nullptr ) || ( pObjData->bShapeType ) )
{
- PPTExtParaProv* pExtParaProv = rSdrPowerPointImport.pPPTStyleSheet->pExtParaProv.get();
+ PPTExtParaProv* pExtParaProv = rSdrPowerPointImport.m_pPPTStyleSheet->pExtParaProv.get();
if ( pObjData )
{
mxImplTextObj->mnShapeId = pObjData->nShapeId;
@@ -6544,7 +6544,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
nTextRulerAtomOfs = 0xffffffff;
sal_uInt32 nInstance = 0;
- switch( rSdrPowerPointImport.eCurrentPageKind )
+ switch( rSdrPowerPointImport.m_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.eCurrentPageKind );
+ PptSlidePersistList* pPageList = rSdrPowerPointImport.GetPageList( rSdrPowerPointImport.m_eCurrentPageKind );
PptSlidePersistEntry* pE = nullptr;
- if ( pPageList && ( rSdrPowerPointImport.nCurrentPageNum < pPageList->size() ) )
- pE = &(*pPageList)[ rSdrPowerPointImport.nCurrentPageNum ];
+ if ( pPageList && ( rSdrPowerPointImport.m_nCurrentPageNum < pPageList->size() ) )
+ pE = &(*pPageList)[ rSdrPowerPointImport.m_nCurrentPageNum ];
if ( (!pE) || (!pE->nSlidePersistStartOffset) || ( pE->aPersistAtom.nSlideId != nSlideId ) )
bStatus = false;
else
@@ -6691,7 +6691,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
aClientTextBoxHd.GetRecEndFilePos(), &aTextSpecInfoHd ) )
{
if ( aTextSpecInfoAtomInterpreter.Read( rIn, aTextSpecInfoHd, PPT_PST_TextSpecInfoAtom,
- &(rSdrPowerPointImport.pPPTStyleSheet->maTxSI) ) )
+ &(rSdrPowerPointImport.m_pPPTStyleSheet->maTxSI) ) )
{
size_t nI = 0;
for (const PPTTextSpecInfo& rSpecInfo : aTextSpecInfoAtomInterpreter.aList)
@@ -6870,7 +6870,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
{
PptInteractiveInfoAtom aInteractiveInfoAtom;
ReadPptInteractiveInfoAtom( rIn, aInteractiveInfoAtom );
- for (const SdHyperlinkEntry& rHyperlink : rSdrPowerPointImport.aHyperList)
+ for (const SdHyperlinkEntry& rHyperlink : rSdrPowerPointImport.m_aHyperList)
{
if ( rHyperlink.nIndex == aInteractiveInfoAtom.nExHyperlinkId )
{
@@ -7087,7 +7087,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
mxImplTextObj->maParagraphList[ nCurPos ].reset(
new PPTParagraphObj(
aStyleTextPropReader, nCurPos, nCurCharPos,
- *rSdrPowerPointImport.pPPTStyleSheet,
+ *rSdrPowerPointImport.m_pPPTStyleSheet,
nInstance, aTextRulerInterpreter ) );
sal_uInt32 nParaAdjust, nFlags = 0;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 7252edf58dcb..070aecae01ce 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -555,25 +555,25 @@ protected:
friend struct PPTStyleSheet;
friend class PPTNumberFormatCreator;
- bool bOk;
- PptUserEditAtom aUserEditAtom;
- PptColorSchemeAtom aPageColors;
- ::std::vector< SdHyperlinkEntry > aHyperList;
+ bool m_bOk;
+ PptUserEditAtom m_aUserEditAtom;
+ PptColorSchemeAtom m_aPageColors;
+ ::std::vector< SdHyperlinkEntry > m_aHyperList;
std::unique_ptr<sal_uInt32[]>
- pPersistPtr;
- sal_uInt32 nPersistPtrCnt;
+ m_pPersistPtr;
+ sal_uInt32 m_nPersistPtrCnt;
- const PPTStyleSheet* pPPTStyleSheet; // this is the current stylesheet;
- const PPTStyleSheet* pDefaultSheet; // this is a sheet we are using if no masterpage can be found, but that should
+ const PPTStyleSheet* m_pPPTStyleSheet; // this is the current stylesheet;
+ const PPTStyleSheet* m_pDefaultSheet; // this is a sheet we are using if no masterpage can be found, but that should
// never happen just preventing a crash
std::unique_ptr<PptSlidePersistList> m_pMasterPages;
std::unique_ptr<PptSlidePersistList> m_pSlidePages;
std::unique_ptr<PptSlidePersistList> m_pNotePages;
- sal_uInt16 nCurrentPageNum;
- sal_uLong nDocStreamPos;
- sal_uInt16 nPageColorsNum;
- PptPageKind ePageColorsKind;
- PptPageKind eCurrentPageKind;
+ sal_uInt16 m_nCurrentPageNum;
+ sal_uLong m_nDocStreamPos;
+ sal_uInt16 m_nPageColorsNum;
+ PptPageKind m_ePageColorsKind;
+ PptPageKind m_eCurrentPageKind;
protected:
using SdrEscherImport::ReadObjText;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 27318d8ada61..6a1e57ed40ce 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -168,7 +168,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorag
, mePresChange(PRESCHANGE_MANUAL)
, mnBackgroundObjectsLayerID(0)
{
- if ( !bOk )
+ if ( !m_bOk )
return;
mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader
@@ -223,7 +223,7 @@ ImplSdPPTImport::~ImplSdPPTImport()
// Import
bool ImplSdPPTImport::Import()
{
- if ( !bOk )
+ if ( !m_bOk )
return false;
pSdrModel->setLock(true);
@@ -496,7 +496,7 @@ bool ImplSdPPTImport::Import()
}
}
}
- aHyperList.push_back( aHyperlink );
+ m_aHyperList.push_back( aHyperlink );
}
}
}
@@ -516,7 +516,7 @@ bool ImplSdPPTImport::Import()
if ( SeekToRec( rStCtrl, PPT_PST_ExObjList, maDocHd.GetRecEndFilePos(), &aHyperHd ) )
{
sal_uInt32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos();
- for (SdHyperlinkEntry & entry : aHyperList)
+ for (SdHyperlinkEntry & entry : m_aHyperList)
{
DffRecordHeader aHyperE;
if ( !SeekToRec( rStCtrl, PPT_PST_ExHyperlink, nExObjHyperListLen, &aHyperE ) )
@@ -534,7 +534,7 @@ bool ImplSdPPTImport::Import()
if (pDocShell)
{
Size aVisAreaSize;
- switch ( aUserEditAtom.eLastViewType )
+ switch ( m_aUserEditAtom.eLastViewType )
{
case PptViewTypeEnum::Notes:
case PptViewTypeEnum::NotesMaster:
@@ -568,11 +568,11 @@ bool ImplSdPPTImport::Import()
SdPage* pPage = static_cast<SdPage*>(MakeBlancPage( true ));
if ( pPage )
{
- bool bNotesMaster = (*GetPageList( eCurrentPageKind ) )[ nCurrentPageNum ].bNotesMaster;
- bool bStarDrawFiller = (*GetPageList( eCurrentPageKind ) )[ nCurrentPageNum ].bStarDrawFiller;
+ bool bNotesMaster = (*GetPageList( m_eCurrentPageKind ) )[ m_nCurrentPageNum ].bNotesMaster;
+ bool bStarDrawFiller = (*GetPageList( m_eCurrentPageKind ) )[ m_nCurrentPageNum ].bStarDrawFiller;
PageKind ePgKind = bNotesMaster ? PageKind::Notes : PageKind::Standard;
- bool bHandout = (*GetPageList( eCurrentPageKind ) )[ nCurrentPageNum ].bHandoutMaster;
+ bool bHandout = (*GetPageList( m_eCurrentPageKind ) )[ m_nCurrentPageNum ].bHandoutMaster;
if ( bHandout )
ePgKind = PageKind::Handout;
@@ -591,8 +591,8 @@ bool ImplSdPPTImport::Import()
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
- PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::TextInShape, 0 );
- PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::TextInShape, 0 );
+ PPTParagraphObj aParagraph( *m_pPPTStyleSheet, TSS_Type::TextInShape, 0 );
+ PPTPortionObj aPortion( *m_pPPTStyleSheet, TSS_Type::TextInShape, 0 );
aParagraph.AppendPortion( aPortion );
aParagraph.ApplyTo( rItemSet, oStartNumbering, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
aPortion.ApplyTo( rItemSet, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
@@ -604,8 +604,8 @@ bool ImplSdPPTImport::Import()
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
- PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::TextInShape, 0 );
- PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::TextInShape, 0 );
+ PPTParagraphObj aParagraph( *m_pPPTStyleSheet, TSS_Type::TextInShape, 0 );
+ PPTPortionObj aPortion( *m_pPPTStyleSheet, TSS_Type::TextInShape, 0 );
aParagraph.AppendPortion( aPortion );
aParagraph.ApplyTo( rItemSet, oStartNumbering, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
aPortion.ApplyTo( rItemSet, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
@@ -649,8 +649,8 @@ bool ImplSdPPTImport::Import()
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
- PPTParagraphObj aParagraph( *pPPTStyleSheet, nTitleInstance, 0 );
- PPTPortionObj aPortion( *pPPTStyleSheet, nTitleInstance, 0 );
+ PPTParagraphObj aParagraph( *m_pPPTStyleSheet, nTitleInstance, 0 );
+ PPTPortionObj aPortion( *m_pPPTStyleSheet, nTitleInstance, 0 );
aParagraph.AppendPortion( aPortion );
aParagraph.ApplyTo( rItemSet, oStartNumbering, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
aPortion.ApplyTo( rItemSet, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
@@ -669,9 +669,9 @@ bool ImplSdPPTImport::Import()
DBG_ASSERT( pOutlineSheet, "Template for outline object not found" );
if ( pOutlineSheet )
{
- pParagraphs[ nLevel ] = new PPTParagraphObj( *pPPTStyleSheet, nOutlinerInstance, nLevel );
+ pParagraphs[ nLevel ] = new PPTParagraphObj( *m_pPPTStyleSheet, nOutlinerInstance, nLevel );
SfxItemSet& rItemSet = pOutlineSheet->GetItemSet();
- PPTPortionObj aPortion( *pPPTStyleSheet, nOutlinerInstance, nLevel );
+ PPTPortionObj aPortion( *m_pPPTStyleSheet, nOutlinerInstance, nLevel );
pParagraphs[ nLevel ]->AppendPortion( aPortion );
pParagraphs[ nLevel ]->ApplyTo( rItemSet, oStartNumbering, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
aPortion.ApplyTo( rItemSet, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
@@ -686,8 +686,8 @@ bool ImplSdPPTImport::Import()
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
- PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::Subtitle, 0 );
- PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::Subtitle, 0 );
+ PPTParagraphObj aParagraph( *m_pPPTStyleSheet, TSS_Type::Subtitle, 0 );
+ PPTPortionObj aPortion( *m_pPPTStyleSheet, TSS_Type::Subtitle, 0 );
aParagraph.AppendPortion( aPortion );
aParagraph.ApplyTo( rItemSet, oStartNumbering, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
aPortion.ApplyTo( rItemSet, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
@@ -699,8 +699,8 @@ bool ImplSdPPTImport::Import()
if ( pSheet )
{
SfxItemSet& rItemSet = pSheet->GetItemSet();
- PPTParagraphObj aParagraph( *pPPTStyleSheet, TSS_Type::Notes, 0 );
- PPTPortionObj aPortion( *pPPTStyleSheet, TSS_Type::Notes, 0 );
+ PPTParagraphObj aParagraph( *m_pPPTStyleSheet, TSS_Type::Notes, 0 );
+ PPTPortionObj aPortion( *m_pPPTStyleSheet, TSS_Type::Notes, 0 );
aParagraph.AppendPortion( aPortion );
aParagraph.ApplyTo( rItemSet, oStartNumbering, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
aPortion.ApplyTo( rItemSet, static_cast<SdrPowerPointImport&>(*this), TSS_Type::Unknown );
@@ -718,19 +718,19 @@ bool ImplSdPPTImport::Import()
SetPageNum( i, PPT_MASTERPAGE );
// importing master page objects
- PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
- PptSlidePersistEntry* pPersist = ( pList && ( nCurrentPageNum < pList->size() ) )
- ? &(*pList)[ nCurrentPageNum ] : nullptr;
+ PptSlidePersistList* pList = GetPageList( m_eCurrentPageKind );
+ PptSlidePersistEntry* pPersist = ( pList && ( m_nCurrentPageNum < pList->size() ) )
+ ? &(*pList)[ m_nCurrentPageNum ] : nullptr;
if ( pPersist )
{
- if ( pPersist->bStarDrawFiller && pPersist->bNotesMaster && ( nCurrentPageNum > 2 ) && ( ( nCurrentPageNum & 1 ) == 0 ) )
+ if ( pPersist->bStarDrawFiller && pPersist->bNotesMaster && ( m_nCurrentPageNum > 2 ) && ( ( m_nCurrentPageNum & 1 ) == 0 ) )
{
- pSdrModel->DeleteMasterPage( nCurrentPageNum );
+ pSdrModel->DeleteMasterPage( m_nCurrentPageNum );
SdrPage* pNotesClone = static_cast<SdPage*>(pSdrModel->GetMasterPage( 2 ))->CloneSdrPage(*pSdrModel);
- pSdrModel->InsertMasterPage( pNotesClone, nCurrentPageNum );
+ pSdrModel->InsertMasterPage( pNotesClone, m_nCurrentPageNum );
if ( pNotesClone )
{
- OUString aLayoutName( static_cast<SdPage*>(pSdrModel->GetMasterPage( nCurrentPageNum - 1 ))->GetLayoutName() );
+ OUString aLayoutName( static_cast<SdPage*>(pSdrModel->GetMasterPage( m_nCurrentPageNum - 1 ))->GetLayoutName() );
static_cast<SdPage*>(pNotesClone)->SetPresentationLayout( aLayoutName, false, false );
static_cast<SdPage*>(pNotesClone)->SetLayoutName( aLayoutName );
}
@@ -757,7 +757,7 @@ bool ImplSdPPTImport::Import()
pMPage->NbcInsertObject( pObj );
bool bNewAnimationsUsed = false;
- ProcessData aProcessData( (*pList)[ nCurrentPageNum ], SdPageCapsule(pMPage) );
+ ProcessData aProcessData( (*pList)[ m_nCurrentPageNum ], SdPageCapsule(pMPage) );
sal_uInt32 nOldFPos = rStCtrl.Tell();
DffRecordHeader aPageHd;
if ( SeekToCurrentPage( &aPageHd ) )
@@ -891,8 +891,8 @@ bool ImplSdPPTImport::Import()
// importing slide pages
{
sal_uInt32 nOldFPos = rStCtrl.Tell();
- PptPageKind ePageKind = eCurrentPageKind;
- sal_uInt16 nPageNum = nCurrentPageNum;
+ PptPageKind ePageKind = m_eCurrentPageKind;
+ sal_uInt16 nPageNum = m_nCurrentPageNum;
SdPage* pHandoutPage = static_cast<SdPage*>(MakeBlancPage( false ));
pHandoutPage->SetPageKind( PageKind::Handout );
@@ -909,7 +909,7 @@ bool ImplSdPPTImport::Import()
PptSlidePersistEntry* pMasterPersist = nullptr;
if ( HasMasterPage( nPage ) ) // try to get the LayoutName from the masterpage
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( m_nCurrentPageNum, m_eCurrentPageKind );
pPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nMasterNum));
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && nMasterNum < pPageList->size() )
@@ -981,7 +981,7 @@ bool ImplSdPPTImport::Import()
}
// creating the corresponding note page
- eCurrentPageKind = PPT_NOTEPAGE;
+ m_eCurrentPageKind = PPT_NOTEPAGE;
SdPage* pNotesPage = static_cast<SdPage*>(MakeBlancPage( false ));
sal_uInt16 nNotesMasterNum = GetMasterPageIndex( nPage ) + 1;
sal_uInt32 nNotesPageId = GetNotesPageId( nPage );
@@ -1026,7 +1026,7 @@ bool ImplSdPPTImport::Import()
else
{
// that can happen by document templates
- eCurrentPageKind = PPT_SLIDEPAGE;
+ m_eCurrentPageKind = PPT_SLIDEPAGE;
SdrPage* pPage = MakeBlancPage( false );
pSdrModel->InsertPage( pPage );
@@ -1054,7 +1054,7 @@ bool ImplSdPPTImport::Import()
}
static_cast<SdPage*>(pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, true, true );
- eCurrentPageKind = PPT_NOTEPAGE;
+ m_eCurrentPageKind = PPT_NOTEPAGE;
SdrPage* pNPage = MakeBlancPage( false );
pSdrModel->InsertPage( pNPage );
}
@@ -1063,8 +1063,8 @@ bool ImplSdPPTImport::Import()
}
// create handout and note pages
- bOk = mpDoc->CreateMissingNotesAndHandoutPages();
- if ( bOk )
+ m_bOk = mpDoc->CreateMissingNotesAndHandoutPages();
+ if ( m_bOk )
{
for ( sal_uInt16 i = 0; i < mpDoc->GetSdPageCount( PageKind::Standard ); i++ )
{
@@ -1222,7 +1222,7 @@ bool ImplSdPPTImport::Import()
PageKind ePageKind = PageKind::Standard;
EditMode eEditMode = EditMode::Page;
- switch ( aUserEditAtom.eLastViewType )
+ switch ( m_aUserEditAtom.eLastViewType )
{
case PptViewTypeEnum::Outline:
{
@@ -1400,16 +1400,16 @@ bool ImplSdPPTImport::Import()
pSdrModel->setLock(false);
pSdrModel->EnableUndo(bSavedUndoEnabled);
- return bOk;
+ return m_bOk;
}
void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist )
{
sal_uInt32 i;
- PptSlidePersistList* pList = GetPageList( eCurrentPageKind );
- if ( ( !pList ) || ( pList->size() <= nCurrentPageNum ) )
+ PptSlidePersistList* pList = GetPageList( m_eCurrentPageKind );
+ if ( ( !pList ) || ( pList->size() <= m_nCurrentPageNum ) )
return;
- PptSlidePersistEntry& rSlidePersist = (*pList)[ nCurrentPageNum ];
+ PptSlidePersistEntry& rSlidePersist = (*pList)[ m_nCurrentPageNum ];
HeaderFooterEntry* pHFE = rSlidePersist.xHeaderFooterEntry.get();
if (!pHFE)
return;
@@ -1417,7 +1417,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide
for ( i = 0; i < 4; i++ )
{
bool bVisible = pHFE->IsToDisplay( i );
- if ( ( eCurrentPageKind == PPT_SLIDEPAGE )
+ if ( ( m_eCurrentPageKind == PPT_SLIDEPAGE )
&& ( rSlidePersist.aSlideAtom.aLayout.eLayout == PptSlideLayout::TITLESLIDE )
&& ( aDocAtom.bTitlePlaceholdersOmitted ) )
{
@@ -1500,11 +1500,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( eCurrentPageKind );
- PptSlidePersistEntry* pActualSlidePersist = ( pPersistList && ( nCurrentPageNum < pPersistList->size() ) )
- ? &(*pPersistList)[ nCurrentPageNum ] : nullptr;
+ PptSlidePersistList* pPersistList = GetPageList( m_eCurrentPageKind );
+ PptSlidePersistEntry* pActualSlidePersist = ( pPersistList && ( m_nCurrentPageNum < pPersistList->size() ) )
+ ? &(*pPersistList)[ m_nCurrentPageNum ] : nullptr;
- if ( pActualSlidePersist && ( eCurrentPageKind == PPT_SLIDEPAGE ) )
+ if ( pActualSlidePersist && ( m_eCurrentPageKind == PPT_SLIDEPAGE ) )
{
if ( ! ( pActualSlidePersist->aSlideAtom.nFlags & 1 ) ) // do not follow master objects ?
{
@@ -1521,7 +1521,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
{
sal_uLong nPageRecEnd = SanitizeEndPos(rStCtrl, aPageRecHd.GetRecEndFilePos());
- bool bTryTwice = ( eCurrentPageKind == PPT_SLIDEPAGE );
+ bool bTryTwice = ( m_eCurrentPageKind == PPT_SLIDEPAGE );
bool bSSSlideInfoAtom = false;
while ( true )
{
@@ -1534,7 +1534,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
case PPT_PST_SSSlideInfoAtom:
{
bSSSlideInfoAtom = true;
- if ( eCurrentPageKind == PPT_MASTERPAGE )
+ if ( m_eCurrentPageKind == PPT_MASTERPAGE )
{
if ( pActualSlidePersist )
pActualSlidePersist->aPersistAtom.nReserved = aHd.GetRecBegFilePos();
@@ -1804,9 +1804,9 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
if ( bTryTwice && !bSSSlideInfoAtom )
{
bTryTwice = false;
- if ( HasMasterPage( nCurrentPageNum, eCurrentPageKind ) )
+ if ( HasMasterPage( m_nCurrentPageNum, m_eCurrentPageKind ) )
{
- sal_uInt16 nMasterNum = GetMasterPageIndex( nCurrentPageNum, eCurrentPageKind );
+ sal_uInt16 nMasterNum = GetMasterPageIndex( m_nCurrentPageNum, m_eCurrentPageKind );
PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE );
if ( pPageList && ( nMasterNum < pPageList->size() ) )
{
@@ -2095,7 +2095,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
case 0x04 :
{
SdHyperlinkEntry* pPtr = nullptr;
- for (SdHyperlinkEntry & entry : aHyperList) {
+ for (SdHyperlinkEntry & entry : m_aHyperList) {
if ( entry.nIndex == pIAtom->nExHyperlinkId ) {
pPtr = &entry;
break;
@@ -2286,7 +2286,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
if ( pPlaceHolder && pPlaceHolder->nPlaceholderId != PptPlaceholder::NONE )
{
- if ( eCurrentPageKind == PPT_MASTERPAGE )
+ if ( m_eCurrentPageKind == PPT_MASTERPAGE )
{
bool bCreatePlaceHolder = ( pTextObj->GetInstance() != TSS_Type::Unused );
bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) || (ePresKind == PRESOBJ_FOOTER)
@@ -2343,7 +2343,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
else
{
const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom();
- if ( pSlideLayout || ( eCurrentPageKind == PPT_NOTEPAGE ) )
+ if ( pSlideLayout || ( m_eCurrentPageKind == PPT_NOTEPAGE ) )
{
sal_uInt32 nPlacementId = pPlaceHolder->nPlacementId;
PptPlaceholder nPlaceholderId = pPlaceHolder->nPlaceholderId;
@@ -2433,7 +2433,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
pPresObj->SetMergedItemSet(aSet);
- if ((eCurrentPageKind != PPT_NOTEPAGE) && (nPlacementId != 0xffffffff) && pPage->TRG_HasMasterPage())
+ if ((m_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 );
More information about the Libreoffice-commits
mailing list