[Libreoffice-commits] core.git: 3 commits - include/vcl sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Thu Oct 6 19:50:30 UTC 2016
include/vcl/lazydelete.hxx | 2 +-
sw/inc/helpid.h | 2 --
sw/source/uibase/inc/ribbar.hrc | 2 --
sw/source/uibase/ribbar/workctrl.cxx | 34 ++++++++++++++--------------------
sw/source/uibase/ribbar/workctrl.src | 18 ------------------
5 files changed, 15 insertions(+), 43 deletions(-)
New commits:
commit 86e807dcd0e7996599a147fae683012a593e1359
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 6 20:34:29 2016 +0100
drop ResId from example
Change-Id: I55719033e6d130673b208b58305e8062031a0a47
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index ca21f5c..36a76b8 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -202,7 +202,7 @@ namespace vcl
SomeWindow::Paint()
{
- static vcl::DeleteOnDeinit< BitmapEx > aBmp( new BitmapEx( ResId( 1000, myResMgr ) ) );
+ static vcl::DeleteOnDeinit< BitmapEx > aBmp( new BitmapEx( ... ) );
if( aBmp.get() ) // check whether DeInitVCL has been called already
DrawBitmapEx( Point( 10, 10 ), *aBmp.get() );
commit c874231c3ab0dc836db497ed63865a226e41bb45
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 6 17:06:02 2016 +0100
de-src RID_JUMP_TO_SPEC_PAGE and RID_PVIEW_ZOOM_LB
Change-Id: Ideb8eff9d89dbc207dcf7d1228070b2e4a954723
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
index 7bddd55..fb9c9d9 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 e49564f..32eb4c5 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 2013059..7a9d413 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: */
commit 071f0dbc67009ed4749875f14d5d1cd2117e9445
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 6 17:02:28 2016 +0100
drop unused HID_JUMP_TO_SPEC_PAGE hid
Change-Id: I746787eb0a4d961a00372bf40dc1bb98e8ef3607
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 9793528..cc9fd26 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -237,8 +237,6 @@
#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE"
#define HID_PVIEW_ZOOM_LB "SW_HID_PVIEW_ZOOM_LB"
-#define HID_JUMP_TO_SPEC_PAGE "SW_HID_JUMP_TO_SPEC_PAGE"
-
#define HID_NID_TBL "SW_HID_NID_TBL"
#define HID_NID_FRM "SW_HID_NID_FRM"
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index 6b08194..2013059 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -298,7 +298,6 @@ ComboBox RID_PVIEW_ZOOM_LB
};
NumericField RID_JUMP_TO_SPEC_PAGE
{
- HelpId = HID_JUMP_TO_SPEC_PAGE;
Size = MAP_APPFONT ( 16 , 12) ;
Border = TRUE ;
Hide = TRUE ;
More information about the Libreoffice-commits
mailing list