ooo-build r12915 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jun 17 18:41:32 2008
New Revision: 12915
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12915&view=rev

Log:
2008-06-17  Petr Mladek  <pmlade suse cz>

	* patches/dev300/tools-resmgr-set-defaultlocale.diff:
	* patches/dev300/apply: intialize the default locale in the resource
	  manager; for example, it fixes unopkg to do not show random
	  localization (bnc#399101, i#90820)



Added:
   trunk/patches/dev300/tools-resmgr-set-defaultlocale.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jun 17 18:41:32 2008
@@ -487,6 +487,9 @@
 gengal-three-layer-install-svx.diff, i#89713, jannieuw
 gengal-three-layer-install-scp2.diff, i#89713, jannieuw
 
+# initialize the default locale in the resource manager
+# for example, it fixes unopkg to do not show random localization
+tools-resmgr-set-defaultlocale.diff, n#399101, i#90820, pmladek
 
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to

Added: trunk/patches/dev300/tools-resmgr-set-defaultlocale.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/tools-resmgr-set-defaultlocale.diff	Tue Jun 17 18:41:32 2008
@@ -0,0 +1,13 @@
+--- tools/source/rc/resmgr.cxx.old	2008-01-23 18:05:46.000000000 +0100
++++ tools/source/rc/resmgr.cxx	2008-06-17 20:00:31.000000000 +0200
+@@ -323,6 +323,10 @@ void ResMgrContainer::init()
+                  OUStringToOString( it->second.aFileURL, osl_getThreadTextEncoding() ).getStr() );
+     }
+     #endif
++
++    // set default language
++    LanguageType nLang = MsLangId::getSystemUILanguage();
++    MsLangId::convertLanguageToLocale(nLang, m_aDefLocale);
+ }
+ 
+ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,