diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-24 15:32:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-09 08:52:53 +0200 |
| commit | 35be7d7574cd0f45a18ee5838dd14cb1040890d4 (patch) | |
| tree | ecdae6ac1ae76f9edef27d2071d299c9aa0cfb22 /sw/source/filter/html/htmlcss1.cxx | |
| parent | 33fe30af79bd665e338dcf730c3d8439b6e2cb78 (diff) | |
Convert SV_DECL_PTRARR(_HTMLAttrContexts) to std::vector
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index fcd77fc8cc41..170c9831df96 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2185,7 +2185,7 @@ void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet, _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit, sal_Bool bRemove ) { - sal_uInt16 nPos = aContexts.Count(); + sal_uInt16 nPos = aContexts.size(); if( nPos <= nContextStMin ) return 0; @@ -2217,7 +2217,7 @@ _HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit { pCntxt = aContexts[nPos]; if( bRemove ) - aContexts.Remove( nPos, 1 ); + aContexts.erase( aContexts.begin() + nPos ); } return pCntxt; @@ -2228,7 +2228,7 @@ sal_Bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft, short& nIndent, sal_Bool bIgnoreTopContext ) const { - sal_uInt16 nPos = aContexts.Count(); + sal_uInt16 nPos = aContexts.size(); if( bIgnoreTopContext ) { if( !nPos ) @@ -2274,7 +2274,7 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper, sal_uInt16 nDfltColl = 0; String aDfltClass; - sal_uInt16 nPos = aContexts.Count(); + sal_uInt16 nPos = aContexts.size(); while( nPos > nContextStAttrMin ) { const _HTMLAttrContext *pCntxt = aContexts[--nPos]; |