1 files changed, 36 insertions, 0 deletions
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1f2060b21e89..f0c3b3fc9686 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -178,8 +178,12 @@ void ScNameDlg::Init()
         SelectionChanged();
     }
 
+    CheckForEmptyTable();
+
     //TODO: fix the Add Button
     maBtnAdd.Disable();
+    //TODO: discuss the Select Range button with UX
+    maBtnSelect.Disable();
 }
 
 sal_Bool ScNameDlg::IsRefInputMode() const
@@ -213,6 +217,35 @@ sal_Bool ScNameDlg::Close()
     return DoClose( ScNameDlgWrapper::GetChildWindowId() );
 }
 
+void ScNameDlg::CheckForEmptyTable()
+{
+    if (!mpRangeManagerTable->GetEntryCount())
+    {
+        maBtnDelete.Disable();
+        maEdAssign.Disable();
+        maEdName.Disable();
+        maLbScope.Disable();
+
+        maBtnCriteria.Disable();
+        maBtnPrintArea.Disable();
+        maBtnColHeader.Disable();
+        maBtnRowHeader.Disable();
+    }
+    else
+    {
+        maBtnDelete.Enable();
+        maEdAssign.Enable();
+        maEdName.Enable();
+        maLbScope.Enable();
+
+
+        maBtnCriteria.Enable();
+        maBtnPrintArea.Enable();
+        maBtnColHeader.Enable();
+        maBtnRowHeader.Enable();
+    }
+}
+
 void ScNameDlg::CancelPushed()
 {
     DoClose( ScNameDlgWrapper::GetChildWindowId() );
@@ -343,6 +376,7 @@ void ScNameDlg::RemovePushed()
         if (pData)
             pRangeName->erase(*pData);
     }
+    CheckForEmptyTable();
 }
 
 void ScNameDlg::NameModified()
@@ -400,6 +434,8 @@ void ScNameDlg::NameModified()
 
 void ScNameDlg::SelectionChanged()
 {
+
+
     //don't update if we have just modified due to user input
     if (!mbNeedUpdate)
     {