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