1 files changed, 24 insertions, 31 deletions
diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx
index a6f01bd0a3ec..e36b6222ee2b 100644
--- a/sc/source/ui/inc/dbnamdlg.hxx
+++ b/sc/source/ui/inc/dbnamdlg.hxx
@@ -23,10 +23,9 @@
 #include <vector>
 
 #include <vcl/combobox.hxx>
-
 #include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 
-#include <vcl/morebtn.hxx>
 #include "anyrefdg.hxx"
 #include "dbdata.hxx"
 #include "expftext.hxx"
@@ -51,37 +50,33 @@ public:
     virtual sal_Bool    Close();
 
 private:
-    FixedLine           aFlName;
-    ComboBox            aEdName;
-
-    FixedLine           aFlAssign;
-    formula::RefEdit            aEdAssign;
-    formula::RefButton          aRbAssign;
-
-    FixedLine           aFlOptions;
-    CheckBox            aBtnHeader;
-    CheckBox            aBtnDoSize;
-    CheckBox            aBtnKeepFmt;
-    CheckBox            aBtnStripData;
-    ScExpandedFixedText aFTSource;
-    FixedText           aFTOperations;
-
-    OKButton        aBtnOk;
-    CancelButton    aBtnCancel;
-    HelpButton      aBtnHelp;
-    PushButton      aBtnAdd;
-    PushButton      aBtnRemove;
-    MoreButton      aBtnMore;
+    ComboBox*           m_pEdName;
 
-    sal_Bool            bSaved;
+    VclFrame*           m_pAssignFrame;
+    formula::RefEdit*   m_pEdAssign;
+    formula::RefButton* m_pRbAssign;
+
+    VclContainer*       m_pOptions;
+    CheckBox*           m_pBtnHeader;
+    CheckBox*           m_pBtnDoSize;
+    CheckBox*           m_pBtnKeepFmt;
+    CheckBox*           m_pBtnStripData;
+    FixedText*          m_pFTSource;
+    FixedText*          m_pFTOperations;
 
+    OKButton*           m_pBtnOk;
+    CancelButton*       m_pBtnCancel;
+    PushButton*         m_pBtnAdd;
+    PushButton*         m_pBtnRemove;
+
+    sal_Bool            bSaved;
 
-    const String    aStrAdd;
-    const String    aStrModify;
-    const String    aStrInvalid;
+    OUString        aStrAdd;
+    OUString        aStrModify;
+    OUString        aStrInvalid;
 
-    String          aStrSource;
-    String          aStrOperations;
+    OUString        aStrSource;
+    OUString        aStrOperations;
 
     ScViewData*     pViewData;
     ScDocument*     pDoc;
@@ -92,7 +87,6 @@ private:
     ScRange         theCurArea;
     std::vector<ScRange> aRemoveList;
 
-#ifdef _DBNAMDLG_CXX
 private:
     void            Init();
     void            UpdateNames();
@@ -105,7 +99,6 @@ private:
     DECL_LINK( RemoveBtnHdl, void * );
     DECL_LINK( NameModifyHdl, void * );
     DECL_LINK( AssModifyHdl, void * );
-#endif
 };