ManageNames: fix taborder for DefineNames dialog

the more button is not usable with the keyboard

2 files changed, 18 insertions, 17 deletions

diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index f983e12e5bfa..bc52cc77558c 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -43,26 +43,27 @@ class ScViewData;
 class ScNameDefDlg : public ScAnyRefDlg
 {
 private:
-    PushButton maBtnAdd;
-    PushButton maBtnCancel;
-    DisclosureButton maBtnMore;
-    FixedText maFtInfo;
-    FixedText maFtName;
-    FixedText maFtRange;
-    FixedText maFtScope;
-    FixedLine maFlDiv;
-
     Edit maEdName;
+
     formula::RefEdit maEdRange;
     formula::RefButton maRbRange;
 
     ListBox maLbScope;
 
+    DisclosureButton maBtnMore;
     CheckBox maBtnRowHeader;
     CheckBox maBtnColHeader;
     CheckBox maBtnPrintArea;
     CheckBox maBtnCriteria;
 
+    PushButton maBtnAdd;
+    PushButton maBtnCancel;
+    FixedText maFtInfo;
+    FixedText maFtName;
+    FixedText maFtRange;
+    FixedText maFtScope;
+    FixedLine maFlDiv;
+
 
     bool mbUndo; //if true we need to add an undo action after creating a range name
     ScDocument* mpDoc;
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index c4ffc2e0c795..7fc3963c6d0f 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -51,22 +51,22 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen
         ScViewData* pViewData, std::map<rtl::OUString, ScRangeName*> aRangeMap,
         const ScAddress& aCursorPos, const bool bUndo ) :
     ScAnyRefDlg( pB, pCW, pParent, RID_SCDLG_NAMES_DEFINE ),
-    maBtnAdd( this, ScResId( BTN_ADD ) ),
-    maBtnCancel( this, ScResId( BTN_CANCEL ) ),
-    maBtnMore( this, ScResId( BTN_MORE ) ),
-    maFtInfo( this, ScResId( FT_INFO ) ),
-    maFtName( this, ScResId( FT_NAME ) ),
-    maFtRange( this, ScResId( FT_RANGE ) ),
-    maFtScope( this, ScResId( FT_SCOPE ) ),
-    maFlDiv( this, ScResId( FL_DIV ) ),
     maEdName( this, ScResId( ED_NAME ) ),
     maEdRange( this, this, ScResId( ED_RANGE ) ),
     maRbRange( this, ScResId( RB_RANGE ), &maEdRange, this ),
     maLbScope( this, ScResId( LB_SCOPE ) ),
+    maBtnMore( this, ScResId( BTN_MORE ) ),
     maBtnRowHeader( this, ScResId( BTN_ROWHEADER ) ),
     maBtnColHeader( this, ScResId( BTN_COLHEADER ) ),
     maBtnPrintArea( this, ScResId( BTN_PRINTAREA ) ),
     maBtnCriteria( this, ScResId( BTN_CRITERIA ) ),
+    maBtnAdd( this, ScResId( BTN_ADD ) ),
+    maBtnCancel( this, ScResId( BTN_CANCEL ) ),
+    maFtInfo( this, ScResId( FT_INFO ) ),
+    maFtName( this, ScResId( FT_NAME ) ),
+    maFtRange( this, ScResId( FT_RANGE ) ),
+    maFtScope( this, ScResId( FT_SCOPE ) ),
+    maFlDiv( this, ScResId( FL_DIV ) ),
     mbUndo( bUndo ),
     mpDoc( pViewData->GetDocument() ),
     mpDocShell ( pViewData->GetDocShell() ),