From dff90c796579f16f642d847ce70d793ebe4a89e8 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Tue, 8 Apr 2014 14:34:13 -0400
Subject: fdo#71729: Fill the range edit boxes after the table is fully
 initialized.

Otherwise the range formula expression would not be available yet.

(cherry picked from commit ffaaf35206b8f049bb9e9ffd7a85c8ebd758a21c)

Conflicts:
	sc/source/ui/namedlg/namedlg.cxx
	sc/source/ui/namedlg/namemgrtable.cxx

Change-Id: If9c5040366f9038e8094fd5448ca5e4ee2e73edd
Reviewed-on: https://gerrit.libreoffice.org/8898
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
---
 sc/source/ui/namedlg/namedlg.cxx | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'sc/source/ui/namedlg/namedlg.cxx')

diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index d3718a05c270..51a5ff2a53b3 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -118,6 +118,7 @@ void ScNameDlg::Init()
     pCtrl->set_height_request(pCtrl->GetTextHeight()*12);
 
     m_pRangeManagerTable = new ScRangeManagerTable(*pCtrl, maRangeMap, maCursorPos);
+    m_pRangeManagerTable->setInitListener(this);
     m_pRangeManagerTable->SetSelectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
     m_pRangeManagerTable->SetDeselectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
 
@@ -145,15 +146,7 @@ void ScNameDlg::Init()
         m_pLbScope->InsertEntry(aTabName);
     }
 
-
-
-    if (m_pRangeManagerTable->GetSelectionCount())
-    {
-        SelectionChanged();
-    }
-
     CheckForEmptyTable();
-
 }
 
 sal_Bool ScNameDlg::IsRefInputMode() const
@@ -187,6 +180,12 @@ sal_Bool ScNameDlg::Close()
     return DoClose( ScNameDlgWrapper::GetChildWindowId() );
 }
 
+void ScNameDlg::tableInitialized()
+{
+    if (m_pRangeManagerTable->GetSelectionCount())
+        SelectionChanged();
+}
+
 void ScNameDlg::CheckForEmptyTable()
 {
     if (!m_pRangeManagerTable->GetEntryCount())
@@ -418,8 +417,6 @@ void ScNameDlg::NameModified()
 
 void ScNameDlg::SelectionChanged()
 {
-
-
     //don't update if we have just modified due to user input
     if (!mbNeedUpdate)
     {
-- 
cgit v1.2.3