adapt code to manage names dialog .ui conversion

Change-Id: I67d587c0241a1d8377aee199a30bfcc919e3faad

10 files changed, 416 insertions, 730 deletions

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 16529b27f2d8..4867639751b5 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/ui/src/scerrors.src \
     sc/source/ui/src/simpref.src \
     sc/source/ui/src/solveroptions.src \
-    sc/source/ui/src/namedlg.src \
     sc/source/ui/src/miscdlgs.src \
     sc/source/ui/src/tabopdlg.src \
     sc/source/ui/src/scstring.src \
diff --git a/sc/UI_scalc.mk b/sc/UI_scalc.mk
index 60850afe35cb..7dcec5872d34 100644
--- a/sc/UI_scalc.mk
+++ b/sc/UI_scalc.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UI_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/formatcellsdialog \
 	sc/uiconfig/scalc/ui/insertname \
 	sc/uiconfig/scalc/ui/insertsheet \
+	sc/uiconfig/scalc/ui/managenamesdialog \
 	sc/uiconfig/scalc/ui/printeroptions \
 	sc/uiconfig/scalc/ui/sheetprintpage \
 	sc/uiconfig/scalc/ui/selectrange \
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 9eec9cecc3a8..058349eb884a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -668,7 +668,9 @@
 #define STR_COND_ABOVE_EQUAL_AVERAGE 535
 #define STR_COND_BELOW_EQUAL_AVERAGE 536
 
-#define STR_COUNT                   537
+#define STR_MULTI_SELECT            537
+
+#define STR_COUNT                   538
 
 #endif
 
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
deleted file mode 100644
index bf1a95dbab97..000000000000
--- a/sc/source/ui/inc/namedlg.hrc
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sc.hrc" // -> RID_SCDLG_NAMES
-
-#define BTN_ADD         3
-#define BTN_HELP        5
-#define BTN_MORE        6
-#define BTN_DELETE      57
-#define BTN_NAME_OK     62
-#define BTN_NAME_CANCEL      73
-
-#define FT_SCOPE        7
-#define FT_RANGE        58
-#define FT_NAME         59
-#define FL_DIV          60
-#define LB_SCOPE        8
-#define ED_NAME2        61
-#define ED_ASSIGN       15
-#define RB_ASSIGN       16
-
-#define BTN_CRITERIA    31
-#define BTN_PRINTAREA   32
-#define BTN_COLHEADER   33
-#define BTN_ROWHEADER   34
-
-#define CTRL_MANAGENAMES    66
-#define STR_DEFAULT_INFO    75
-#define STR_MULTI_SELECT    76
-
-#define FT_INFO 72
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 79a254a4f914..b6ed1968fb7d 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -46,37 +46,30 @@ class ScDocument;
 class ScNameDlg : public ScAnyRefDlg
 {
 private:
-    Edit            maEdName;
-    formula::RefEdit        maEdAssign;
-    formula::RefButton      aRbAssign;
-    ListBox         maLbScope;
-
-    DisclosureButton maBtnMore;
-    CheckBox        maBtnPrintArea;
-    CheckBox        maBtnColHeader;
-    CheckBox        maBtnCriteria;
-    CheckBox        maBtnRowHeader;
-
-    PushButton      maBtnAdd;
-    PushButton      maBtnDelete;
-    HelpButton      maBtnHelp;
-    PushButton      maBtnOk;
-    PushButton      maBtnCancel;
-
-    FixedText       maFtScope;
-    FixedText       maFtRange;
-    FixedText       maFtName;
-    FixedLine       maFlDiv;
-    FixedText       maFtInfo;
-
-    SvxSimpleTableContainer maNameMgrCtrl;
-    ScRangeManagerTable* mpRangeManagerTable;
+    Edit*               m_pEdName;
+    formula::RefEdit*   m_pEdAssign;
+    formula::RefButton* m_pRbAssign;
+    ListBox*            m_pLbScope;
+
+    CheckBox*           m_pBtnPrintArea;
+    CheckBox*           m_pBtnColHeader;
+    CheckBox*           m_pBtnCriteria;
+    CheckBox*           m_pBtnRowHeader;
+
+    PushButton*         m_pBtnAdd;
+    PushButton*         m_pBtnDelete;
+    PushButton*         m_pBtnOk;
+    PushButton*         m_pBtnCancel;
+
+    FixedText*          m_pFtInfo;
+
+    ScRangeManagerTable* m_pRangeManagerTable;
 
     const OUString maGlobalNameStr;
     const OUString maErrInvalidNameStr;
     const OUString maErrNameInUse;
-    const OUString maStrInfoDefault;
     const OUString maStrMultiSelect;
+    OUString maStrInfoDefault;
 
     ScViewData*     mpViewData;
     ScDocument*     mpDoc;
@@ -111,7 +104,6 @@ private:
     void NameSelected();
     void ScopeChanged();
     void NameModified();
-    void MorePushed();
 
     void SelectionChanged();
 
@@ -125,7 +117,6 @@ private:
     DECL_LINK( AssignGetFocusHdl, void * );
     DECL_LINK( SelectionChangedHdl_Impl, void* );
     DECL_LINK( ScopeChangedHdl, void* );
-    DECL_LINK( MoreBtnHdl, void* );
 
 protected:
     virtual void    RefInputDone( sal_Bool bForced = sal_False );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index cfe82ae0bf8c..6675dbd3ac1d 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -23,7 +23,6 @@
 #include "docfunc.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
-#include "namedlg.hrc"
 #include "namedlg.hxx"
 #include "viewdata.hxx"
 #include "tabvwsh.hxx"
@@ -51,47 +50,37 @@
 ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         ScViewData*       ptrViewData,
         const ScAddress&  aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap  )
