diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-07 16:49:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-12 23:25:09 +0200 |
| commit | 703492eb220d72a84599960fda04dbf9aef916f1 (patch) | |
| tree | be472d51273d1c4bee0219accc27a16b37b61cb2 /filter | |
| parent | 153c5e3f07ec26fac352765b776188035e1fdeb2 (diff) | |
Convert SV_DECL_PTRARR_DEL(PptFontEntityAtomList) to boost::ptr_vector
Change-Id: Ie7aa19b7ef5c25b2547a9fd29810fb56427edac0
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index dfe44003ab08..cd761aa58618 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -451,10 +451,7 @@ SvStream& operator>>( SvStream& rIn, PptFontEntityAtom& rAtom ) return rIn; } -SV_DECL_PTRARR_DEL( PptFontEntityAtomList, PptFontEntityAtom*, 16 ) -SV_IMPL_PTRARR( PptFontEntityAtomList, PptFontEntityAtom* ); - -class PptFontCollection: public PptFontEntityAtomList { +class PptFontCollection: public boost::ptr_vector<PptFontEntityAtom> { }; SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom ) @@ -576,8 +573,8 @@ sal_Bool SdrEscherImport::SeekToShape( SvStream& /*rSt*/, void* /*pClientData*/, PptFontEntityAtom* SdrEscherImport::GetFontEnityAtom( sal_uInt32 nNum ) const { PptFontEntityAtom* pRetValue = NULL; - if ( pFonts && ( nNum < pFonts->Count() ) ) - pRetValue = (*pFonts)[ (sal_uInt16)nNum ]; + if ( pFonts && ( nNum < pFonts->size() ) ) + pRetValue = &(*pFonts)[ (sal_uInt16)nNum ]; return pRetValue; } @@ -2153,7 +2150,7 @@ sal_Bool SdrPowerPointImport::ReadFontCollection() { pFont->eCharSet = RTL_TEXTENCODING_SYMBOL; }; - pFonts->C40_INSERT( PptFontEntityAtom, pFont, nCount2++ ); + pFonts->insert( pFonts->begin() + nCount2++, pFont ); } delete pVDev; } |