diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-24 14:51:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-09 08:52:53 +0200 |
| commit | 1ad80e01debe9c0666866db475ac6cdef74f7933 (patch) | |
| tree | bc9589b1410d94e962908ca082667e3965a9c50f /sw/source/filter/html | |
| parent | 4c45c52b283d83c2c9749f9f129461ea4d2c32d2 (diff) | |
Convert SV_DECL_PTRARR(SwHTMLFrmFmts) to std::vector
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.hxx | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 1607d6807ace..85cd4c1520b4 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -298,7 +298,7 @@ void SwHTMLParser::RegisterFlyFrm( SwFrmFmt *pFlyFmt ) (FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()) && SURROUND_THROUGHT == pFlyFmt->GetSurround().GetSurround() ) { - aMoveFlyFrms.Insert( pFlyFmt, aMoveFlyFrms.Count() ); + aMoveFlyFrms.push_back( pFlyFmt ); aMoveFlyCnts.push_back( pPam->GetPoint()->nContent.GetIndex() ); } } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index d30066ee00b9..32a97464f7af 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -2831,7 +2831,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, } } - for( n = aMoveFlyFrms.Count(); n; ) + for( n = aMoveFlyFrms.size(); n; ) { SwFrmFmt *pFrmFmt = aMoveFlyFrms[ --n ]; @@ -2881,7 +2881,7 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, } pFrmFmt->MakeFrms(); - aMoveFlyFrms.Remove( n, 1 ); + aMoveFlyFrms.erase( aMoveFlyFrms.begin() + n ); aMoveFlyCnts.erase( aMoveFlyCnts.begin() + n ); } } diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 54a6f0e3073c..aad54d8a7e13 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -340,8 +340,7 @@ class SwHTMLNumRuleInfo; typedef ImageMap *ImageMapPtr; SV_DECL_PTRARR_DEL( ImageMaps, ImageMapPtr, 1 ) -typedef SwFrmFmt *SwFrmFmtPtr; -SV_DECL_PTRARR( SwHTMLFrmFmts, SwFrmFmtPtr, 2 ) +typedef std::vector<SwFrmFmt *> SwHTMLFrmFmts; #define HTML_CNTXT_PROTECT_STACK 0x0001 #define HTML_CNTXT_STRIP_PARA 0x0002 @@ -503,7 +502,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient inline void SetAttr( sal_Bool bChkEnd = sal_True, sal_Bool bBeforeTable = sal_False, _HTMLAttrs *pPostIts = 0 ) { - if( aSetAttrTab.Count() || aMoveFlyFrms.Count() ) + if( aSetAttrTab.Count() || !aMoveFlyFrms.empty() ) _SetAttr( bChkEnd, bBeforeTable, pPostIts ); } |