From 8d78326d7462db16dc734233280f157284799305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 30 Nov 2010 14:32:27 -0500
Subject: Fix incorrect merge conflict.  This fixes fdo#32002.

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

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 493b831aba0e..ca4cbd67adeb 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();
-- 
cgit v1.2.1