INTEGRATION: CWS locales24 (1.24.102); FILE MERGED

2007/10/29 17:34:02 er 1.24.102.1: #i79797# Farsi/Persian native numbering; contributed by Farzaneh Sarafraz <farzanehs>

1 files changed, 70 insertions, 10 deletions

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 166dd1845f0a..7e9398b15f96 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: nativenumbersupplier.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 09:22:28 $
+ *  last change: $Author: rt $ $Date: 2007-11-13 14:37:46 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -444,17 +444,77 @@ static Number natnum10 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier
 static Number natnum11 = { NumberChar_Hangul_ko, MultiplierChar_6_CJK[Multiplier_Hangul_ko], NUMBER_OMIT_ALL,
                 ExponentCount_6_CJK, MultiplierExponent_6_CJK };
 
-static const sal_Char *natnum1Locales[] = { "zh_CN", "zh_TW", "ja", "ko", "he", "ar", "th", "hi", "or", "mr", "bn", "pa", "gu", "ta", "te", "kn", "ml", "lo", "bo", "my", "km", "mn", "ne","dz" };
+//! ATTENTION: Do not change order of elements!
+//! Append new languages to the end of the list!
+static const sal_Char *natnum1Locales[] = {
+    "zh_CN",
+    "zh_TW",
+    "ja",
+    "ko",
+    "he",
+    "ar",
+    "th",
+    "hi",
+    "or",
+    "mr",
+    "bn",
+    "pa",
+    "gu",
+    "ta",
+    "te",
+    "kn",
+    "ml",
+    "lo",
+    "bo",
+    "my",
+    "km",
+    "mn",
+    "ne",
+    "dz",
+    "fa"
+};
 static sal_Int16 nbOfLocale = sizeof(natnum1Locales)/sizeof(natnum1Locales[0]);
 
-static sal_Int16 natnum1[] = { NumberChar_Lower_zh, NumberChar_Lower_zh, NumberChar_Modern_ja, NumberChar_Lower_ko, NumberChar_he,
-                NumberChar_Indic_ar, NumberChar_th, NumberChar_hi, NumberChar_or, NumberChar_mr, NumberChar_bn,
-                NumberChar_pa, NumberChar_gu, NumberChar_ta, NumberChar_te, NumberChar_kn, NumberChar_ml,
-               NumberChar_lo, NumberChar_bo, NumberChar_my, NumberChar_km, NumberChar_mn, NumberChar_ne,
-NumberChar_dz };
+//! ATTENTION: Do not change order of elements!
+//! Number and order must match elements of natnum1Locales!
+static sal_Int16 natnum1[] = {
+    NumberChar_Lower_zh,
+    NumberChar_Lower_zh,
+    NumberChar_Modern_ja,
+    NumberChar_Lower_ko,
+    NumberChar_he,
+    NumberChar_Indic_ar,
+    NumberChar_th,
+    NumberChar_hi,
+    NumberChar_or,
+    NumberChar_mr,
+    NumberChar_bn,
+    NumberChar_pa,
+    NumberChar_gu,
+    NumberChar_ta,
+    NumberChar_te,
+    NumberChar_kn,
+    NumberChar_ml,
+    NumberChar_lo,
+    NumberChar_bo,
+    NumberChar_my,
+    NumberChar_km,
+    NumberChar_mn,
+    NumberChar_ne,
+    NumberChar_dz,
+    NumberChar_EastIndic_ar
+};
 static sal_Int16 sizeof_natnum1 = sizeof(natnum1)/sizeof(natnum1[0]);
-static sal_Int16 natnum2[] = { NumberChar_Upper_zh, NumberChar_Upper_zh_TW, NumberChar_Traditional_ja,
-                NumberChar_Upper_ko, NumberChar_he };
+
+//! ATTENTION: Do not change order of elements!
+//! Order must match first elements of natnum1Locales!
+static sal_Int16 natnum2[] = {
+    NumberChar_Upper_zh,
+    NumberChar_Upper_zh_TW,
+    NumberChar_Traditional_ja,
+    NumberChar_Upper_ko,
+    NumberChar_he
+};
 static sal_Int16 sizeof_natnum2 = sizeof(natnum2)/sizeof(natnum2[0]);
 
 #define isLang(lang) rLocale.Language.equalsAsciiL(lang, 2)