[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/source

[Andras Timar]

 framework/source/classes/fwlresid.cxx                |    2 +-
 framework/source/fwe/classes/fwkresid.cxx            |    2 +-
 framework/source/uielement/controlmenucontroller.cxx |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 26c284fe36ffdb1291312b12db0899d7b4440b5e
Author: Andras Timar <atimar at suse.com>
Date:   Sun Dec 18 23:16:15 2011 +0100

    Always load res of LibO UI locale, not system deflocale fdo#43475

diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index 768432e..b61bfd0 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 cf1bcec..0c0a9d4 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 1e7ae5f..1dce3f6 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 );