summaryrefslogtreecommitdiff
path: root/framework/collector
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-07 12:36:53 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-07 12:36:53 +0000
commitfbb5646b92826e35509ce12d8e68830c7d8fd155 (patch)
treeda7a97efbfda388791b934b171db8da8ff06c8b7 /framework/collector
parent71bd72c77a7768ccce2d43cb86544cf153b0fd80 (diff)
#10000# merge problems resolved
Diffstat (limited to 'framework/collector')
-rw-r--r--framework/collector/cmduicollector.cxx18
1 files changed, 10 insertions, 8 deletions
diff --git a/framework/collector/cmduicollector.cxx b/framework/collector/cmduicollector.cxx
index 0946687e612a..960accbd1904 100644
--- a/framework/collector/cmduicollector.cxx
+++ b/framework/collector/cmduicollector.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cmduicollector.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: obo $ $Date: 2004-07-06 16:48:31 $
+ * last change: $Author: obo $ $Date: 2004-07-07 13:36:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1747,10 +1747,11 @@ bool ReadResourceWriteToolBarXML( const OUString& aOutDirURL,
String aSysDirPathStr( aSysDirPath );
- String aLangString( String::CreateFromAscii( Language_Mapping[0].pISO ));
- LanguageType aLangtype = ConvertIsoStringToLanguage( aLangString );
+ ::com::sun::star::lang::Locale aLocale;
+ aLocale.Language = OUString::createFromAscii( Language_codes[0].pLanguage );
+ aLocale.Country = OUString::createFromAscii( Language_codes[0].pCountry );
ResMgr* pResMgr = ResMgr::CreateResMgr( aResFilePrefix.getStr(),
- aLangtype,
+ aLocale,
NULL,
&aSysDirPathStr );
@@ -1855,10 +1856,11 @@ bool ReadResourceWriteSubToolBarXML( const OUString& aOutDirURL,
String aSysDirPathStr( aSysDirPath );
- String aLangString( String::CreateFromAscii( Language_Mapping[0].pISO ));
- LanguageType aLangtype = ConvertIsoStringToLanguage( aLangString );
+ ::com::sun::star::lang::Locale aLocale;
+ aLocale.Language = OUString::createFromAscii( Language_codes[0].pLanguage );
+ aLocale.Country = OUString::createFromAscii( Language_codes[0].pCountry );
ResMgr* pResMgr = ResMgr::CreateResMgr( aResFilePrefix.getStr(),
- aLangtype,
+ aLocale,
NULL,
&aSysDirPathStr );