diff options
| -rw-r--r-- | include/tools/rc.h | 3 | ||||
| -rw-r--r-- | include/tools/rcid.h | 2 | ||||
| -rw-r--r-- | include/vcl/fixed.hxx | 3 | ||||
| -rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 18 | ||||
| -rw-r--r-- | rsc/source/parser/rscinit.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/fixed.cxx | 25 |
7 files changed, 0 insertions, 56 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h index 7eab5bf7c06e..5355e8f81cd9 100644 --- a/include/tools/rc.h +++ b/include/tools/rc.h @@ -48,9 +48,6 @@ namespace o3tl { template<> struct typed_flags<RscWindowFlags> : is_typed_flags<RscWindowFlags, 0x37F> {}; } -// For "FixedImage" resource: -#define RSC_FIXEDIMAGE_IMAGE 0x0001 - // For all menu resources: enum class RscMenu { Items = 0x01, diff --git a/include/tools/rcid.h b/include/tools/rcid.h index c88ee3c03b02..5c2ed2fffe50 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -55,8 +55,6 @@ #define RSC_TEXT (RSC_NOTYPE + 0x57) -#define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) - #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79) // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 93dafda582ac..0096a7e056f1 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -161,11 +161,8 @@ private: protected: SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - public: explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); - explicit FixedImage( vcl::Window* pParent, const ResId& ); virtual void ApplySettings(vcl::RenderContext&) override; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index cbcafe0cb594..4be970fb85f5 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -179,7 +179,6 @@ class RscTypCont RscTop * InitClassEdit( RscTop * pSuper ); RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); - RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); 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 c50204788c9c..01c310dc39b6 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -360,24 +360,6 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) return pClassFixedText; } -RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ) -{ - Atom nId; - RscTop * pClassFixedImage; - - // initialize class - nId = pHS->getID( "FixedImage" ); - pClassFixedImage = new RscClass( nId, RSC_FIXEDIMAGE, pSuper ); - pClassFixedImage->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassFixedImage ); - - // initialize variables - nId = aNmTb.Put( "Fixed", VARNAME ); - pClassFixedImage->SetVariable( nId, pClassImage, nullptr, 0, RSC_FIXEDIMAGE_IMAGE ); - - return pClassFixedImage; -} - RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 68bb4f77aedd..7bd5ea75673c 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -68,7 +68,6 @@ void RscTypCont::Init() RscTop * pClassEdit; RscTop * pClassListBox; RscTop * pClassFixedText; - RscTop * pClassFixedImage; RscTop * pClassKeyCode; RscTop * pLangClassKeyCode; @@ -315,9 +314,6 @@ void RscTypCont::Init() pClassFixedText = InitClassFixedText( pClassControl ); pRoot->Insert( pClassFixedText ); - pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage ); - pRoot->Insert( pClassFixedImage ); - pClassKeyCode = InitClassKeyCode( pClassMgr, pKey ); pRoot->Insert( pClassKeyCode ); { diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 4e42bca25890..7af35fc3dc50 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -841,37 +841,12 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle ) return nStyle; } -void FixedImage::ImplLoadRes( const ResId& rResId ) -{ - Control::ImplLoadRes(); - - sal_uLong nObjMask = ReadLongRes(); - - if ( RSC_FIXEDIMAGE_IMAGE & nObjMask ) - { - maImage = Image( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *rResId.GetResMgr() ) ); - IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) ); - } -} - FixedImage::FixedImage( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDIMAGE ) { ImplInit( pParent, nStyle ); } -FixedImage::FixedImage( vcl::Window* pParent, const ResId& rResId ) : - Control( WINDOW_FIXEDIMAGE ) -{ - rResId.SetRT( RSC_FIXEDIMAGE ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - void FixedImage::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, const Point& rPos, const Size& rSize ) { |