summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-12-18 23:16:15 +0100
committerAndras Timar <atimar@suse.com>2011-12-18 23:16:15 +0100
commit26c284fe36ffdb1291312b12db0899d7b4440b5e (patch)
tree123a92404350645bec71b02f8e1ec4b078e7fb61 /framework
parentc8cf245bac52aec55f9be9ad504dd82813728a6c (diff)
Always load res of LibO UI locale, not system deflocale fdo#43475
Diffstat (limited to 'framework')
-rw-r--r--framework/source/classes/fwlresid.cxx2
-rw-r--r--framework/source/fwe/classes/fwkresid.cxx2
-rw-r--r--framework/source/uielement/controlmenucontroller.cxx4
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 1e7ae5f55bd3..1dce3f657159 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -227,7 +227,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 );
@@ -378,7 +378,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 );