summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-06 17:06:02 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-06 20:48:02 +0100
commitc874231c3ab0dc836db497ed63865a226e41bb45 (patch)
treea798ea44d3007839aa73e2ee250c79129f7a1bc8 /sw/source/uibase
parent071f0dbc67009ed4749875f14d5d1cd2117e9445 (diff)
de-src RID_JUMP_TO_SPEC_PAGE and RID_PVIEW_ZOOM_LB
Change-Id: Ideb8eff9d89dbc207dcf7d1228070b2e4a954723
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/inc/ribbar.hrc2
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx34
-rw-r--r--sw/source/uibase/ribbar/workctrl.src17
3 files changed, 14 insertions, 39 deletions
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
index 7bddd55b09e7..fb9c9d99496e 100644
--- a/sw/source/uibase/inc/ribbar.hrc
+++ b/sw/source/uibase/inc/ribbar.hrc
@@ -50,10 +50,8 @@
#define ST_INDEX_ENTRY (RC_RIBBAR_BEGIN + 29)
#define ST_TABLE_FORMULA (RC_RIBBAR_BEGIN + 30)
#define ST_TABLE_FORMULA_ERROR (RC_RIBBAR_BEGIN + 31)
-#define RID_PVIEW_ZOOM_LB (RC_RIBBAR_BEGIN + 32)
#define STR_IMGBTN_START (RC_RIBBAR_BEGIN + 33)
-#define RID_JUMP_TO_SPEC_PAGE (RC_RIBBAR_BEGIN + 34)
#define STR_IMGBTN_NEXT_DOWN (STR_IMGBTN_START + 0)
#define STR_IMGBTN_PREV_DOWN (STR_IMGBTN_START + 1)
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index e49564f12bdc..32eb4c5af748 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -386,13 +386,13 @@ protected:
};
-SwZoomBox_Impl::SwZoomBox_Impl(
- vcl::Window* pParent,
- sal_uInt16 nSlot ):
- ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)),
- nSlotId(nSlot),
- bRelease(true)
+SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot)
+ : ComboBox(pParent, WB_HIDE | WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL)
+ , nSlotId(nSlot)
+ , bRelease(true)
{
+ SetHelpId(HID_PVIEW_ZOOM_LB);
+ SetSizePixel(LogicToPixel(Size(30, 86), MapUnit::MapAppFont));
EnableAutocomplete( false );
sal_uInt16 aZoomValues[] =
{ RID_SVXSTR_ZOOM_25 , RID_SVXSTR_ZOOM_50 ,
@@ -536,28 +536,22 @@ VclPtr<vcl::Window> SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent
class SwJumpToSpecificBox_Impl : public NumericField
{
- sal_uInt16 nSlotId;
+ sal_uInt16 nSlotId;
public:
- SwJumpToSpecificBox_Impl(
- vcl::Window* pParent,
- sal_uInt16 nSlot );
- virtual ~SwJumpToSpecificBox_Impl() override;
+ SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot);
protected:
void Select();
virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
};
-SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(
- vcl::Window* pParent,
- sal_uInt16 nSlot ):
- NumericField( pParent, SW_RES(RID_JUMP_TO_SPEC_PAGE)),
- nSlotId(nSlot)
-{}
-
-SwJumpToSpecificBox_Impl::~SwJumpToSpecificBox_Impl()
-{}
+SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot)
+ : NumericField(pParent, WB_HIDE | WB_BORDER)
+ , nSlotId(nSlot)
+{
+ SetSizePixel(LogicToPixel(Size(16, 12), MapUnit::MapAppFont));
+}
void SwJumpToSpecificBox_Impl::Select()
{
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index 2013059957ee..7a9d4134d562 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -286,21 +286,4 @@ String STR_IMGBTN_TBLFML_ERR_DOWN
{
Text [ en-US ] = "Next faulty table formula";
};
-ComboBox RID_PVIEW_ZOOM_LB
-{
- HelpId = HID_PVIEW_ZOOM_LB;
- Size = MAP_APPFONT ( 30 , 86 ) ;
- DropDown = TRUE ;
- AutoHScroll = TRUE ;
- DDExtraWidth = TRUE ;
- Border = TRUE ;
- Hide = TRUE ;
-};
-NumericField RID_JUMP_TO_SPEC_PAGE
-{
- Size = MAP_APPFONT ( 16 , 12) ;
- Border = TRUE ;
- Hide = TRUE ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */