Kaydet (Commit) 703492eb authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl

Convert SV_DECL_PTRARR_DEL(PptFontEntityAtomList) to boost::ptr_vector

Change-Id: Ie7aa19b7ef5c25b2547a9fd29810fb56427edac0
üst 153c5e3f
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment