diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-14 23:28:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-18 15:30:03 +0200 |
| commit | 96a36b917a1f69e672bcb273df0513dba8d8a379 (patch) | |
| tree | 1ddab3ac3a5466e91f9828c49aa36e3dfe1da573 | |
| parent | 8c40de809ac06670b1af1359b4eb355843a77282 (diff) | |
Convert SV_DECL_PTRARR to std::vector
| -rw-r--r-- | xmloff/source/style/xmltabi.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index c61382533480..8c9325922e59 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -184,8 +184,7 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext( -typedef SvxXMLTabStopContext_Impl *SvxXMLTabStopContext_Impl_ImplPtr; -SV_DECL_PTRARR( SvxXMLTabStopArray_Impl, SvxXMLTabStopContext_Impl_ImplPtr, 20 ) +class SvxXMLTabStopArray_Impl : public std::vector<SvxXMLTabStopContext_Impl *> {}; // --- @@ -206,12 +205,10 @@ SvxXMLTabStopImportContext::~SvxXMLTabStopImportContext() { if( mpTabStops ) { - sal_uInt16 nCount = mpTabStops->Count(); - while( nCount ) + while( !mpTabStops->empty() ) { - nCount--; - SvxXMLTabStopContext_Impl *pTabStop = (*mpTabStops)[nCount]; - mpTabStops->Remove( nCount, 1 ); + SvxXMLTabStopContext_Impl *pTabStop = mpTabStops->back(); + mpTabStops->pop_back(); pTabStop->ReleaseRef(); } } @@ -237,7 +234,7 @@ SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext( if( !mpTabStops ) mpTabStops = new SvxXMLTabStopArray_Impl; - mpTabStops->Insert( pTabStopContext, mpTabStops->Count() ); + mpTabStops->push_back( pTabStopContext ); pTabStopContext->AddRef(); pContext = pTabStopContext; @@ -252,7 +249,7 @@ SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext( void SvxXMLTabStopImportContext::EndElement( ) { - sal_uInt16 nCount = mpTabStops ? mpTabStops->Count() : 0; + sal_uInt16 nCount = mpTabStops ? mpTabStops->size() : 0; uno::Sequence< style::TabStop> aSeq( nCount ); if( mpTabStops ) |