From 18120258b3e4c5e93e5d4ca8d6bfb1a8a3e9a7b8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara <caolanm@redhat.com> Date: Thu, 27 Apr 2017 11:09:42 +0100 Subject: no bitmaps in .src files anymore Change-Id: I0228cae8590366be5d5f0d431cf655942bbb891c --- include/tools/rcid.h | 1 - include/tools/resmgr.hxx | 1 - include/vcl/bitmap.hxx | 2 -- include/vcl/bitmapex.hxx | 1 - 4 files changed, 5 deletions(-) (limited to 'include') diff --git a/include/tools/rcid.h b/include/tools/rcid.h index 0c095e8109c4..7dd4c7f08fa4 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -34,7 +34,6 @@ #define RSC_RESOURCE (RSC_NOTYPE + RESOURCE_TYPE(0x10)) #define RSC_STRING (RSC_NOTYPE + RESOURCE_TYPE(0x11)) -#define RSC_BITMAP (RSC_NOTYPE + RESOURCE_TYPE(0x13)) #define RSC_STRINGARRAY (RSC_NOTYPE + RESOURCE_TYPE(0x79)) diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 2dd642422953..6c52d2c7cfd1 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -143,7 +143,6 @@ public: /// Search and load resource, given its ID bool GetResource( const ResId& rId, const Resource * = nullptr ); - static void * GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr ); /// Free resource context void PopContext( const Resource* = nullptr ); diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index cca13188f58d..ead37f45026c 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -188,7 +188,6 @@ class BitmapWriteAccess; class BitmapPalette; class ImpBitmap; class Color; -class ResId; class GDIMetaFile; class AlphaMask; class OutputDevice; @@ -219,7 +218,6 @@ public: Bitmap(); Bitmap( const Bitmap& rBitmap ); Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = nullptr ); - Bitmap( const ResId& rResId ); Bitmap( SalBitmap* pSalBitmap ); virtual ~Bitmap(); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index a9bf00bfc36c..d7bedddb8606 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -45,7 +45,6 @@ class VCL_DLLPUBLIC BitmapEx public: BitmapEx(); - BitmapEx( const ResId& rResId ); BitmapEx( const OUString& rIconName ); BitmapEx( const BitmapEx& rBitmapEx ); BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ); -- cgit