diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 11:09:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 13:29:58 +0100 |
| commit | 18120258b3e4c5e93e5d4ca8d6bfb1a8a3e9a7b8 (patch) | |
| tree | 3f5efa0667ec4a97f1e2b9423abff65b88cc3eb3 /vcl | |
| parent | b100796c3922fe8fe83628053fc0294bd48b044a (diff) | |
no bitmaps in .src files anymore
Change-Id: I0228cae8590366be5d5f0d431cf655942bbb891c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 14 |
2 files changed, 0 insertions, 22 deletions
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(); |