+    : ScAnyRefDlg(pB, pCW, pParent, "ManageNamesDialog", "modules/scalc/ui/managenamesdialog.ui")
 
-:   ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_NAMES ),
+    , maGlobalNameStr(ScGlobal::GetRscString(STR_GLOBAL_SCOPE))
+    , maErrInvalidNameStr(ScGlobal::GetRscString(STR_ERR_NAME_INVALID))
+    , maErrNameInUse(ScGlobal::GetRscString(STR_ERR_NAME_EXISTS))
+    , maStrMultiSelect(ScGlobal::GetRscString(STR_MULTI_SELECT))
     //
-    maEdName         ( this, ScResId( ED_NAME2 ) ),
-    maEdAssign       ( this, this, ScResId( ED_ASSIGN ) ),
-    aRbAssign       ( this, ScResId( RB_ASSIGN ), &maEdAssign, &maEdName, this ),
-    maLbScope( this, ScResId(LB_SCOPE) ),
-    //
-    maBtnMore        ( this, ScResId( BTN_MORE ) ),
-    maBtnPrintArea   ( this, ScResId( BTN_PRINTAREA ) ),
-    maBtnColHeader   ( this, ScResId( BTN_COLHEADER ) ),
-    maBtnCriteria    ( this, ScResId( BTN_CRITERIA ) ),
-    maBtnRowHeader   ( this, ScResId( BTN_ROWHEADER ) ),
-    //
-    maBtnAdd         ( this, ScResId( BTN_ADD ) ),
-    maBtnDelete      ( this, ScResId( BTN_DELETE ) ),
-    maBtnHelp        ( this, ScResId( BTN_HELP ) ),
-    maBtnOk          ( this, ScResId( BTN_NAME_OK ) ),
-    maBtnCancel      ( this, ScResId( BTN_NAME_CANCEL ) ),
-    //
-    maFtScope( this, ScResId(FT_SCOPE) ),
-    maFtRange( this, ScResId(FT_RANGE) ),
-    maFtName( this,  ScResId(FT_NAME) ),
-    maFlDiv          ( this, ScResId( FL_DIV ) ),
-    maFtInfo         ( this, ScResId( FT_INFO ) ),
-    //
-    maNameMgrCtrl   ( this, ScResId( CTRL_MANAGENAMES ) ),
-    //
-    maGlobalNameStr  ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
-    maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
-    maErrNameInUse   ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
-    maStrInfoDefault ( SC_RESSTR(STR_DEFAULT_INFO)),
-    maStrMultiSelect ( SC_RESSTR(STR_MULTI_SELECT)),
-    //
-    mpViewData       ( ptrViewData ),
-    mpDoc            ( ptrViewData->GetDocument() ),
-    maCursorPos      ( aCursorPos ),
-    mbNeedUpdate     ( true ),
-    mbDataChanged    ( false ),
-    mbCloseWithoutUndo( false )
-{
+    , mpViewData(ptrViewData)
+    , mpDoc(ptrViewData->GetDocument())
+    , maCursorPos(aCursorPos)
+    , mbNeedUpdate(true)
+    , mbDataChanged(false)
+    , mbCloseWithoutUndo(false)
+{
+    get(m_pEdName, "name");
+    get(m_pEdAssign, "range");
+    get(m_pRbAssign, "assign");
+    m_pRbAssign->SetReferences(this, m_pEdAssign, m_pEdName);
+    get(m_pLbScope, "scope");
+    get(m_pBtnPrintArea, "printrange");
+    get(m_pBtnColHeader, "colheader");
+    get(m_pBtnCriteria, "filter");
+    get(m_pBtnRowHeader, "rowheader");
+    get(m_pBtnAdd, "add");
+    get(m_pBtnDelete, "delete");
+    get(m_pBtnOk, "ok");
+    get(m_pBtnCancel, "cancel");
+    get(m_pFtInfo, "info");
+    maStrInfoDefault = m_pFtInfo->GetText();
+    m_pFtInfo->SetText(OUString());
+
     if (!pRangeMap)
     {
         std::map<OUString, ScRangeName*> aRangeMap;
@@ -108,12 +97,11 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         maRangeMap.swap(*pRangeMap);
     }
     Init();
-    FreeResource();
 }
 
 ScNameDlg::~ScNameDlg()
 {
-    delete mpRangeManagerTable;
+    delete m_pRangeManagerTable;
 }
 
 void ScNameDlg::Init()
@@ -123,45 +111,42 @@ void ScNameDlg::Init()
     OSL_ENSURE( mpViewData && mpDoc, "ViewData oder Document nicht gefunden!" );
 
     //init UI
-    maFtInfo.SetStyle(WB_VCENTER);
-
-    mpRangeManagerTable = new ScRangeManagerTable(maNameMgrCtrl, maRangeMap, maCursorPos);
-    mpRangeManagerTable->SetSelectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
-    mpRangeManagerTable->SetDeselectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
-
-    maBtnOk.SetClickHdl  ( LINK( this, ScNameDlg, OkBtnHdl ) );
-    maBtnCancel.SetClickHdl  ( LINK( this, ScNameDlg, CancelBtnHdl ) );
-    maBtnAdd.SetClickHdl     ( LINK( this, ScNameDlg, AddBtnHdl ) );
-    maEdAssign.SetGetFocusHdl( LINK( this, ScNameDlg, AssignGetFocusHdl ) );
-    maEdAssign.SetModifyHdl  ( LINK( this, ScNameDlg, EdModifyHdl ) );
-    maEdName.SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) );
-    maLbScope.SetSelectHdl( LINK(this, ScNameDlg, ScopeChangedHdl) );
-    maBtnDelete.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) );
-    maBtnMore.SetClickHdl   ( LINK( this, ScNameDlg, MoreBtnHdl ) );
-    maBtnPrintArea.SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
-    maBtnCriteria.SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
-    maBtnRowHeader.SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
-    maBtnColHeader.SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
-
-    maBtnCriteria .Hide();
-    maBtnPrintArea.Hide();
-    maBtnColHeader.Hide();
-    maBtnRowHeader.Hide();
+    m_pFtInfo->SetStyle(WB_VCENTER);
+
+    SvxSimpleTableContainer *pCtrl = get<SvxSimpleTableContainer>("names");
+    pCtrl->set_height_request(pCtrl->GetTextHeight()*12);
+
+    m_pRangeManagerTable = new ScRangeManagerTable(*pCtrl, maRangeMap, maCursorPos);
+    m_pRangeManagerTable->SetSelectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
+    m_pRangeManagerTable->SetDeselectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
+
+    m_pBtnOk->SetClickHdl  ( LINK( this, ScNameDlg, OkBtnHdl ) );
+    m_pBtnCancel->SetClickHdl  ( LINK( this, ScNameDlg, CancelBtnHdl ) );
+    m_pBtnAdd->SetClickHdl     ( LINK( this, ScNameDlg, AddBtnHdl ) );
+    m_pEdAssign->SetGetFocusHdl( LINK( this, ScNameDlg, AssignGetFocusHdl ) );
+    m_pEdAssign->SetModifyHdl  ( LINK( this, ScNameDlg, EdModifyHdl ) );
+    m_pEdName->SetModifyHdl ( LINK( this, ScNameDlg, EdModifyHdl ) );
+    m_pLbScope->SetSelectHdl( LINK(this, ScNameDlg, ScopeChangedHdl) );
+    m_pBtnDelete->SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) );
+    m_pBtnPrintArea->SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
+    m_pBtnCriteria->SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
+    m_pBtnRowHeader->SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
+    m_pBtnColHeader->SetToggleHdl( LINK(this, ScNameDlg, EdModifyHdl ) );
 
     // Initialize scope list.
