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 | 8d78326d7462db16dc734233280f157284799305 (patch) | |
| tree | 1a8d63a687bfa77716112ac208c70e5c18ea4de8 /sc | |
| parent | 77e6d84718173b1ca15c64f4b4be19be506fc51b (diff) | |
Fix incorrect merge conflict. This fixes fdo#32002.
Notes
Notes:
split repo tag: calc_LIBREOFFICE_PRE_BOOTSTRAP_BUILD
Diffstat (limited to 'sc')
| -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 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(); |