INTEGRATION: CWS res32bit (1.53.54); FILE MERGED

2004/11/11 18:04:25 pl 1.53.54.1: #i34300# resmgr now completelly in tools

1 files changed, 4 insertions, 26 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 86cc4ab3d835..f7a5748cb105 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svapp.cxx,v $
  *
- *  $Revision: 1.53 $
+ *  $Revision: 1.54 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-08 15:04:25 $
+ *  last change: $Author: obo $ $Date: 2005-01-03 17:38:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -750,6 +750,7 @@ void Application::SetSettings( const AllSettings& rSettings )
     {
         pSVData->maAppData.mpSettings = new AllSettings();
         *pSVData->maAppData.mpSettings = rSettings;
+        ResMgr::SetDefaultLocale( rSettings.GetUILocale() );
     }
     else
     {
@@ -759,6 +760,7 @@ void Application::SetSettings( const AllSettings& rSettings )
             delete pSVData->mpResMgr;
             pSVData->mpResMgr = NULL;
         }
+        ResMgr::SetDefaultLocale( rSettings.GetUILocale() );
         *pSVData->maAppData.mpSettings = rSettings;
         ULONG nChangeFlags = aOldSettings.GetChangeFlags( *pSVData->maAppData.mpSettings );
         if ( nChangeFlags )
@@ -1540,30 +1542,6 @@ USHORT Application::GetSystemWindowMode()
 
 // -----------------------------------------------------------------------
 
-void Application::SetResourcePath( const XubString& rPath )
-{
-    ImplSVData* pSVData = ImplGetSVData();
-
-    // if it doesn't exist create a new one
-    if ( !pSVData->maAppData.mpResPath )
-        pSVData->maAppData.mpResPath = new XubString( rPath );
-    else
-        *(pSVData->maAppData.mpResPath) = rPath;
-}
-
-// -----------------------------------------------------------------------
-
-const XubString& Application::GetResourcePath()
-{
-    ImplSVData* pSVData = ImplGetSVData();
-    if ( pSVData->maAppData.mpResPath )
-        return *(pSVData->maAppData.mpResPath);
-    else
-        return ImplGetSVEmptyStr();
-}
-
-// -----------------------------------------------------------------------
-
 const String& Application::GetFontPath()
 {
     ImplSVData* pSVData = ImplGetSVData();