-    maLbScope.InsertEntry(maGlobalNameStr);
-    maLbScope.SelectEntryPos(0);
+    m_pLbScope->InsertEntry(maGlobalNameStr);
+    m_pLbScope->SelectEntryPos(0);
     SCTAB n = mpDoc->GetTableCount();
     for (SCTAB i = 0; i < n; ++i)
     {
         OUString aTabName;
         mpDoc->GetName(i, aTabName);
-        maLbScope.InsertEntry(aTabName);
+        m_pLbScope->InsertEntry(aTabName);
     }
 
 
 
-    if (mpRangeManagerTable->GetSelectionCount())
+    if (m_pRangeManagerTable->GetSelectionCount())
     {
         SelectionChanged();
     }
@@ -172,25 +157,25 @@ void ScNameDlg::Init()
 
 sal_Bool ScNameDlg::IsRefInputMode() const
 {
-    return maEdAssign.IsEnabled();
+    return m_pEdAssign->IsEnabled();
 }
 
 void ScNameDlg::RefInputDone( sal_Bool bForced)
 {
     ScAnyRefDlg::RefInputDone(bForced);
-    EdModifyHdl(&maEdAssign);
+    EdModifyHdl(m_pEdAssign);
 }
 
 void ScNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
-    if ( maEdAssign.IsEnabled() )
+    if ( m_pEdAssign->IsEnabled() )
     {
         if ( rRef.aStart != rRef.aEnd )
-            RefInputStart(&maEdAssign);
+            RefInputStart(m_pEdAssign);
         String aRefStr;
         rRef.Format( aRefStr, ABS_DREF3D, pDocP,
                 ScAddress::Details(pDocP->GetAddressConvention(), 0, 0) );
-        maEdAssign.SetRefString( aRefStr );
+        m_pEdAssign->SetRefString( aRefStr );
     }
 }
 
@@ -203,32 +188,32 @@ sal_Bool ScNameDlg::Close()
 
 void ScNameDlg::CheckForEmptyTable()
 {
-    if (!mpRangeManagerTable->GetEntryCount())
+    if (!m_pRangeManagerTable->GetEntryCount())
     {
-        maBtnDelete.Disable();
-        maEdAssign.Disable();
-        aRbAssign.Disable();
-        maEdName.Disable();
-        maLbScope.Disable();
-
-        maBtnCriteria.Disable();
-        maBtnPrintArea.Disable();
-        maBtnColHeader.Disable();
-        maBtnRowHeader.Disable();
+        m_pBtnDelete->Disable();
+        m_pEdAssign->Disable();
+        m_pRbAssign->Disable();
+        m_pEdName->Disable();
+        m_pLbScope->Disable();
+
+        m_pBtnCriteria->Disable();
+        m_pBtnPrintArea->Disable();
+        m_pBtnColHeader->Disable();
+        m_pBtnRowHeader->Disable();
     }
     else
     {
-        maBtnDelete.Enable();
-        maEdAssign.Enable();
-        aRbAssign.Enable();
-        maEdName.Enable();
-        maLbScope.Enable();
+        m_pBtnDelete->Enable();
+        m_pEdAssign->Enable();
+        m_pRbAssign->Enable();
+        m_pEdName->Enable();
+        m_pLbScope->Enable();
 
 
-        maBtnCriteria.Enable();
-        maBtnPrintArea.Enable();
-        maBtnColHeader.Enable();
-        maBtnRowHeader.Enable();
+        m_pBtnCriteria->Enable();
+        m_pBtnPrintArea->Enable();
+        m_pBtnColHeader->Enable();
+        m_pBtnRowHeader->Enable();
     }
 }
 
@@ -239,7 +224,7 @@ void ScNameDlg::CancelPushed()
 
 void ScNameDlg::SetActive()
 {
-    maEdAssign.GrabFocus();
+    m_pEdAssign->GrabFocus();
     RefInputDone();
 }
 
@@ -251,28 +236,28 @@ void ScNameDlg::UpdateChecks(ScRangeData* pData)
     // handlers, triggering handlers while already processing a handler can
     // ( and does in this case ) corrupt the internal data
 
-    maBtnCriteria.SetToggleHdl( Link() );
-    maBtnPrintArea.SetToggleHdl( Link() );
-    maBtnColHeader.SetToggleHdl( Link() );
-    maBtnRowHeader.SetToggleHdl( Link() );
+    m_pBtnCriteria->SetToggleHdl( Link() );
+    m_pBtnPrintArea->SetToggleHdl( Link() );
+    m_pBtnColHeader->SetToggleHdl( Link() );
+    m_pBtnRowHeader->SetToggleHdl( Link() );
 
-    maBtnCriteria .Check( pData->HasType( RT_CRITERIA ) );
-    maBtnPrintArea.Check( pData->HasType( RT_PRINTAREA ) );
-    maBtnColHeader.Check( pData->HasType( RT_COLHEADER ) );
-    maBtnRowHeader.Check( pData->HasType( RT_ROWHEADER ) );
+    m_pBtnCriteria->Check( pData->HasType( RT_CRITERIA ) );
+    m_pBtnPrintArea->Check( pData->HasType( RT_PRINTAREA ) );
+    m_pBtnColHeader->Check( pData->HasType( RT_COLHEADER ) );
+    m_pBtnRowHeader->Check( pData->HasType( RT_ROWHEADER ) );
 
     // Restore handlers so user input is processed again
     Link aToggleHandler = LINK( this, ScNameDlg, EdModifyHdl );
