diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-07-26 21:18:06 -0400 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-07-26 21:24:19 -0400 |
commit | dc3d5f50036041dac1e1867e21440adbab375f46 (patch) | |
tree | 5b33f3463c5c973a724d068370f598ac5b08f2f2 /sw/source/filter/html/svxcss1.cxx | |
parent | 88ef0f8c4dd0359d3a22a689f6eb29251ee1ab79 (diff) |
Replace SV_*_PTRARR with boost::ptr_vector.
Diffstat (limited to 'sw/source/filter/html/svxcss1.cxx')
-rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 0a0b86c5cd2d..8d0ec3f09740 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -71,11 +71,6 @@ typedef void (*FnParseCSS1Prop)( const CSS1Expression *pExpr, SvxCSS1PropertyInfo& rPropInfo, const SvxCSS1Parser& rParser ); -SV_IMPL_PTRARR( CSS1Selectors, CSS1Selector* ) - - -/* */ - static CSS1PropertyEnum const aFontSizeTable[] = { { sCSS1_PV_xx_small, 0 }, @@ -720,31 +715,26 @@ sal_Bool SvxCSS1Parser::StyleParsed( const CSS1Selector * /*pSelector*/, return sal_True; } -sal_Bool SvxCSS1Parser::SelectorParsed( const CSS1Selector *pSelector, - sal_Bool bFirst ) +bool SvxCSS1Parser::SelectorParsed( CSS1Selector *pSelector, bool bFirst ) { if( bFirst ) { OSL_ENSURE( pSheetItemSet, "Where is the Item-Set for Style-Sheets?" ); - // Dieses ist der erste Selektor einer Rule, also muessen - // die bisher geparsten Items auf die Styles verteilt werden -// pSheetPropInfo->CreateBoxItem( *pSheetItemSet, GetDfltBorderDist() ); - for( sal_uInt16 i=0; i<aSelectors.Count(); i++ ) + for (size_t i = 0; i < aSelectors.size(); ++i) { - StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo ); + StyleParsed( &aSelectors[i], *pSheetItemSet, *pSheetPropInfo ); } pSheetItemSet->ClearItem(); pSheetPropInfo->Clear(); // und die naechste Rule vorbereiten - if( aSelectors.Count() ) - aSelectors.DeleteAndDestroy( 0, aSelectors.Count() ); + aSelectors.clear(); } - aSelectors.C40_INSERT( CSS1Selector, pSelector, aSelectors.Count() ); + aSelectors.push_back(pSelector); - return sal_False; // den Selektor haben wir gespeichert. Loeschen toedlich! + return false; // den Selektor haben wir gespeichert. Loeschen toedlich! } @@ -840,14 +830,13 @@ sal_Bool SvxCSS1Parser::ParseStyleSheet( const String& rIn ) sal_Bool bSuccess = CSS1Parser::ParseStyleSheet( rIn ); - for( sal_uInt16 i=0; i<aSelectors.Count(); i++ ) + for (size_t i = 0; i < aSelectors.size(); ++i) { - StyleParsed( aSelectors[i], *pSheetItemSet, *pSheetPropInfo ); + StyleParsed( &aSelectors[i], *pSheetItemSet, *pSheetPropInfo ); } // und etwas aufrauemen - if( aSelectors.Count() ) - aSelectors.DeleteAndDestroy( 0, aSelectors.Count() ); + aSelectors.clear(); pSheetItemSet->ClearItem(); pSheetPropInfo->Clear(); |