diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-11-01 09:56:55 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-01 11:06:26 +0000 |
| commit | 75c1a8033a876b711c7b360565c99f831dd9d2e8 (patch) | |
| tree | 099dd4bc0e40379c386474e72a04440b362b169d /sfx2/source/appl | |
| parent | 7cac55174385bb278c4ae979bcf31f106072798e (diff) | |
WaE: various sillies flagged by MSVC++
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appmisc.cxx | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index fffecd3f348e..ee0b8da9d9c1 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -309,43 +309,9 @@ static bool impl_loadBitmap( /** loads the application logo as used in the about dialog and impress slideshow pause screen */ Image SfxApplication::GetApplicationLogo() { - Image aAppLogo; - - rtl::OUString aAbouts; - bool bLoaded = false; - sal_Int32 nIndex = 0; - do - { - bLoaded = impl_loadBitmap( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")), - aAbouts.getToken( 0, ',', nIndex ), aAppLogo ); - } - while ( !bLoaded && ( nIndex >= 0 ) ); - - // fallback to "about.bmp" - if ( !bLoaded ) - { - bLoaded = impl_loadBitmap( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.png")), aAppLogo ); - if ( !bLoaded ) - bLoaded = impl_loadBitmap( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/edition")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.bmp")), aAppLogo ); - } - - if ( !bLoaded ) - { - bLoaded = impl_loadBitmap( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.png")), aAppLogo ); - if ( !bLoaded ) - bLoaded = impl_loadBitmap( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("about.bmp")), aAppLogo ); - } - - return aAppLogo; + BitmapEx aBitmap; + Application::LoadBrandBitmap ("about", aBitmap); + return Image( aBitmap ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |