diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-30 09:22:18 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-30 09:22:18 +0000 |
| commit | b6543fbfe5b6f81df01b5f88553025f349deeb67 (patch) | |
| tree | 7b2677687faa65b9edafdaa3b1415107c547947e /framework/source/services/license.cxx | |
| parent | 8cff4a6dc9f087056d252071face5eaea6ae1661 (diff) | |
#i10000# adopt to ISO codes
Diffstat (limited to 'framework/source/services/license.cxx')
| -rw-r--r-- | framework/source/services/license.cxx | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 67560515a638..447cdedffd02 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -2,9 +2,9 @@ * * $RCSfile: license.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2004-06-10 13:22:39 $ + * last change: $Author: hjs $ $Date: 2004-06-30 10:19:54 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -321,23 +321,37 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na return aRet; } // determine the filename of the license to show - LanguageType aLanguage = LANGUAGE_DONTKNOW; + OUString aLangString; + ::com::sun::star::lang::Locale aLocale; OString aMgrName = OString("fwe") + OString::valueOf((sal_Int32)SUPD, 10); AllSettings aSettings(Application::GetSettings()); - aLanguage = aSettings.GetUILanguage(); - ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLanguage); + aLocale = aSettings.GetUILocale(); + ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale); + aLangString = aLocale.Language; + if ( aLocale.Country.getLength() != 0 ) + { + aLangString += OUString::createFromAscii("-"); + aLangString += aLocale.Country; + if ( aLocale.Variant.getLength() != 0 ) + { + aLangString += OUString::createFromAscii("-"); + aLangString += aLocale.Variant; + } + } #ifdef WNT OUString aLicensePath = aBaseInstallPath + OUString::createFromAscii(szLicensePath) + OUString::createFromAscii(szWNTLicenseName) - + OUString::createFromAscii(ResMgr::GetLang(aLanguage, 0)) + + OUString::createFromAscii("_") + + aLangString + OUString::createFromAscii(szWNTLicenseExt); #else OUString aLicensePath = aBaseInstallPath + OUString::createFromAscii(szLicensePath) + OUString::createFromAscii(szUNXLicenseName) - + OUString::createFromAscii(ResMgr::GetLang(aLanguage, 0)) + + OUString::createFromAscii("_") + + aLangString + OUString::createFromAscii(szUNXLicenseExt); #endif // check if we need to show the license at all |