-    maBtnCriteria.SetToggleHdl( aToggleHandler );
-    maBtnPrintArea.SetToggleHdl( aToggleHandler );
-    maBtnColHeader.SetToggleHdl( aToggleHandler );
-    maBtnRowHeader.SetToggleHdl( aToggleHandler );
+    m_pBtnCriteria->SetToggleHdl( aToggleHandler );
+    m_pBtnPrintArea->SetToggleHdl( aToggleHandler );
+    m_pBtnColHeader->SetToggleHdl( aToggleHandler );
+    m_pBtnRowHeader->SetToggleHdl( aToggleHandler );
 }
 
 bool ScNameDlg::IsNameValid()
 {
-    OUString aScope = maLbScope.GetSelectEntry();
-    OUString aName = maEdName.GetText();
+    OUString aScope = m_pLbScope->GetSelectEntry();
+    OUString aName = m_pEdName->GetText();
     aName = aName.trim();
 
     if (aName.isEmpty())
@@ -282,17 +267,17 @@ bool ScNameDlg::IsNameValid()
 
     if (!ScRangeData::IsNameValid( aName, mpDoc ))
     {
-        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
-        maFtInfo.SetText(maErrInvalidNameStr);
+        m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
+        m_pFtInfo->SetText(maErrInvalidNameStr);
         return false;
     }
     else if (pRangeName && pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aName)))
     {
-        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
-        maFtInfo.SetText(maErrNameInUse);
+        m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
+        m_pFtInfo->SetText(maErrNameInUse);
         return false;
     }
-    maFtInfo.SetText( maStrInfoDefault );
+    m_pFtInfo->SetText( maStrInfoDefault );
     return true;
 }
 
@@ -300,10 +285,10 @@ bool ScNameDlg::IsFormulaValid()
 {
     ScCompiler aComp( mpDoc, maCursorPos);
     aComp.SetGrammar( mpDoc->GetGrammar() );
-    ScTokenArray* pCode = aComp.CompileString(maEdAssign.GetText());
+    ScTokenArray* pCode = aComp.CompileString(m_pEdAssign->GetText());
     if (pCode->GetCodeError())
     {
-        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
+        m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         delete pCode;
         return false;
     }
@@ -349,14 +334,14 @@ void ScNameDlg::SetEntry(const OUString& rName, const OUString& rScope)
         ScRangeNameLine aLine;
         aLine.aName = rName;
         aLine.aScope = rScope;
-        mpRangeManagerTable->SetEntry(aLine);
+        m_pRangeManagerTable->SetEntry(aLine);
     }
 }
 
 void ScNameDlg::RemovePushed()
 {
-    std::vector<ScRangeNameLine> maEntries = mpRangeManagerTable->GetSelectedEntries();
-    mpRangeManagerTable->DeleteSelectedEntries();
+    std::vector<ScRangeNameLine> maEntries = m_pRangeManagerTable->GetSelectedEntries();
+    m_pRangeManagerTable->DeleteSelectedEntries();
     for (std::vector<ScRangeNameLine>::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
     {
         ScRangeName* pRangeName = GetRangeName(itr->aScope);
@@ -374,11 +359,11 @@ void ScNameDlg::RemovePushed()
 void ScNameDlg::NameModified()
 {
     ScRangeNameLine aLine;
-    mpRangeManagerTable->GetCurrentLine(aLine);
+    m_pRangeManagerTable->GetCurrentLine(aLine);
     OUString aOldName = aLine.aName;
-    OUString aNewName = maEdName.GetText();
+    OUString aNewName = m_pEdName->GetText();
     aNewName = aNewName.trim();
-    maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor());
+    m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor());
     if (aNewName != aOldName)
     {
         if (!IsNameValid())
@@ -386,7 +371,7 @@ void ScNameDlg::NameModified()
     }
     else
     {
-        maFtInfo.SetText( maStrInfoDefault );
+        m_pFtInfo->SetText( maStrInfoDefault );
     }
 
     if (!IsFormulaValid())
@@ -399,8 +384,8 @@ void ScNameDlg::NameModified()
     //empty table
     if (aOldScope.isEmpty())
         return;
-    OUString aExpr = maEdAssign.GetText();
-    OUString aNewScope = maLbScope.GetSelectEntry();
+    OUString aExpr = m_pEdAssign->GetText();
+    OUString aNewScope = m_pLbScope->GetSelectEntry();
 
     ScRangeName* pOldRangeName = GetRangeName( aOldScope );
     ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) );
@@ -411,12 +396,12 @@ void ScNameDlg::NameModified()
     {
         pOldRangeName->erase(*pData);
         mbNeedUpdate = false;
-        mpRangeManagerTable->DeleteSelectedEntries();
+        m_pRangeManagerTable->DeleteSelectedEntries();
         RangeType nType = RT_NAME |
-            (maBtnRowHeader.IsChecked() ? RT_ROWHEADER : RangeType(0))
-            |(maBtnColHeader.IsChecked() ? RT_COLHEADER : RangeType(0))
-            |(maBtnPrintArea.IsChecked() ? RT_PRINTAREA : RangeType(0))
-            |(maBtnCriteria.IsChecked()  ? RT_CRITERIA  : RangeType(0));
+            (m_pBtnRowHeader->IsChecked() ? RT_ROWHEADER : RangeType(0))
+            |(m_pBtnColHeader->IsChecked() ? RT_COLHEADER : RangeType(0))
+            |(m_pBtnPrintArea->IsChecked() ? RT_PRINTAREA : RangeType(0))
+            |(m_pBtnCriteria->IsChecked()  ? RT_CRITERIA  : RangeType(0));
 
         ScRangeData* pNewEntry = new ScRangeData( mpDoc, aNewName, aExpr,
                 maCursorPos, nType);
@@ -424,7 +409,7 @@ void ScNameDlg::NameModified()
         aLine.aName = aNewName;
         aLine.aExpression = aExpr;
         aLine.aScope = aNewScope;
-        mpRangeManagerTable->addEntry(aLine);
+        m_pRangeManagerTable->addEntry(aLine);
         mbNeedUpdate = true;
         mbDataChanged = true;
     }
