diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 12:02:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-25 17:02:15 +0200 |
| commit | d7559de4f70afdf64dea3bfbf462f5f188da7d05 (patch) | |
| tree | f27987aec5a5518928a8271af04bd875bb92ef58 /vcl/source/window/scrwnd.cxx | |
| parent | e68b6e349c31ac1376e90218013e1e7612f2b522 (diff) | |
remove bitmaps from .src files
and into includeable .hlst files, add them to
postprocess/CustomTarget_images.mk
to continue only including used bitmaps in icon-theme zips
Change-Id: I5c24c3eca93a9c4101bcdcacb0e4b2712133968e
Reviewed-on: https://gerrit.libreoffice.org/36941
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 'vcl/source/window/scrwnd.cxx')
| -rw-r--r-- | vcl/source/window/scrwnd.cxx | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index a904064348f0..1d5f6f1dfcdd 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -22,6 +22,7 @@ #include <tools/debug.hxx> #include <svids.hrc> +#include <bitmaps.hlst> #include <svdata.hxx> #include <scrwnd.hxx> @@ -59,11 +60,8 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) : // create wheel window SetTitleType( FloatWinTitleType::NONE ); ImplCreateImageList(); - ResMgr* pResMgr = ImplGetResMgr(); - Bitmap aBmp; - if( pResMgr ) - aBmp = Bitmap( ResId( SV_RESID_BITMAP_SCROLLMSK, *pResMgr ) ); - ImplSetRegion( aBmp ); + BitmapEx aBmp(SV_RESID_BITMAP_SCROLLMSK); + ImplSetRegion(aBmp.GetBitmap()); // set wheel mode if( bHorz && bVert ) @@ -121,16 +119,12 @@ void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp ) void ImplWheelWindow::ImplCreateImageList() { - ResMgr* pResMgr = ImplGetResMgr(); - if (pResMgr) - { - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLVH, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLV, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLH, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELVH, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELV, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELH, *pResMgr)))); - } + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLVH))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLV))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLH))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELVH))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELV))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELH))); } void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode ) |