diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 22:41:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:55 +0200 |
| commit | 2ca3569e04bdebf94496ba24829e696493413b90 (patch) | |
| tree | f0d3efe62b3ef7afefdb11ece3ed2ffc78bc8036 | |
| parent | 88b992d0da1e6122942cd9817ac55da1b932fdd6 (diff) | |
filter: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I2659fea1fb18c5b0a4ff5339643c7c28c0f5f458
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 21 | ||||
| -rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 2 |
2 files changed, 12 insertions, 11 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index e709914e2adf..e11dc4325c70 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -450,7 +450,8 @@ SvStream& ReadPptFontEntityAtom( SvStream& rIn, PptFontEntityAtom& rAtom ) return rIn; } -class PptFontCollection: public boost::ptr_vector<PptFontEntityAtom> { +class PptFontCollection : public std::vector<std::unique_ptr<PptFontEntityAtom>> +{ }; SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom ) @@ -514,7 +515,7 @@ PptSlidePersistEntry::~PptSlidePersistEntry() SdrEscherImport::SdrEscherImport( PowerPointImportParam& rParam, const OUString& rBaseURL ) : SvxMSDffManager ( rParam.rDocStream, rBaseURL ), - pFonts ( NULL ), + m_pFonts ( nullptr ), nStreamLen ( 0 ), nTextStylesIndex ( 0xffff ), eCharSetSystem ( osl_getThreadTextEncoding() ), @@ -533,7 +534,7 @@ SdrEscherImport::~SdrEscherImport() for ( size_t i = 0, n = aOleObjectList.size(); i < n; ++i ) delete aOleObjectList[ i ]; aOleObjectList.clear(); - delete pFonts; + delete m_pFonts; } const PptSlideLayoutAtom* SdrEscherImport::GetSlideLayoutAtom() const @@ -576,8 +577,8 @@ bool SdrEscherImport::SeekToShape( SvStream& /*rSt*/, void* /*pClientData*/, sal PptFontEntityAtom* SdrEscherImport::GetFontEnityAtom( sal_uInt32 nNum ) const { PptFontEntityAtom* pRetValue = NULL; - if ( pFonts && ( nNum < pFonts->size() ) ) - pRetValue = &(*pFonts)[ (sal_uInt16)nNum ]; + if (m_pFonts && (nNum < m_pFonts->size())) + pRetValue = (*m_pFonts)[ (sal_uInt16)nNum ].get(); return pRetValue; } @@ -1441,7 +1442,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const O if ( bOk ) { - if ( !pFonts ) + if (!m_pFonts) ReadFontCollection(); // reading TxPF, TxSI @@ -2133,9 +2134,9 @@ bool SdrPowerPointImport::ReadFontCollection() while ( SeekToRec( rStCtrl, PPT_PST_FontEntityAtom, aListHd.GetRecEndFilePos() ) ) { bRet = true; - if ( !pFonts ) - pFonts = new PptFontCollection; - PptFontEntityAtom* pFont = new PptFontEntityAtom; + if (!m_pFonts) + m_pFonts = new PptFontCollection; + std::unique_ptr<PptFontEntityAtom> pFont(new PptFontEntityAtom); ReadPptFontEntityAtom( rStCtrl, *pFont ); vcl::Font aFont; @@ -2159,7 +2160,7 @@ bool SdrPowerPointImport::ReadFontCollection() { pFont->eCharSet = RTL_TEXTENCODING_SYMBOL; }; - pFonts->insert( pFonts->begin() + nCount2++, pFont ); + m_pFonts->insert(m_pFonts->begin() + nCount2++, std::move(pFont)); } } rStCtrl.Seek( nFPosMerk ); // restore FilePos diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index cabb4b9f4bca..dd4cfcfb27b9 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -430,7 +430,7 @@ protected: PPTOleEntryList aOleObjectList; // contains PPTOleEntrys - PptFontCollection* pFonts; + PptFontCollection* m_pFonts; sal_uInt32 nStreamLen; sal_uInt16 nTextStylesIndex; |