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

Convert SV_DECL_PTRARR_DEL(ImageMaps) to boost::ptr_vector

üst 1ad80e01
......@@ -101,8 +101,6 @@ HTMLOptionEnum aHTMLImgVAlignTable[] =
{ 0, 0 }
};
SV_IMPL_PTRARR( ImageMaps, ImageMapPtr )
ImageMap *SwHTMLParser::FindImageMap( const String& rName ) const
{
ImageMap *pMap = 0;
......@@ -111,9 +109,9 @@ ImageMap *SwHTMLParser::FindImageMap( const String& rName ) const
if( pImageMaps )
{
for( sal_uInt16 i=0; i<pImageMaps->Count(); i++ )
for( sal_uInt16 i=0; i<pImageMaps->size(); i++ )
{
ImageMap *pIMap = (*pImageMaps)[i];
ImageMap *pIMap = &(*pImageMaps)[i];
if( rName.EqualsIgnoreCaseAscii( pIMap->GetName() ) )
{
pMap = pIMap;
......
......@@ -1984,7 +1984,7 @@ void SwHTMLParser::NextToken( int nToken )
{
if( !pImageMaps )
pImageMaps = new ImageMaps;
pImageMaps->Insert( pImageMap, pImageMaps->Count() );
pImageMaps->push_back( pImageMap );
}
else
{
......
......@@ -338,8 +338,7 @@ class HTMLTable;
class SwCSS1Parser;
class SwHTMLNumRuleInfo;
typedef ImageMap *ImageMapPtr;
SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1 )
typedef boost::ptr_vector<ImageMap> ImageMaps;
typedef std::vector<SwFrmFmt *> SwHTMLFrmFmts;
#define HTML_CNTXT_PROTECT_STACK 0x0001
......
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