CWS-TOOLING: integrate CWS locales31

2008-12-10 14:56:44 +0100 er  r265193 : calling convention mismatch
2008-12-08 12:04:56 +0100 er  r264984 : #i96840# classify some extra languages as CTL
2008-12-05 19:54:02 +0100 erack  r264916 : ImpSvNumberformatScan::ScanType: do not miscategorize as automtic currency if currency symbol in General string, such as R in Standard
2008-12-04 12:07:05 +0100 erack  r264831 : CWS-TOOLING: rebase CWS locales31 to trunk@264807 (milestone: DEV300:m37)
2008-12-03 16:14:17 +0100 erack  r264797 : #i93694# update script+language -> unicode digit mapping; patch from <hdu>
2008-11-25 02:01:18 +0100 erack  r264270 : #i83349# apply remaining parts of the patch, now that we use ICU 4.0; contributed by <kstribley>
2008-11-25 01:38:20 +0100 erack  r264269 : #i93694# test the bit, not the constant ...
2008-11-24 10:34:58 +0100 erack  r264211 : #i93694# LANGUAGE_ARABIC is gone
2008-11-24 01:39:25 +0100 erack  r264192 : #i94435# LANGUAGE_SPANISH now is an alias of LANGUAGE_SPANISH_MODERN, need LANGUAGE_SPANISH_DATED in switch case if both are to be used
2008-11-23 22:54:17 +0100 erack  r264190 : CWS-TOOLING: rebase CWS locales31 to trunk@263288 (milestone: DEV300:m35)
2008-11-23 20:23:28 +0100 erack  r264189 : migrate CWS locales31 to SVN

2 files changed, 46 insertions, 56 deletions

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 8fd0acfc3644..bfe0751545c7 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1883,6 +1883,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const
         "khmerossystem", "",
         "muktinarrow", "",
         "phetsarathot", "",
+        "padauk", "pinlonmyanmar", "",
         0
     };
 
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 9dd0bfdc0197..11c0c94435bb 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sallayout.cxx,v $
- * $Revision: 1.94 $
+ * $Revision: 1.94.90.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -243,97 +243,86 @@ sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang )
         return nChar;
 
     int nOffset;
