Images no longer loaded from resource files

Change-Id: I7155a2c8280b9f511402b908f06470dec419b336

7 files changed, 0 insertions, 57 deletions

diff --git a/include/tools/rc.h b/include/tools/rc.h
index 9ca1e8fa0af8..84bb8e255972 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -50,14 +50,6 @@ namespace o3tl {
     template<> struct typed_flags<RscMenuItem> : is_typed_flags<RscMenuItem, 0xd6f> {};
 }
 
-// For "Image":
-enum class RscImageFlags {
-    ImageBitmap       = 0x01,
-};
-namespace o3tl {
-    template<> struct typed_flags<RscImageFlags> : is_typed_flags<RscImageFlags, 0x01> {};
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index d30dde87c845..a86667f8a17b 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -38,7 +38,6 @@
 #define RSC_BITMAP              (RSC_NOTYPE + 0x13)
 #define RSC_MENU                (RSC_NOTYPE + 0x1c)
 #define RSC_MENUITEM            (RSC_NOTYPE + 0x1d) // only used internally
-#define RSC_IMAGE               (RSC_NOTYPE + 0x23)
 
 #define RSC_STRINGARRAY         (RSC_NOTYPE + 0x79)
 
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 519058a2dc64..88a0c045376e 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -56,7 +56,6 @@ class VCL_DLLPUBLIC Image
 
 public:
                     Image();
-                    explicit Image( const ResId& rResId );
                     explicit Image( const BitmapEx& rBitmapEx );
                     explicit Image( const Bitmap& rBitmap );
                     Image( const Bitmap& rBitmap, const Color& rColor );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 1d7400330b9d..07490d6fe304 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -91,7 +91,6 @@ class RscTypCont
     RscTop *    InitClassMgr();
     RscTop *    InitClassString( RscTop * pSuper );
     RscTop *    InitClassBitmap( RscTop * pSuper );
-    RscTop *    InitClassImage( RscTop * pSuper, RscTop *pClassBitmap );
     RscTop *    InitClassMenuItem( RscTop * pSuper );
     RscTop *    InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
 
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index c476a9e012da..fde078d4a341 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -97,24 +97,6 @@ RscTop * RscTypCont::InitClassBitmap( RscTop * pSuper )
     return pClassBitmap;
 }
 
-RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap )
-{
-    Atom        nId;
-    RscTop *    pClassImage;
-
-    // initialize class
-    nId = pHS->getID( "Image" );
-    pClassImage = new RscClass( nId, RSC_IMAGE, pSuper );
-    pClassImage->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
-    aNmTb.Put( nId, CLASSNAME, pClassImage );
-
-    // initialize variables
-    nId = aNmTb.Put( "ImageBitmap", VARNAME );
-    pClassImage->SetVariable( nId, pClassBitmap, nullptr, RSCVAR::NONE, (sal_uInt32)RscImageFlags::ImageBitmap );
-
-    return pClassImage;
-}
-
 RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper )
 {
     Atom        nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 9e31fb6fee77..4ecf9f657fdd 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -48,7 +48,6 @@ void RscTypCont::Init()
     RscTop   *  pClassString;
     RscTop   *  pClassStringArray;
     RscTop   *  pClassBitmap;
-    RscTop   *  pClassImage;
 
     Atom        nId;
 
@@ -113,10 +112,6 @@ void RscTypCont::Init()
 
 }
 {
-    pClassImage = InitClassImage( pClassMgr, pClassBitmap );
-    pRoot->Insert( pClassImage );
-}
-{
     RscTop* pClassMenuItem = InitClassMenuItem(pClassMgr);
     pRoot->Insert( pClassMenuItem );
 
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 516883c8f170..bc663fbbc525 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -44,29 +44,6 @@ Image::Image()
 {
 }
 
-Image::Image( const ResId& rResId )
-{
-    rResId.SetRT( RSC_IMAGE );
-
-    ResMgr* pResMgr = rResId.GetResMgr();
-    if( pResMgr && pResMgr->GetResource( rResId ) )
-    {
-        pResMgr->Increment( sizeof( RSHEADER_TYPE ) );
-
-        BitmapEx      aBmpEx;
-        RscImageFlags nObjMask = (RscImageFlags)pResMgr->ReadLong();
-
-        if( nObjMask & RscImageFlags::ImageBitmap )
-        {
-            aBmpEx = BitmapEx( ResId( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()), *pResMgr ) );
-            pResMgr->Increment( ResMgr::GetObjSize( static_cast<RSHEADER_TYPE*>(pResMgr->GetClass()) ) );
-        }
-
-        if( ! aBmpEx.IsEmpty() )
-            ImplInit( aBmpEx );
-    }
-}
-
 Image::Image(const BitmapEx& rBitmapEx)
 {
     ImplInit(rBitmapEx);