@@ -440,37 +425,37 @@ void ScNameDlg::SelectionChanged()
         return;
     }
 
-    if (mpRangeManagerTable->IsMultiSelection())
+    if (m_pRangeManagerTable->IsMultiSelection())
     {
-        maEdName.SetText(maStrMultiSelect);
-        maEdAssign.SetText(maStrMultiSelect);
-
-        maEdName.Disable();
-        maEdAssign.Disable();
-        aRbAssign.Disable();
-        maLbScope.Disable();
-        maBtnRowHeader.Disable();
-        maBtnColHeader.Disable();
-        maBtnPrintArea.Disable();
-        maBtnCriteria.Disable();
+        m_pEdName->SetText(maStrMultiSelect);
+        m_pEdAssign->SetText(maStrMultiSelect);
+
+        m_pEdName->Disable();
+        m_pEdAssign->Disable();
+        m_pRbAssign->Disable();
+        m_pLbScope->Disable();
+        m_pBtnRowHeader->Disable();
+        m_pBtnColHeader->Disable();
+        m_pBtnPrintArea->Disable();
+        m_pBtnCriteria->Disable();
     }
     else
     {
         ScRangeNameLine aLine;
-        mpRangeManagerTable->GetCurrentLine(aLine);
-        maEdAssign.SetText(aLine.aExpression);
-        maEdName.SetText(aLine.aName);
-        maLbScope.SelectEntry(aLine.aScope);
+        m_pRangeManagerTable->GetCurrentLine(aLine);
+        m_pEdAssign->SetText(aLine.aExpression);
+        m_pEdName->SetText(aLine.aName);
+        m_pLbScope->SelectEntry(aLine.aScope);
         ShowOptions(aLine);
-        maBtnDelete.Enable();
-        maEdName.Enable();
-        maEdAssign.Enable();
-        aRbAssign.Enable();
-        maLbScope.Enable();
-        maBtnRowHeader.Enable();
-        maBtnColHeader.Enable();
-        maBtnPrintArea.Enable();
-        maBtnCriteria.Enable();
+        m_pBtnDelete->Enable();
+        m_pEdName->Enable();
+        m_pEdAssign->Enable();
+        m_pRbAssign->Enable();
+        m_pLbScope->Enable();
+        m_pBtnRowHeader->Enable();
+        m_pBtnColHeader->Enable();
+        m_pBtnPrintArea->Enable();
+        m_pBtnCriteria->Enable();
     }
 }
 
@@ -479,48 +464,6 @@ void ScNameDlg::ScopeChanged()
     NameModified();
 }
 
-namespace {
-
-void MoveWindow( Window& rButton, long nPixel)
-{
-    Point aPoint = rButton.GetPosPixel();
-    aPoint.Y() += nPixel;
-    rButton.SetPosPixel(aPoint);
-}
-
-}
-
-void ScNameDlg::MorePushed()
-{
-    Size nSize = GetSizePixel();
-
-    //depending on the state of the button, move all elements below up/down
-    long nPixel = 60;
-    if (!maBtnMore.GetState())
-    {
-        nPixel *= -1;
-        maBtnRowHeader.Hide();
-        maBtnColHeader.Hide();
-        maBtnPrintArea.Hide();
-        maBtnCriteria.Hide();
-    }
-    else
-    {
-        maBtnRowHeader.Show();
-        maBtnColHeader.Show();
-        maBtnPrintArea.Show();
-        maBtnCriteria.Show();
-    }
-    nSize.Height() += nPixel;
-    SetSizePixel(nSize);
-    MoveWindow(maBtnAdd, nPixel);
-    MoveWindow(maBtnDelete, nPixel);
-    MoveWindow(maBtnHelp, nPixel);
-    MoveWindow(maBtnOk, nPixel);
-    MoveWindow(maBtnCancel, nPixel);
-    MoveWindow(maFlDiv, nPixel);
-}
-
 void ScNameDlg::GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap)
 {
     maRangeMap.swap(rRangeMap);
@@ -557,7 +500,7 @@ IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl)
 
 IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl)
 {
-    EdModifyHdl( &maEdAssign );
+    EdModifyHdl(m_pEdAssign);
     return 0;
 }
 
