[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/filter/xml/xmlimprt.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit e6db09f0f43c7305f1855eb3422f5cb98b8d6400
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 30 14:32:27 2010 -0500

    Fix incorrect merge conflict.  This fixes fdo#32002.

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index b698bcc..c59581c 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2845,8 +2845,6 @@ void ScXMLImport::SetNamedRanges()
                 UnlockSolarMutex();
             }
         }
-        delete *aItr;
-        aItr = pNamedExpressions->erase(aItr);
     }
 
     aItr = pNamedExpressions->begin();