callcatcher: rsc loaded fixedbitmap is no more

Change-Id: Ie111d9ed3534eb8892400d638eac4b38b3904646

include/tools/rcid.h

@@ -81,7 +81,7 @@
 #define RSC_MULTILISTBOX        (RSC_NOTYPE + 0x56)
 #define RSC_TEXT                (RSC_NOTYPE + 0x57)
 #define RSC_FIXEDLINE           (RSC_NOTYPE + 0x58)
-#define RSC_FIXEDBITMAP         (RSC_NOTYPE + 0x59)
+
 #define RSC_FIXEDIMAGE          (RSC_NOTYPE + 0x5a)
 #define RSC_GROUPBOX            (RSC_NOTYPE + 0x5c)
 #define RSC_SCROLLBAR           (RSC_NOTYPE + 0x5d)

include/vcl/fixed.hxx

@@ -124,10 +124,7 @@ public:
     virtual Size    GetOptimalSize() const SAL_OVERRIDE;
 };
 
-
 // - FixedBitmap -
-
-
 class VCL_DLLPUBLIC FixedBitmap : public Control
 {
 private:
@@ -146,7 +143,6 @@ protected:
 
 public:
     explicit        FixedBitmap( Window* pParent, WinBits nStyle = 0 );
-    explicit        FixedBitmap( Window* pParent, const ResId& );
     virtual         ~FixedBitmap();
 
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;

rsc/inc/rscdb.hxx

@@ -188,7 +188,6 @@ class RscTypCont
     RscTop *    InitClassMultiListBox( RscTop * pSuper );
     RscTop *    InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
     RscTop *    InitClassFixedText( RscTop * pSuper );
-    RscTop *    InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap );
     RscTop *    InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
     RscTop *    InitClassRadioButton( RscTop * pSuper );
     RscTop *    InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );

rsc/source/parser/rscicpx.cxx

@@ -750,26 +750,6 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
     return pClassFixedText;
 }
 
-RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap )
-{
-    Atom        nId;
-    RscTop *    pClassFixedBitmap;
-
-    // Klasse anlegen
-    nId = pHS->getID( "FixedBitmap" );
-    pClassFixedBitmap = new RscClass( nId, RSC_FIXEDBITMAP, pSuper );
-    pClassFixedBitmap->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassFixedBitmap );
-
-    INS_WINBIT(pClassFixedBitmap,Scale)
-
-    // Variablen anlegen
-    nId = aNmTb.Put( "Fixed", VARNAME );
-    pClassFixedBitmap->SetVariable( nId, pClassBitmap, 0, 0, RSC_FIXEDBITMAP_BITMAP );
-
-    return pClassFixedBitmap;
-}
-
 RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage )
 {
     Atom        nId;

rsc/source/parser/rscinit.cxx

@@ -91,7 +91,6 @@ void RscTypCont::Init()
     RscTop   *  pClassMultiListBox;
     RscTop   *  pClassComboBox;
     RscTop   *  pClassFixedText;
-    RscTop   *  pClassFixedBitmap;
     RscTop   *  pClassFixedImage;
     RscTop   *  pClassGroupBox;
     RscTop   *  pClassKeyCode;
@@ -460,9 +459,6 @@ void RscTypCont::Init()
     pClassFixedText = InitClassFixedText( pClassControl );
     pRoot->Insert( pClassFixedText );
 
-    pClassFixedBitmap = InitClassFixedBitmap( pClassControl, pClassBitmap );
-    pRoot->Insert( pClassFixedBitmap );
-
     pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage );
     pRoot->Insert( pClassFixedImage );
 

vcl/source/control/fixed.cxx

@@ -761,18 +761,6 @@ FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) :
-    Control( WINDOW_FIXEDBITMAP )
-{
-    rResId.SetRT( RSC_FIXEDBITMAP );
-    WinBits nStyle = ImplInitRes( rResId );
-    ImplInit( pParent, nStyle );
-    ImplLoadRes( rResId );
-
-    if ( !(nStyle & WB_HIDE) )
-        Show();
-}
-
 FixedBitmap::~FixedBitmap()
 {
 }