Skip to content

C
core
Kaydet (Commit) 21c5027f authored tarafından Oliver Bolte's avatar Oliver Bolte
Dosyalara gözat
Seçenekler

#i10000# wrong merge resolved

üst 49f9c576
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 16 deletions
desktop/source/app/langselect.cxx
Dosyayı görüntüle @ 21c5027f
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
* *
* $RCSfile: langselect.cxx,v $ * $RCSfile: langselect.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* * last change: $Author: obo $ $Date: 2004-07-08 16:39:02 $
* last change: $Author: obo $ $Date: 2004-07-05 13:08:24 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -201,9 +200,9 @@ OUString LanguageSelection::getLanguageString() ...@@ -201,9 +200,9 @@ OUString LanguageSelection::getLanguageString()
} else { } else {
// last resort // last resort
// don't save // don't save
// what's this ????? return ConvertLanguageToIsoString((LanguageType) SvtPathOptions().SubstituteVariable(
// return (LanguageType) SvtPathOptions().SubstituteVariable( String::CreateFromAscii("$(langid)")).ToInt32()) ;
// String::CreateFromAscii("$(langid)")).ToInt32(); /*
::com::sun::star::lang::Locale aLocale; ::com::sun::star::lang::Locale aLocale;
OUString aLocString( aLocale.Language ); OUString aLocString( aLocale.Language );
if ( aLocale.Country.getLength() != 0 ) if ( aLocale.Country.getLength() != 0 )
...@@ -217,6 +216,7 @@ OUString LanguageSelection::getLanguageString() ...@@ -217,6 +216,7 @@ OUString LanguageSelection::getLanguageString()
} }
} }
return aLocString; return aLocString;
*/
} }
} }
} }
...@@ -290,8 +290,7 @@ IsoList LanguageSelection::getInstalledIsoLanguages() ...@@ -290,8 +290,7 @@ IsoList LanguageSelection::getInstalledIsoLanguages()
try{ try{
OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
OUString sConfigURL = OUString::createFromAscii("org.openoffice.Setup/Office/"); OUString sConfigURL = OUString::createFromAscii("org.openoffice.Setup/Office/InstalledLocales");
OUString sLocales = OUString::createFromAscii("ooSetupLocales");
// get configuration provider // get configuration provider
Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory(); Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
...@@ -309,15 +308,10 @@ IsoList LanguageSelection::getInstalledIsoLanguages() ...@@ -309,15 +308,10 @@ IsoList LanguageSelection::getInstalledIsoLanguages()
//check access //check access
if (!theNameAccess.is()) return aList; if (!theNameAccess.is()) return aList;
Any aResult = theNameAccess->getByName( sLocales ); Sequence< OUString > aLangSeq = theNameAccess->getElementNames();
Sequence< OUString > aLangSeq;
// unpack result from Any type for (int i=0; i<aLangSeq.getLength(); i++)
if (aResult >>= aLangSeq) aList.push_back(aLangSeq[i]);
{
for (int i=0; i<aLangSeq.getLength(); i++)
aList.push_back(aLangSeq[i]);
}
} catch (com::sun::star::uno::RuntimeException) } catch (com::sun::star::uno::RuntimeException)
{ {
// didn't work - return empty list // didn't work - return empty list
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment