ManageNames: make pasting of multiple names working and fix crash

1 files changed, 10 insertions, 6 deletions

diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index a72e765e536b..dc894a093c4b 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -140,7 +140,8 @@ void ScRangeManagerTable::Init(const boost::ptr_map<rtl::OUString, ScRangeName>&
 
 void ScRangeManagerTable::DeleteSelectedEntries()
 {
-    RemoveSelection();
+    if (GetSelectionCount())
+        RemoveSelection();
 }
 
 bool ScRangeManagerTable::IsMultiSelection()
@@ -151,16 +152,19 @@ bool ScRangeManagerTable::IsMultiSelection()
 std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries()
 {
     std::vector<ScRangeNameLine> aSelectedEntries;
-    for (SvLBoxEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry))
+    if (GetSelectionCount())
     {
+        for (SvLBoxEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry))
+        {
+            ScRangeNameLine aLine;
+            GetLine( aLine, pEntry );
+            aSelectedEntries.push_back(aLine);
+        }
+        SvLBoxEntry* pEntry = LastSelected();
         ScRangeNameLine aLine;
         GetLine( aLine, pEntry );
         aSelectedEntries.push_back(aLine);
     }
-    SvLBoxEntry* pEntry = LastSelected();
-    ScRangeNameLine aLine;
-    GetLine( aLine, pEntry );
-    aSelectedEntries.push_back(aLine);
     return aSelectedEntries;
 }