adapt code to manage names dialog .ui conversion

Change-Id: I67d587c0241a1d8377aee199a30bfcc919e3faad

2 files changed, 19 insertions, 77 deletions

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 );