diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 23:02:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:55 +0200 |
| commit | 9c959736caaaab5a757b0a0ff0abb121062483ab (patch) | |
| tree | cf969b4da92178ce615de210b98637860fdffe55 /sd | |
| parent | 2ca3569e04bdebf94496ba24829e696493413b90 (diff) | |
filter: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I87f903c6a81b271847f072fa0608fae4669ac307
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index ca300f156b95..68f80f303e2d 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -541,7 +541,7 @@ bool ImplSdPPTImport::Import() // create master pages: SfxProgress* pStbMgr = new SfxProgress( pDocShell, SD_RESSTR( STR_POWERPOINT_IMPORT ), - pMasterPages->size() + pSlidePages->size() + pNotePages->size() ); + m_pMasterPages->size() + m_pSlidePages->size() + m_pNotePages->size() ); sal_uInt32 nImportedPages = 0; { @@ -726,7 +726,7 @@ bool ImplSdPPTImport::Import() PptSlidePersistEntry* pE = pPersist; while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId ) { - sal_uInt16 nNextMaster = pMasterPages->FindPage( pE->aSlideAtom.nMasterId ); + sal_uInt16 nNextMaster = m_pMasterPages->FindPage( pE->aSlideAtom.nMasterId ); if ( nNextMaster == PPTSLIDEPERSIST_ENTRY_NOTFOUND ) break; else @@ -952,7 +952,7 @@ bool ImplSdPPTImport::Import() if ( nNotesPageId ) { nImportedPages++; - sal_uInt16 nNotesPageIndex = pNotePages->FindPage( nNotesPageId ); + sal_uInt16 nNotesPageIndex = m_pNotePages->FindPage( nNotesPageId ); if ( nNotesPageIndex == PPTSLIDEPERSIST_ENTRY_NOTFOUND ) nNotesPageIndex = 0; SetPageNum( nNotesPageIndex, PPT_NOTEPAGE ); |