ManageNames: use a more modern looking button for RangeOptions

3 files changed, 19 insertions, 11 deletions

diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 1751dfbff5ce..6a9523f787bf 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -78,8 +78,8 @@ private:
     PushButton      maBtnDelete;
     PushButton      maBtnSelect;
     PushButton      maBtnOk;
-    PushButton    maBtnCancel;
-    MoreButton      maBtnMore;
+    PushButton      maBtnCancel;
+    DisclosureButton maBtnMore;
     FixedText       maFtInfo;
 
     const String    mErrMsgInvalidSym;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 272b9cbc4dbd..46970a400762 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -158,11 +158,6 @@ void ScNameDlg::Init()
     maBtnColHeader.Hide();
     maBtnRowHeader.Hide();
 
-    maBtnMore.AddWindow( &maBtnCriteria );
-    maBtnMore.AddWindow( &maBtnPrintArea );
-    maBtnMore.AddWindow( &maBtnColHeader );
-    maBtnMore.AddWindow( &maBtnRowHeader );
-
     // Initialize scope list.
     maLbScope.InsertEntry(maGlobalNameStr);
     maLbScope.SelectEntryPos(0);
@@ -495,12 +490,27 @@ void MoveWindow( Window& rButton, long nPixel)
 
 void ScNameDlg::MorePushed()
 {
+    Size nSize = GetSizePixel();
+
     //depending on the state of the button, move all elements below up/down
     long nPixel = 85;
     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);
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index ce79e484827b..b97ab9f54c7b 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -131,14 +131,12 @@ ModelessDialog RID_SCDLG_NAMES
         TabStop = TRUE ;
         QuickHelpText [ en-US ] = "Shrink" ;
     };
-    MoreButton BTN_MORE
+    CheckBox BTN_MORE
     {
         HelpID = "sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE";
         Pos = MAP_APPFONT ( 6 , 185 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        MapUnit = MAP_APPFONT ;
-        Delta = 41 ;
+        Text [en-US] = "Range Options";
     };
     FixedLine FL_DIV
     {