diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-11-30 14:32:27 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-11-30 14:32:27 -0500 |
| commit | e6db09f0f43c7305f1855eb3422f5cb98b8d6400 (patch) | |
| tree | 7330bb4da87baeef4b88a1cb20765b6842d6a565 | |
| parent | 91203e379740118412c93e40ebc18418452c7ac5 (diff) | |
Fix incorrect merge conflict. This fixes fdo#32002.LIBREOFFICE_PRE_BOOTSTRAP_BUILD
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b698bcc68..c59581c4b 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(); |