ManageNames: clean ScNameDlg even more

4 files changed, 44 insertions, 7 deletions

diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index 3a923ae94256..429ea977bcab 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -32,6 +32,8 @@
 #define BTN_MORE        6
 #define BTN_DELETE      57
 #define BTN_CLOSE       62
+#define BTN_CANCEL      73
+#define BTN_SELECT      74
 
 #define FT_SCOPE        7
 #define FT_RANGE        58
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 2e9a8c9caa88..1f087d13fa6b 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -112,7 +112,9 @@ private:
     HelpButton      maBtnHelp;
     PushButton      maBtnAdd;
     PushButton      maBtnDelete;
-    PushButton      maBtnClose;
+    PushButton      maBtnSelect;
+    OKButton        maBtnOk;
+    CancelButton    maBtnCancel;
     MoreButton      maBtnMore;
 
     const String    mErrMsgInvalidSym;
@@ -135,6 +137,7 @@ private:
     bool AddPushed();
     void RemovePushed();
     void OKPushed();
+    void CancelPushed();
     void NameSelected();
     void ScopeChanged();
     void NameModified();
@@ -143,9 +146,11 @@ private:
     void SelectionChanged();
 
     // Handler:
-    DECL_LINK( CloseBtnHdl, void * );
+    DECL_LINK( OkBtnHdl, void * );
+    DECL_LINK( CancelBtnHdl, void * );
     DECL_LINK( AddBtnHdl, void * );
     DECL_LINK( RemoveBtnHdl, void * );
+    DECL_LINK( SelectBtnHdl, void * );
     DECL_LINK( EdModifyHdl, void * );
     DECL_LINK( AssignGetFocusHdl, void * );
     DECL_LINK( SelectionChangedHdl_Impl, void* );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 42b12b8846ba..873875ecb151 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -207,7 +207,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     maBtnHelp        ( this, ScResId( BTN_HELP ) ),
     maBtnAdd         ( this, ScResId( BTN_ADD ) ),
     maBtnDelete      ( this, ScResId( BTN_DELETE ) ),
-    maBtnClose       ( this, ScResId( BTN_CLOSE ) ),
+    maBtnSelect      ( this, ScResId( BTN_SELECT ) ),
+    maBtnOk          ( this, ScResId( BTN_CLOSE ) ),
+    maBtnCancel      ( this, ScResId( BTN_CANCEL ) ),
     maBtnMore        ( this, ScResId( BTN_MORE ) ),
     //
     mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
@@ -241,7 +243,8 @@ void ScNameDlg::Init()
     mpRangeManagerTable->SetSelectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
     mpRangeManagerTable->SetDeselectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
 
-    maBtnClose.SetClickHdl  ( LINK( this, ScNameDlg, CloseBtnHdl ) );
+    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 ) );
@@ -315,6 +318,11 @@ sal_Bool ScNameDlg::Close()
     return DoClose( ScNameDlgWrapper::GetChildWindowId() );
 }
 
+void ScNameDlg::CancelPushed()
+{
+    DoClose( ScNameDlgWrapper::GetChildWindowId() );
+}
+
 void ScNameDlg::SetActive()
 {
     maEdAssign.GrabFocus();
@@ -505,7 +513,7 @@ void MoveWindow( Window& rButton, long nPixel)
 
 void ScNameDlg::MorePushed()
 {
-    //depending on the state of the button, move all elements beloe up/down
+    //depending on the state of the button, move all elements below up/down
     long nPixel = 85;
     if (!maBtnMore.GetState())
     {
@@ -514,16 +522,24 @@ void ScNameDlg::MorePushed()
     MoveWindow(maBtnAdd, nPixel);
     MoveWindow(maBtnDelete, nPixel);
     MoveWindow(maBtnHelp, nPixel);
-    MoveWindow(maBtnClose, nPixel);
+    MoveWindow(maBtnOk, nPixel);
+    MoveWindow(maBtnCancel, nPixel);
+    MoveWindow(maBtnSelect, nPixel);
     MoveWindow(maFlDiv, nPixel);
 }
 
-IMPL_LINK( ScNameDlg, CloseBtnHdl, void *, EMPTYARG )
+IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG )
 {
     Close();
     return 0;
 }
 
+IMPL_LINK( ScNameDlg, CancelBtnHdl, void *, EMPTYARG )
+{
+    CancelPushed();
+    return 0;
+}
+
 IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG )
 {
     return AddPushed();
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 31a9213adb2b..3d051e94b88c 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -60,11 +60,25 @@ ModelessDialog RID_SCDLG_NAMES
     };
     PushButton BTN_CLOSE
     {
+        Pos = MAP_APPFONT ( 108 , 225 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Text [ en-US ] = "Close" ;
+        TabStop = TRUE ;
+    };
+    PushButton BTN_CANCEL
+    {
         Pos = MAP_APPFONT ( 168 , 225 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Close" ;
         TabStop = TRUE ;
     };
+    PushButton BTN_SELECT
+    {
+        Pos = MAP_APPFONT ( 108 , 200 ) ;
+        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Text [ en-US ] = "Close" ;
+        TabStop = TRUE ;
+    };
 
     FixedText FT_SCOPE
     {