[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_test_filters.mk sc/prj sc/source

[Markus Mohrhard]

 sc/CppunitTest_sc_test_filters.mk |    2 ++
 sc/prj/build.lst                  |    2 +-
 sc/source/ui/inc/namedlg.hxx      |    2 ++
 sc/source/ui/namedlg/namedlg.cxx  |   34 ++++++++++++++++++++++++++++++++++
 sc/source/ui/src/namedlg.src      |    8 ++++----
 5 files changed, 43 insertions(+), 5 deletions(-)

New commits:
commit bc406a77b582ab799428b9fbf05afdbed75dbeb7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 27 16:04:00 2011 +0200

    add dependencies for vba unit test

diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_test_filters.mk
index cf524d9..1b13294 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_test_filters.mk
@@ -125,6 +125,8 @@ $(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
     configmgr \
     ucb1 \
     ucpfile1 \
+	basprov \
+	scriptframe \
 ))
 
 # we need to
diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index 7f48e14..27b7c30 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -1,2 +1,2 @@
-sc      sc      :       filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg NULL
+sc      sc      :       filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting NULL
 sc sc\prj nmake - all sc_prj   NULL
commit acbeb839aa718381f13f4f3097ff17ee46e06de8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 27 15:16:17 2011 +0200

    move the checkboxes below the more button

diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 8a55623..c956cc1 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -188,6 +188,7 @@ private:
     void ScopeChanged();
     void NameModified();
     void BackPushed();
+    void MorePushed();
 
     void SelectionChanged();
 
@@ -201,6 +202,7 @@ private:
     DECL_LINK( SelectionChangedHdl_Impl, void* );
     DECL_LINK( BackBtnHdl, void * );
     DECL_LINK( ScopeChangedHdl, void* );
+    DECL_LINK( MoreBtnHdl, void* );
 
 protected:
     virtual void    RefInputDone( sal_Bool bForced = sal_False );
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 47ff629..1e5733a 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -304,6 +304,7 @@ void ScNameDlg::Init()
     maLbScope.SetSelectHdl( LINK(this, ScNameDlg, ScopeChangedHdl) );
     maBtnDelete.SetClickHdl ( LINK( this, ScNameDlg, RemoveBtnHdl ) );
     maBtnModify.SetClickHdl ( LINK( this, ScNameDlg, ModifyBtnHdl ) );
+    maBtnMore.SetClickHdl   ( LINK( this, ScNameDlg, MoreBtnHdl ) );
 
     maBtnBack.Disable();
 
@@ -644,6 +645,34 @@ void ScNameDlg::ModifiedPushed()
     }
 }
 
+namespace {
+
+void MoveWindow( Window& rButton, long nPixel)
+{
+    Point aPoint = rButton.GetPosPixel();
+    aPoint.Y() += nPixel;
+    rButton.SetPosPixel(aPoint);
+}
+
+}
+
+void ScNameDlg::MorePushed()
+{
+    //depending on the state of the button, move all elements beloe up/down
+    long nPixel = 85;
+    if (!maBtnMore.GetState())
+    {
+        nPixel *= -1;
+    }
+    MoveWindow(maBtnAdd, nPixel);
+    MoveWindow(maBtnModify, nPixel);
+    MoveWindow(maBtnBack, nPixel);
+    MoveWindow(maBtnDelete, nPixel);
+    MoveWindow(maBtnHelp, nPixel);
+    MoveWindow(maBtnClose, nPixel);
+    MoveWindow(maFlDiv, nPixel);
+}
+
 IMPL_LINK( ScNameDlg, CloseBtnHdl, void *, EMPTYARG )
 {
     Close();
@@ -698,4 +727,9 @@ IMPL_LINK( ScNameDlg, ScopeChangedHdl, void*, EMPTYARG )
     return 0;
 }
 
+IMPL_LINK( ScNameDlg, MoreBtnHdl, void*, EMPTYARG )
+{
+    MorePushed();
+    return 0;
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index be1c84c..00c5c82 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -148,7 +148,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_PRINTAREA
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA";
-        Pos = MAP_APPFONT ( 6 , 255 ) ;
+        Pos = MAP_APPFONT ( 6 , 208 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Print range" ;
         TabStop = TRUE ;
@@ -156,7 +156,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_CRITERIA
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA";
-        Pos = MAP_APPFONT ( 6 , 270 ) ;
+        Pos = MAP_APPFONT ( 6 , 223 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Filter" ;
         TabStop = TRUE ;
@@ -164,7 +164,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_ROWHEADER
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER";
-        Pos = MAP_APPFONT ( 110, 270 ) ;
+        Pos = MAP_APPFONT ( 110, 223 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Repeat ~row" ;
         TabStop = TRUE ;
@@ -172,7 +172,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_COLHEADER
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER";
-        Pos = MAP_APPFONT ( 110 , 255 ) ;
+        Pos = MAP_APPFONT ( 110 , 208 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Repeat ~column" ;
         TabStop = TRUE ;