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 /svx/source/svdraw/svdhdl.cxx | |
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 'svx/source/svdraw/svdhdl.cxx')
-rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 74d2345c3548..1bc9783c7540 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -67,8 +67,7 @@ #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <memory> - - +#include "bitmaps.hlst" // #i15222# // Due to the resource problems in Win95/98 with bitmap resources I @@ -101,7 +100,7 @@ public: #define INDIVIDUAL_COUNT (5) SdrHdlBitmapSet::SdrHdlBitmapSet() - : maMarkersBitmap(ResId(SIP_SA_MARKERS, *ImpGetResMgr())), + : maMarkersBitmap(SIP_SA_MARKERS), // 15 kinds (BitmapMarkerKind) use index [0..5] + 5 extra maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT) { @@ -2364,7 +2363,7 @@ void SdrCropHdl::CreateB2dIAObject() const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); int nHdlSize = pHdlList->GetHdlSize(); - const BitmapEx aHandlesBitmap( ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()) ); + const BitmapEx aHandlesBitmap(SIP_SA_CROP_MARKERS); BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) ); for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++) |