@@ -573,9 +516,4 @@ IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(ScNameDlg, MoreBtnHdl)
-{
-    MorePushed();
-    return 0;
-}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 13c486230a08..1b39a0bfae89 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -33,7 +33,6 @@
 #include "docfunc.hxx"
 #include "scresid.hxx"
 #include "globstr.hrc"
-#include "namedlg.hrc"
 #include "namedlg.hxx"
 #include "viewdata.hxx"
 #include "globalnames.hxx"
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 06d1170c0b5d..036f6a5f8711 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1839,6 +1839,10 @@ Resource RID_GLOBSTR
     {
         Text [en-US] = "Scope";
     };
+    String STR_MULTI_SELECT
+    {
+        Text [en-US] = "(multiple)";
+    };
     String STR_GLOBAL_SCOPE
     {
         Text [ en-US ] = "Document (Global)" ;
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
deleted file mode 100644
index 08b6d760aea9..000000000000
--- a/sc/source/ui/src/namedlg.src
+++ /dev/null
@@ -1,188 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "namedlg.hrc"
-ModelessDialog RID_SCDLG_NAMES
-{
-    OutputSize = TRUE ;
-    HelpId = CMD_FID_DEFINE_NAME ;
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 220 , 247 ) ;
-    Text [ en-US ] = "Manage Names" ;
-    Moveable = TRUE ;
-    Closeable = TRUE;
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 5 , 229 ) ;
-        Size = MAP_APPFONT ( 50 , 15 ) ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_ADD
-    {
-        HelpID = "sc:PushButton:RID_SCDLG_NAMES:BTN_ADD";
-        Pos = MAP_APPFONT ( 5 , 202 ) ;
-        Size = MAP_APPFONT ( 50 , 15 ) ;
-        Text [ en-US ] = "Add" ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    PushButton BTN_DELETE
-    {
-        Pos = MAP_APPFONT( 60, 202) ;
-        Size = MAP_APPFONT ( 50, 15 ) ;
-        Text [ en-US ] = "~Delete" ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_NAME_OK
-    {
-        Pos = MAP_APPFONT ( 110 , 229 ) ;
-        Size = MAP_APPFONT ( 50 , 15 ) ;
-        Text [ en-US ] = "OK" ;
-        TabStop = TRUE ;
-    };
-    PushButton BTN_NAME_CANCEL
-    {
-        Pos = MAP_APPFONT ( 165 , 229 ) ;
-        Size = MAP_APPFONT ( 50 , 15 ) ;
-        Text [ en-US ] = "Cancel" ;
-        TabStop = TRUE ;
-    };
-
-    FixedText FT_SCOPE
-    {
-        Pos = MAP_APPFONT( 5, 174 );
-        Size = MAP_APPFONT( 50, 8 );
-        Text [ en-US ] = "Scope" ;
-    };
-    FixedText FT_RANGE
-    {
-        Pos = MAP_APPFONT( 5, 158 );
-        Size = MAP_APPFONT( 50, 8 );
-        Text [ en-US ] = "Range" ;
-    };
-    FixedText FT_NAME
-    {
-        Pos = MAP_APPFONT( 5, 142 );
-        Size = MAP_APPFONT( 50, 8 );
-        Text [ en-US ] = "Name" ;
-    };
-
-    Edit ED_NAME2
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 140 ) ;
-        Size = MAP_APPFONT ( 155 , 13 ) ;
-        TabStop = TRUE ;
-    };
-    ListBox LB_SCOPE
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 172 ) ;
-        Size = MAP_APPFONT ( 155 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    Edit ED_ASSIGN
-    {
-        HelpID = "sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 156 ) ;
-        Size = MAP_APPFONT ( 142 , 13 ) ;
-        TabStop = TRUE ;
-    };
-    ImageButton RB_ASSIGN
-    {
-        HelpID = "sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN";
-        Pos = MAP_APPFONT ( 202 , 156 ) ;
-        Size = MAP_APPFONT ( 13 , 13 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Shrink" ;
-    };
-    CheckBox BTN_MORE
-    {
-        HelpID = "sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE";
-        Pos = MAP_APPFONT ( 5 , 190 ) ;
-        Size = MAP_APPFONT ( 80 , 15 ) ;
-        Text [en-US] = "Range Options";
-    };
-    FixedLine FL_DIV
-    {
-        Pos = MAP_APPFONT ( 0, 222 ) ;
-        Size = MAP_APPFONT ( 220, 2 ) ;
-    };
-    CheckBox BTN_PRINTAREA
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA";
-        Pos = MAP_APPFONT ( 5 , 203 ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        Text [ en-US ] = "~Print range" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_CRITERIA
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA";
-        Pos = MAP_APPFONT ( 5 , 216 ) ;
-        Size = MAP_APPFONT ( 60 , 10 ) ;
-        Text [ en-US ] = "~Filter" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_ROWHEADER
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER";
-        Pos = MAP_APPFONT ( 110, 216 ) ;
-        Size = MAP_APPFONT ( 82 , 10 ) ;
-        Text [ en-US ] = "Repeat ~row" ;
-        TabStop = TRUE ;
-    };
-    CheckBox BTN_COLHEADER
-    {
-        HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER";
-        Pos = MAP_APPFONT ( 110 , 203 ) ;
-        Size = MAP_APPFONT ( 82 , 10 ) ;
-        Text [ en-US ] = "Repeat ~column" ;
-        TabStop = TRUE ;
-    };
-
-    FixedText FT_INFO
-    {
-        Pos = MAP_APPFONT( 5, 122 );
-        Size = MAP_APPFONT( 210, 15 );
-        TabStop = FALSE;
-    };
-
-    Control CTRL_MANAGENAMES
-    {
-        Pos = MAP_APPFONT( 5, 5 );
-        Size = MAP_APPFONT( 210, 115 );
-        Border = TRUE;
-        DialogControl = TRUE;
-    };
-    String STR_DEFAULT_INFO
-    {
-        Text [en-US] = "Select cells in the document to update the range.";
-    };
-    String STR_MULTI_SELECT
-    {
-        Text [en-US] = "(multiple)";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui
index 4d11b0e7f532..0f9131ebc491 100644
--- a/sc/uiconfig/scalc/ui/managenamesdialog.ui
+++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui
@@ -1,77 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkWindow" id="Manage Names">
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkDialog" id="ManageNamesDialog">
     <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox" id="box1">
-        <property name="visible">True</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Manage Names</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkBox" id="box6">
-            <property name="visible">True</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkBox" id="box7">
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">100</property>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Name</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Range</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Scope</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow" id="scrolledwindow1">
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -79,83 +47,48 @@
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkGrid" id="grid2">
+          <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">30</property>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Name</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Range</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Scope</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
+            <property name="orientation">vertical</property>
+            <property name="spacing">12</property>
             <child>
-              <object class="GtkBox" id="box5">
+              <object class="GtkBox" id="box6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkEntry" id="entry2">
+                  <object class="svxcorelo-SvxSimpleTableContainer" id="names">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="invisible_char">•</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="Simple Table Container-selection1"/>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -163,66 +96,40 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="stock">gtk-missing-image</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="comboboxtext1">
+              <object class="GtkLabel" id="info">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
+                <property name="label" translatable="yes">Select cells in the document to update the range.</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkExpander" id="expander1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
             <child>
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">30</property>
+                <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton1">
-                    <property name="label" translatable="yes">_Print range</property>
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="label" translatable="yes">Name</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">name</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -232,14 +139,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton2">
-                    <property name="label" translatable="yes">_Filter</property>
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="label" translatable="yes">Range</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">range</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -249,14 +155,28 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton3">
-                    <property name="label" translatable="yes">Repeat _column</property>
+                  <object class="GtkLabel" id="label4">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="label" translatable="yes">Scope</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">scope</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="name">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="invisible_char_set">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -266,14 +186,38 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="checkbutton4">
-                    <property name="label" translatable="yes">Repeat _row</property>
+                  <object class="GtkBox" id="box5">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="foruilo-RefEdit" id="range">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="invisible_char">•</property>
+                        <property name="width_chars">42</property>
+                        <property name="invisible_char_set">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="foruilo-RefButton" id="assign">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -282,100 +226,141 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Range _Options</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkButton" id="add">
-                <property name="label">gtk-add</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="delete">
-                <property name="label">gtk-delete</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <child>
+                  <object class="GtkComboBoxText" id="scope">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="entry_text_column">0</property>
+                    <property name="id_column">1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator" id="separator1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
+              <object class="GtkExpander" id="expander1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <object class="GtkGrid" id="grid1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
+                        <property name="column_homogeneous">True</property>
+                        <child>
+                          <object class="GtkCheckButton" id="printrange">
+                            <property name="label" translatable="yes">_Print range</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="filter">
+                            <property name="label" translatable="yes">_Filter</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="colheader">
+                            <property name="label" translatable="yes">Repeat _column</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="rowheader">
+                            <property name="label" translatable="yes">Repeat _row</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child type="label">
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Range _Options</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box3">
+              <object class="GtkButtonBox" id="buttonbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">6</property>
+                <property name="spacing">12</property>
+                <property name="layout_style">start</property>
                 <child>
-                  <object class="GtkButton" id="ok">
-                    <property name="label">gtk-ok</property>
+                  <object class="GtkButton" id="add">
+                    <property name="label">gtk-add</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -388,8 +373,8 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="cancel">
-                    <property name="label">gtk-cancel</property>
+                  <object class="GtkButton" id="delete">
+                    <property name="label">gtk-delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -405,18 +390,22 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">5</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
+    <action-widgets>
+      <action-widget response="0">help</action-widget>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+    </action-widgets>
   </object>
 </interface>