Skip to content

C
core
Kaydet (Commit) abaa69f9 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl
Dosyalara gözat
Seçenekler

Convert SV_DECL_PTRARR(SwXMLConditions_Impl) to std::vector

üst 3893b922
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 7 deletions
sw/source/filter/xml/xmlfmt.cxx
Dosyayı görüntüle @ abaa69f9
...@@ -272,8 +272,7 @@ TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext ); ...@@ -272,8 +272,7 @@ TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext );
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
typedef SwXMLConditionContext_Impl *SwXMLConditionContextPtr; typedef std::vector<SwXMLConditionContext_Impl*> SwXMLConditions_Impl;
SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5 )
class SwXMLTextStyleContext_Impl : public XMLTextStyleContext class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
{ {
...@@ -344,10 +343,10 @@ SwXMLTextStyleContext_Impl::~SwXMLTextStyleContext_Impl() ...@@ -344,10 +343,10 @@ SwXMLTextStyleContext_Impl::~SwXMLTextStyleContext_Impl()
{ {
if( pConditions ) if( pConditions )
{ {
while( pConditions->Count() ) while( !pConditions->empty() )
{ {
SwXMLConditionContext_Impl *pCond = pConditions->GetObject(0); SwXMLConditionContext_Impl *pCond = &*pConditions->back();
pConditions->Remove( 0UL ); pConditions->pop_back();
pCond->ReleaseRef(); pCond->ReleaseRef();
} }
delete pConditions; delete pConditions;
...@@ -370,7 +369,7 @@ SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext( ...@@ -370,7 +369,7 @@ SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext(
{ {
if( !pConditions ) if( !pConditions )
pConditions = new SwXMLConditions_Impl; pConditions = new SwXMLConditions_Impl;
pConditions->Insert( pCond, pConditions->Count() ); pConditions->push_back( pCond );
pCond->AddRef(); pCond->AddRef();
} }
pContext = pCond; pContext = pCond;
...@@ -411,7 +410,7 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) ...@@ -411,7 +410,7 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
if( !pColl || RES_CONDTXTFMTCOLL != pColl->Which() ) if( !pColl || RES_CONDTXTFMTCOLL != pColl->Which() )
return; return;
sal_uInt16 nCount = pConditions->Count(); sal_uInt16 nCount = pConditions->size();
String aString; String aString;
OUString sName; OUString sName;
for( sal_uInt16 i = 0; i < nCount; i++ ) for( sal_uInt16 i = 0; i < nCount; i++ )
......
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