diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 11:53:44 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 11:53:44 +0000 |
| commit | 5604d101443bbd9fab82a2fc47fd05bdc1a4d71f (patch) | |
| tree | 48b5ab5b630f3b5f10629594c44dc8e2dccff203 /desktop | |
| parent | d16157d7b2a44c26ff5bcaaf638df607b4a0b389 (diff) | |
INTEGRATION: CWS mergebuild (1.4.42); FILE MERGED
2004/01/29 15:41:54 hjs 1.4.42.1: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun::star::lang::Locale
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 755b90ad9a15..657ad472e4d1 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -2,9 +2,9 @@ * * $RCSfile: splash.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2004-06-10 13:36:21 $ + * last change: $Author: hjs $ $Date: 2004-06-25 12:53:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -236,16 +236,15 @@ void SplashScreen::initBitmap() // any language specific information, we have to search for the correct resource // file. The bitmap resource is language independent. const USHORT nResId = RID_DEFAULTINTRO; - LanguageType aLanguageType = LANGUAGE_DONTKNOW; - String aMgrName = String::CreateFromAscii( "iso" ); + String aMgrName = String::CreateFromAscii( "iso" ); aMgrName += String::CreateFromInt32(SUPD); // current build version - ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLanguageType ); + ResMgr* pLabelResMgr = ResMgr::CreateResMgr( U2S( aMgrName )); if ( !pLabelResMgr ) { // no "iso" resource -> search for "ooo" resource aMgrName = String::CreateFromAscii( "ooo" ); aMgrName += String::CreateFromInt32(SUPD); // current build version - pLabelResMgr = ResMgr::SearchCreateResMgr( U2S( aMgrName ), aLanguageType ); + pLabelResMgr = ResMgr::CreateResMgr( U2S( aMgrName )); } if ( pLabelResMgr ) { |