From e53047ade900f18ad6c6c241ddfdef715c2172fd Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 18 Apr 2012 15:25:33 +0200
Subject: loop with erase(begin()) looks sort of inefficient

---
 xmloff/source/style/xmlnumfi.cxx             | 2 +-
 xmloff/source/text/XMLTextColumnsContext.cxx | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'xmloff')

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 255aa94c5010..77a5b5be744e 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -72,7 +72,7 @@ struct SvXMLNumFmtEntry
         aName(rN), nKey(nK), bRemoveAfterUse(bR) {}
 };
 
-class SvXMLNumFmtEntryArr : public boost::ptr_vector<SvXMLNumFmtEntry> {};
+typedef ::boost::ptr_vector<SvXMLNumFmtEntry> SvXMLNumFmtEntryArr;
 
 struct SvXMLEmbeddedElement
 {
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index e5c0750a4fea..8bb20659bd06 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -342,11 +342,10 @@ XMLTextColumnsContext::~XMLTextColumnsContext()
 {
     if( pColumns )
     {
-        while( !pColumns->empty() )
+        for (XMLTextColumnsArray_Impl::iterator it = pColumns->begin();
+                it != pColumns->end(); ++it)
         {
-            XMLTextColumnContext_Impl *pColumn = *pColumns->begin();
-            pColumns->erase( pColumns->begin() );
-            pColumn->ReleaseRef();
+           (*it)->ReleaseRef();
         }
     }
     if( pColumnSep )
-- 
cgit