[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/uibase/inc/actctrl.hxx  |    6 ++++--
 sw/source/uibase/utlui/navipi.cxx |    2 +-
 sw/source/uibase/utlui/navipi.hrc |    1 -
 sw/source/uibase/utlui/navipi.src |   16 ----------------
 4 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit 08f0a1646961361ab41d5e11d8e0763c133e281a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 10 14:14:44 2016 +0100

    de-src solo NumericField
    
    Change-Id: Idfdf54015f150d48a5b9af0ed8301ca6e7748f19

diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 7a24e98..a0dd15ac 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -31,8 +31,10 @@ protected:
     void Action();
     virtual bool Notify( NotifyEvent& rNEvt ) override;
 public:
-    NumEditAction( vcl::Window* pParent, const ResId& rResId ) :
-                                NumericField(pParent, rResId) {}
+    NumEditAction(vcl::Window* pParent, WinBits nBits)
+        : NumericField(pParent, nBits)
+    {
+    }
 
     void        SetActionHdl( const Link<NumEditAction&,void>& rLink ) { aActionLink = rLink;}
 };
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index ff1df89..3c39a85 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -685,7 +685,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
 
     // Insert the numeric field in the toolbox.
     VclPtr<NumEditAction> pEdit = VclPtr<NumEditAction>::Create(
-                    m_aContentToolBox.get(), SW_RES(NF_PAGE ));
+                    m_aContentToolBox.get(), WB_BORDER|WB_TABSTOP|WB_LEFT|WB_REPEAT|WB_SPIN);
     pEdit->SetActionHdl(LINK(this, SwNavigationPI, EditAction));
     pEdit->SetGetFocusHdl(LINK(this, SwNavigationPI, EditGetFocus));
     pEdit->SetAccessibleName(pEdit->GetQuickHelpText());
diff --git a/sw/source/uibase/utlui/navipi.hrc b/sw/source/uibase/utlui/navipi.hrc
index 686086f..ec05d0c 100644
--- a/sw/source/uibase/utlui/navipi.hrc
+++ b/sw/source/uibase/utlui/navipi.hrc
@@ -20,7 +20,6 @@
 #define TB_CONTENT          50
 #define TL_CONTENT          51
 #define LB_DOCS             53
-#define NF_PAGE             54
 #define TL_GLOBAL           55
 #define TB_GLOBAL           56
 
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index 88a9868..b97aaa3 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -292,22 +292,6 @@ Window DLG_NAVIGATION_PI
         Size = MAP_APPFONT ( 150 , 50 ) ;
         DropDown = TRUE ;
     };
-    NumericField NF_PAGE
-    {
-        Border = TRUE ;
-        Pos = MAP_PIXEL ( 50 , 29 ) ;
-        Size = MAP_PIXEL ( 34 , 20 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        First = 1 ;
-         // Outline as default
-        Maximum = 5 ;
-        Last = 5 ;
-        Value = 5 ;
-    };
 };
 
 ImageList IMG_NAVI_ENTRYBMP