diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-10-24 14:35:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-24 15:06:41 +0100 |
| commit | eac3793d4d92d75bffd9b282f75a9df20ec19299 (patch) | |
| tree | 6611dc4a5d8b192dc41cdeb06fe6b47f26dd34f5 /vcl/source/control/fixed.cxx | |
| parent | d0e204942332cd825edc3a38ebf331c02fd4dcfe (diff) | |
no FixedImage is loaded from .src anymore
Change-Id: I7c5acd18b14822d6344af3709c6d8cfb343104ef
Diffstat (limited to 'vcl/source/control/fixed.cxx')
| -rw-r--r-- | vcl/source/control/fixed.cxx | 25 |
1 files changed, 0 insertions, 25 deletions
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 ) { |