diff options
| author | Andras Timar <atimar@suse.com> | 2011-12-18 23:16:15 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-12-18 23:17:40 +0100 |
| commit | de30370096b82e4ea24c13b7c7e8f525e074fe60 (patch) | |
| tree | 686594f6697fea14b0b14732555501e387a32287 | |
| parent | 75b85b12fb8c78410df05852bf3063c267e9710e (diff) | |
Always load res of LibO UI locale, not system deflocale fdo#43475
| -rw-r--r-- | framework/source/classes/fwlresid.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwe/classes/fwkresid.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx index 768432e30356..b61bfd0d96e7 100644 --- a/framework/source/classes/fwlresid.cxx +++ b/framework/source/classes/fwlresid.cxx @@ -44,7 +44,7 @@ ResMgr* FwlResId::GetResManager() if ( !pResMgr ) { SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr("fwe"); + pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILocale()); } return pResMgr; diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx index cf1bceccc787..0c0a9d463ed0 100644 --- a/framework/source/fwe/classes/fwkresid.cxx +++ b/framework/source/fwe/classes/fwkresid.cxx @@ -44,7 +44,7 @@ ResMgr* FwkResId::GetResManager() if ( !pResMgr ) { SolarMutexGuard aSolarGuard; - pResMgr = ResMgr::CreateResMgr("fwe"); + pResMgr = ResMgr::CreateResMgr("fwe", Application::GetSettings().GetUILocale()); } return pResMgr; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 7fd52d33768e..a9468581daee 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -226,7 +226,7 @@ ControlMenuController::~ControlMenuController() // private function void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { - ResMgr* pResMgr = ResMgr::CreateResMgr("svx"); + ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILocale()); ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr ); aResId.SetRT( RSC_IMAGELIST ); @@ -375,7 +375,7 @@ void ControlMenuController::impl_setPopupMenu() { if ( m_pResPopupMenu == 0 ) { - ResMgr* pResMgr = ResMgr::CreateResMgr("svx"); + ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILocale()); if ( pResMgr ) { ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr ); |