summaryrefslogtreecommitdiff
path: root/padmin
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2004-06-26 02:11:23 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2004-06-26 02:11:23 +0000
commit854a3534bcee4464d0ca9e4c6c6cceac0c8796f6 (patch)
tree8875fa042357aed23ee23a1e07e8846055c8d832 /padmin
parent59660c5a9137080f1de27ba5cc29dbb1709e0a44 (diff)
INTEGRATION: CWS mergebuild (1.12.32); FILE MERGED
2004/05/18 15:47:10 hjs 1.12.32.3: RESYNC: (1.13-1.14); FILE MERGED 2004/04/20 19:29:10 hjs 1.12.32.2: RESYNC: (1.12-1.13); FILE MERGED 2004/02/20 18:40:04 ihi 1.12.32.1: Merge-While-Build update
Diffstat (limited to 'padmin')
-rw-r--r--padmin/source/helper.cxx23
1 files changed, 15 insertions, 8 deletions
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 6c7dd5ff280b..ac23f1857806 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: helper.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: rt $ $Date: 2004-03-30 13:46:06 $
+ * last change: $Author: hjs $ $Date: 2004-06-26 03:11:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -136,7 +136,8 @@ ResId padmin::PaResId( ULONG nId )
static ResMgr* pPaResMgr = NULL;
if( ! pPaResMgr )
{
- LanguageType nLang = LANGUAGE_SYSTEM;
+ ::com::sun::star::lang::Locale aLocale;
+// LanguageType nLang = LANGUAGE_SYSTEM;
utl::OConfigurationNode aNode =
utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
@@ -148,14 +149,20 @@ ResId padmin::PaResId( ULONG nId )
Any aValue = aNode.getNodeValue( OUString::createFromAscii( "ooLocale" ) );
if( aValue >>= aLoc )
{
- LanguageType nTmpLang = ConvertIsoStringToLanguage( aLoc );
- if( nTmpLang != LANGUAGE_DONTKNOW )
- nLang = nTmpLang;
+// LanguageType nTmpLang = ConvertIsoStringToLanguage( aLoc );
+// if( nTmpLang != LANGUAGE_DONTKNOW )
+// nLang = nTmpLang;
+ sal_Int32 nIndex = 0;
+ aLocale.Language = aLoc.getToken( 0, '-', nIndex );
+ aLocale.Country = aLoc.getToken( 0, '-', nIndex );
+ aLocale.Variant = aLoc.getToken( 0, '-', nIndex );
}
}
- pPaResMgr = ResMgr::SearchCreateResMgr( "spa" MAKE_NUMSTR(SUPD), nLang );
+// pPaResMgr = ResMgr::SearchCreateResMgr( "spa" MAKE_NUMSTR(SUPD), nLang );
+ pPaResMgr = ResMgr::SearchCreateResMgr( "spa" MAKE_NUMSTR(SUPD), aLocale );
AllSettings aSettings = Application::GetSettings();
- aSettings.SetUILanguage( nLang );
+// aSettings.SetUILanguage( nLang );
+ aSettings.SetUILocale( aLocale );
Application::SetSettings( aSettings );
}
return ResId( nId, pPaResMgr );