summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdhdl.cxx7
-rw-r--r--svx/source/svdraw/svdoole2.cxx3
-rw-r--r--svx/source/svdraw/svdstr.src24
3 files changed, 5 insertions, 29 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++)
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 149b81c88567..c276224d87e9 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -86,6 +86,7 @@
#include <editeng/outlobj.hxx>
#include <svx/svdpage.hxx>
#include <rtl/ref.hxx>
+#include "bitmaps.hlst"
using namespace ::com::sun::star;
@@ -2074,7 +2075,7 @@ bool SdrOle2Obj::AddOwnLightClient()
Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic()
{
- return Graphic(BitmapEx(ResId(BMP_SVXOLEOBJ, *ImpGetResMgr())));
+ return Graphic(BitmapEx(BMP_SVXOLEOBJ));
}
void SdrOle2Obj::SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow)
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index fb67cb2a8775..515528707fa2 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -1159,9 +1159,6 @@ String STR_ItemValCIRC_ARC
Text [ en-US ] = "Arc" ;
};
- // Now: bitmaps:
-Bitmap BMAP_GrafikEi { File = "grafikei.png" ; };
-
// Strings for the templates dialog
String SIP_UNKNOWN_ATTR
{
@@ -2156,22 +2153,6 @@ String SIP_SA_GRAFCROP
};
-Bitmap SIP_SA_PAGESHADOW35X35
-{
- File = "pageshadow35x35.png";
-};
-
-
-Bitmap SIP_SA_MARKERS
-{
- File = "markers.png";
-};
-
-Bitmap BMP_SVXOLEOBJ
-{
- File = "oleobj.png" ;
-};
-
String STR_ObjNameSingulMEDIA
{
Text [ en-US ] = "Media object" ;
@@ -2246,11 +2227,6 @@ String STR_ObjNamePluralTable
Text [ en-US ] = "Tables";
};
-Bitmap SIP_SA_CROP_MARKERS
-{
- File = "cropmarkers.png";
-};
-
String STR_ObjNameSingulFONTWORK
{
Text [ en-US ] = "Font work" ;