diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:07:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:07:16 +0000 |
| commit | e44ad2d51eecec1db2f41794151c3ae188330c08 (patch) | |
| tree | eda80d6acb24f59507b4336f2ea7b563e4310bfb /vcl/source/gdi/bitmapex.cxx | |
| parent | 6044227b4ad594369a78821a44b377b3a03e79e8 (diff) | |
INTEGRATION: CWS iconswitching1 (1.15.14); FILE MERGED
2005/11/01 17:18:39 kendy 1.15.14.2: RESYNC: (1.15-1.16); FILE MERGED
2005/07/20 14:04:08 kendy 1.15.14.1: #i36518#
Implement the icon switching
Diffstat (limited to 'vcl/source/gdi/bitmapex.cxx')
| -rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index e4e240123aaa..f5e9520edfa8 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapex.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: rt $ $Date: 2005-09-09 11:53:46 $ + * last change: $Author: kz $ $Date: 2006-01-05 18:07:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,6 +67,9 @@ #ifndef _SV_RC_H #include <tools/rc.h> #endif +#ifndef _SV_SVAPP_HXX +#include <svapp.hxx> +#endif // ------------ // - BitmapEx - @@ -104,8 +107,9 @@ BitmapEx::BitmapEx( const ResId& rResId ) : pResMgr->ReadLong(); const String aFileName( pResMgr->ReadString() ); + ::rtl::OUString aCurrentSymbolsStyle = Application::GetSettings().GetStyleSettings().GetCurrentSymbolsStyleName(); - if( !aImageTree->loadImage( aFileName, *this ) ) + if( !aImageTree->loadImage( aFileName, aCurrentSymbolsStyle, *this ) ) { #ifdef DBG_UTIL ByteString aErrorStr( "BitmapEx::BitmapEx( const ResId& rResId ): could not load image <" ); |