-    switch( eLang )
+    // eLang & LANGUAGE_MASK_PRIMARY catches language independent of region.
+    // CAVEAT! To some like Mongolian MS assigned the same primary language
+    // although the script type is different!
+    switch( eLang & LANGUAGE_MASK_PRIMARY )
     {
         default:
             nOffset = 0;
             break;
-        case LANGUAGE_ARABIC:
-        case LANGUAGE_ARABIC_SAUDI_ARABIA:
-        case LANGUAGE_ARABIC_IRAQ:
-        case LANGUAGE_ARABIC_EGYPT:
-        case LANGUAGE_ARABIC_LIBYA:
-        case LANGUAGE_ARABIC_ALGERIA:
-        case LANGUAGE_ARABIC_MOROCCO:
-        case LANGUAGE_ARABIC_TUNISIA:
-        case LANGUAGE_ARABIC_OMAN:
-        case LANGUAGE_ARABIC_YEMEN:
-        case LANGUAGE_ARABIC_SYRIA:
-        case LANGUAGE_ARABIC_JORDAN:
-        case LANGUAGE_ARABIC_LEBANON:
-        case LANGUAGE_ARABIC_KUWAIT:
-        case LANGUAGE_ARABIC_UAE:
-        case LANGUAGE_ARABIC_BAHRAIN:
-        case LANGUAGE_ARABIC_QATAR:
-        case LANGUAGE_URDU:
-        case LANGUAGE_URDU_PAKISTAN:
-        case LANGUAGE_URDU_INDIA:
-        case LANGUAGE_PUNJABI: //???
-            nOffset = 0x0660 - '0';  // arabic/persian/urdu
+        case LANGUAGE_ARABIC_SAUDI_ARABIA  & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0660 - '0';  // arabic-indic digits
             break;
-        case LANGUAGE_BENGALI:
+        case LANGUAGE_URDU          & LANGUAGE_MASK_PRIMARY:
+        case LANGUAGE_PUNJABI       & LANGUAGE_MASK_PRIMARY: //???
+        case LANGUAGE_SINDHI        & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x06F0 - '0';  // eastern arabic-indic digits
+            break;
+        case LANGUAGE_BENGALI       & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x09E6 - '0';  // bengali
             break;
-        case LANGUAGE_HINDI:
+        case LANGUAGE_HINDI         & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x0966 - '0';  // devanagari
             break;
-        #if 0
+        case LANGUAGE_AMHARIC_ETHIOPIA & LANGUAGE_MASK_PRIMARY:
+        case LANGUAGE_TIGRIGNA_ETHIOPIA & LANGUAGE_MASK_PRIMARY:
         // TODO case:
             nOffset = 0x1369 - '0';  // ethiopic
             break;
-        #endif
-        case LANGUAGE_GUJARATI:
+        case LANGUAGE_GUJARATI      & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x0AE6 - '0';  // gujarati
             break;
-        #if 0
-        // TODO case:
+#ifdef LANGUAGE_GURMUKHI // TODO case:
+        case LANGUAGE_GURMUKHI      & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x0A66 - '0';  // gurmukhi
             break;
-        #endif
-        case LANGUAGE_KANNADA:
+#endif
+        case LANGUAGE_KANNADA       & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x0CE6 - '0';  // kannada
             break;
-        case LANGUAGE_KHMER:
+        case LANGUAGE_KHMER         & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x17E0 - '0';  // khmer
             break;
-        case LANGUAGE_LAO:
+        case LANGUAGE_LAO           & LANGUAGE_MASK_PRIMARY:
             nOffset = 0x0ED0 - '0';  // lao
             break;
-        case LANGUAGE_MALAYALAM:
-            nOffset = 0x0D66 - '0';   // malayalam
+        case LANGUAGE_MALAYALAM     & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0D66 - '0';  // malayalam
             break;
-        case LANGUAGE_MONGOLIAN:
-            nOffset = 0x1810 - '0';   // mongolian
+        case LANGUAGE_MONGOLIAN     & LANGUAGE_MASK_PRIMARY:
+            if (eLang == LANGUAGE_MONGOLIAN_MONGOLIAN)
+                nOffset = 0x1810 - '0';   // mongolian
+            else
+                nOffset = 0;              // mongolian cyrillic
             break;
-        #if 0
-        // TODO case:
-            nOffset = 0x1040 - '0';   // myanmar
+        case LANGUAGE_BURMESE       & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x1040 - '0';  // myanmar
             break;
-        #endif
-        case LANGUAGE_ORIYA:
-            nOffset = 0x0B66 - '0';   // oriya
+        case LANGUAGE_ORIYA         & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0B66 - '0';  // oriya
             break;
-        case LANGUAGE_TAMIL:
-            nOffset = 0x0BE7 - '0';   // tamil
+        case LANGUAGE_TAMIL         & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0BE7 - '0';  // tamil
             break;
-        case LANGUAGE_TELUGU:
-            nOffset = 0x0C66 - '0';   // telugu
+        case LANGUAGE_TELUGU        & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0C66 - '0';  // telugu
             break;
-        case LANGUAGE_THAI:
-            nOffset = 0x0E50 - '0';   // thai
+        case LANGUAGE_THAI          & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0E50 - '0';  // thai
             break;
-        case LANGUAGE_TIBETAN:
-            nOffset = 0x0F20 - '0';   // tibetan
+        case LANGUAGE_TIBETAN       & LANGUAGE_MASK_PRIMARY:
+            nOffset = 0x0F20 - '0';  // tibetan
             break;
 #if 0 // TODO: use language type for these digit substitutions?
         // TODO case:
-            nOffset = 0x2776 - '0';   // dingbat circled
+            nOffset = 0x2776 - '0';  // dingbat circled
             break;
         // TODO case:
-            nOffset = 0x2070 - '0';   // superscript
+            nOffset = 0x2070 - '0';  // superscript
             break;
         // TODO case:
-            nOffset = 0x2080 - '0';   // subscript
+            nOffset = 0x2080 - '0';  // subscript
             break;
 #endif
     }