summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/tools/rcid.h1
-rw-r--r--include/tools/resmgr.hxx1
-rw-r--r--include/vcl/bitmap.hxx2
-rw-r--r--include/vcl/bitmapex.hxx1
-rw-r--r--rsc/inc/rscdb.hxx1
-rw-r--r--rsc/source/parser/rscicpx.cxx17
-rw-r--r--rsc/source/parser/rscinit.cxx5
-rw-r--r--tools/source/rc/resmgr.cxx11
-rw-r--r--vcl/source/gdi/bitmap.cxx8
-rw-r--r--vcl/source/gdi/bitmapex.cxx14
10 files changed, 0 insertions, 61 deletions
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 );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 9381d16b2ee8..088ffed16a65 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -85,7 +85,6 @@ class RscTypCont
RscTop * InitClassMgr();
RscTop * InitClassString( RscTop * pSuper );
- RscTop * InitClassBitmap( RscTop * pSuper );
public:
RscLongEnumRange aEnumLong;
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 929ed89be284..46ab34a0fd97 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -71,21 +71,4 @@ RscTop * RscTypCont::InitClassString( RscTop * pSuper )
return pClassString;
}
-RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper )
-{
- Atom nId;
- RscTop * pClassBitmap;
-
- nId = pHS->getID( "Bitmap" );
- pClassBitmap = new RscSysDepend( nId, RSC_BITMAP, pSuper );
- pClassBitmap->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
- aNmTb.Put( nId, CLASSNAME, pClassBitmap );
-
- // the class RscSysDepend handles variables "FILE" in a specific way
- nId = aNmTb.Put( "File", VARNAME );
- pClassBitmap->SetVariable( nId, &aLangString, nullptr, RSCVAR::NoRc );
-
- return pClassBitmap;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index a330f739fe2d..282b9cad33bf 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -46,7 +46,6 @@ void RscTypCont::Init()
RscTop * pClassMgr;
RscTop * pClassString;
RscTop * pClassStringArray;
- RscTop * pClassBitmap;
Atom nId;
@@ -99,10 +98,6 @@ void RscTypCont::Init()
// initialize variables
nId = aNmTb.Put( "ItemList", VARNAME );
pClassStringArray->SetVariable( nId, pLangStringLongTupelList );
-
- pClassBitmap = InitClassBitmap( pClassMgr );
- pRoot->Insert( pClassBitmap );
-
}
aNmTb.SetSort();
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 86b5be7b5146..6fd64a980f6e 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1022,17 +1022,6 @@ bool ResMgr::GetResource( const ResId& rId, const Resource* pResObj )
return true;
}
-void * ResMgr::GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr )
-{
- osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
-
- *ppResMgr = rResId.GetResMgr();
- assert(*ppResMgr != nullptr);
- (*ppResMgr)->GetResource( rResId );
- (*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
- return (*ppResMgr)->GetClass();
-}
-
void ResMgr::PopContext( const Resource* pResObj )
{
osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index e496ecd76800..8dc4bd07e0d3 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -37,14 +37,6 @@ Bitmap::Bitmap()
{
}
-Bitmap::Bitmap( const ResId& rResId )
-{
- const BitmapEx aBmpEx( rResId );
-
- if( !aBmpEx.IsEmpty() )
- *this = aBmpEx.GetBitmap();
-}
-
Bitmap::Bitmap(const Bitmap& rBitmap)
: mxImpBmp(rBitmap.mxImpBmp)
, maPrefMapMode(rBitmap.maPrefMapMode)
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 0f709c2b03f5..edcaebddc807 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -94,20 +94,6 @@ BitmapEx::BitmapEx( const OUString& rIconName )
loadFromIconTheme( rIconName );
}
-BitmapEx::BitmapEx( const ResId& rResId ) :
- eTransparent( TransparentType::NONE ),
- bAlpha ( false )
-{
- ResMgr* pResMgr = nullptr;
-
- ResMgr::GetResourceSkipHeader( rResId.SetRT( RSC_BITMAP ), &pResMgr );
- pResMgr->ReadLong();
- pResMgr->ReadLong();
-
- const OUString aFileName( pResMgr->ReadString() );
- loadFromIconTheme( aFileName );
-}
-
void BitmapEx::loadFromIconTheme( const OUString& rIconName )
{
OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme();
generated by cgit (git 2.34.1) at 2025-03-09 22:24:32 +0000