ooo-build r14366 - in branches/ooo-build-3-0: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Oct 20 20:12:33 2008
New Revision: 14366
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14366&view=rev

Log:
2008-10-20  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-formula-variable-separators-sc.diff: fixed a VBA
	regression caused by not using the UI locale to define the formula
	separators (n#422145).


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/calc-formula-variable-separators-sc.diff

Modified: branches/ooo-build-3-0/patches/dev300/calc-formula-variable-separators-sc.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/calc-formula-variable-separators-sc.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/calc-formula-variable-separators-sc.diff	Mon Oct 20 20:12:33 2008
@@ -59,7 +59,7 @@
  {
      init(xMap->getGrammar());
  
-@@ -244,21 +245,69 @@ ScOpCodeList::ScOpCodeList( USHORT nRID, ScCompiler::NonConstOpCodeMapPtr xMap )
+@@ -244,21 +245,68 @@ ScOpCodeList::ScOpCodeList( USHORT nRID, ScCompiler::NonConstOpCodeMapPtr xMap )
      FreeResource();
  }
  
@@ -82,14 +82,13 @@
  
 -        // TODO: Check for more locales.
 -    }
-+    if (!ScGlobal::pLocaleData || !ScGlobal::pLocale)
-+        return;
-+
-+    const LocaleDataWrapper& rLocaleData = *ScGlobal::pLocaleData;
-+    const lang::Locale& rLocale = *ScGlobal::pLocale;
++    // Be sure to use the UI locale.
++    const lang::Locale& rLocale = Application::GetSettings().GetUILocale();
++    const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper();
 +    const i18n::LocaleDataItem& aItem = rLocaleData.getLocaleItem();
 +    const String& rDecSep  = rLocaleData.getNumDecimalSep();
 +    const String& rListSep = rLocaleData.getListSep();
++
 +    if (rListSep.Len() != 1 || rDecSep.Len() != 1)
 +        // Something is wrong.  Stick with the default separators.
 +        return;