diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-26 15:55:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 10:50:48 +0200 |
| commit | dd1df645b4fe0d33c640a12d1596f75bd68eb928 (patch) | |
| tree | d60eaa16c4870e8eac607c054bd8c70b226e6d65 /sc | |
| parent | f9f045e7830d184497554e0e438cc478fa990eb6 (diff) | |
remove svx bitmaps from .src files
Change-Id: Ie3795870484648e62dea483f9976af31cd1be167
Reviewed-on: https://gerrit.libreoffice.org/37006
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/bitmaps.hlst | 4 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sc/inc/bitmaps.hlst b/sc/inc/bitmaps.hlst index 58a91c184503..c87a47b000e7 100644 --- a/sc/inc/bitmaps.hlst +++ b/sc/inc/bitmaps.hlst @@ -121,6 +121,10 @@ #define BMP_ICON_SET_POSITIVE_YELLOW_SMILIE "sc/res/icon-set-positive-yellow-smilie.png" #define BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE "sc/res/icon-set-negative-yellow-smilie.png" +#define RID_SVXBMP_SLIDERBUTTON "svx/res/slidezoombutton_10.png" +#define RID_SVXBMP_SLIDERDECREASE "svx/res/slidezoomout_10.png" +#define RID_SVXBMP_SLIDERINCREASE "svx/res/slidezoomin_10.png" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 15d0e88d44d6..77124b7f178e 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -34,6 +34,7 @@ #include "stlpool.hxx" #include "scitems.hxx" #include "printfun.hxx" +#include "bitmaps.hlst" // class ScZoomSliderControl --------------------------------------- @@ -221,9 +222,9 @@ ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, aLogicalSize( 115, 40 ), m_xDispatchProvider( rDispatchProvider ) { - mpImpl->maSliderButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERBUTTON))); - mpImpl->maIncreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERINCREASE))); - mpImpl->maDecreaseButton = Image(BitmapEx(SVX_RES(RID_SVXBMP_SLIDERDECREASE))); + mpImpl->maSliderButton = Image(BitmapEx(RID_SVXBMP_SLIDERBUTTON)); + mpImpl->maIncreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERINCREASE)); + mpImpl->maDecreaseButton = Image(BitmapEx(RID_SVXBMP_SLIDERDECREASE)); Size aSliderSize = LogicToPixel( Size( aLogicalSize), MapMode( MapUnit::Map10thMM ) ); SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) ); } |