diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/classes/fwlresid.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwe/classes/fwkresid.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/license.cxx | 19 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 4 |
4 files changed, 8 insertions, 19 deletions
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index ba3987a0c01d..ff01b34561c2 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -34,7 +34,7 @@ ResMgr* FwlResId::GetResManager() if ( !pResMgr ) { SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag().getLocale()); + pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag()); } return pResMgr; diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index ff78bb393238..0ae4d3e579ad 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -34,7 +34,7 @@ ResMgr* FwkResId::GetResManager() if ( !pResMgr ) { SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag().getLocale()); + pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILanguageTag()); } return pResMgr; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 41db42bf11b1..56f6ac4c4b67 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -220,21 +220,9 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aRet <<= sal_False; return aRet; } - // determine the filename of the license to show - AllSettings aSettings(Application::GetSettings()); - ::com::sun::star::lang::Locale aLocale = aSettings.GetUILanguageTag().getLocale(); - OUString aLangString = aLocale.Language; - if ( !aLocale.Country.isEmpty() ) - { - aLangString += ::rtl::OUString("-"); - aLangString += aLocale.Country; - if ( !aLocale.Variant.isEmpty() ) - { - aLangString += ::rtl::OUString("-"); - aLangString += aLocale.Variant; - } - } + // determine the filename of the license to show + OUString aLangString( Application::GetSettings().GetUILanguageTag().getBcp47()); #if defined(WNT) ::rtl::OUString aLicensePath = aBaseInstallPath + ::rtl::OUString::createFromAscii(szLicensePath) @@ -292,7 +280,8 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na } // prepare to show // display license dialog - boost::scoped_ptr<ResMgr> pResMgr(ResMgr::SearchCreateResMgr("fwe", aLocale)); + LanguageTag aLanguageTag( Application::GetSettings().GetUILanguageTag()); + boost::scoped_ptr<ResMgr> pResMgr( ResMgr::SearchCreateResMgr("fwe", aLanguageTag)); boost::scoped_ptr<LicenseDialog> pDialog(new LicenseDialog(aLicensePath, pResMgr.get())); sal_Bool bAgreed = (pDialog->Execute() == 1); diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 692fb98c07ef..42de11ea3ffa 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -202,7 +202,7 @@ ControlMenuController::~ControlMenuController() // private function void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { - ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag().getLocale()); + ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()); ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); @@ -351,7 +351,7 @@ void ControlMenuController::impl_setPopupMenu() { if ( m_pResPopupMenu == 0 ) { - ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag().getLocale()); + ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag()); if ( pResMgr ) { ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr ); |