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

1 files changed, 27 insertions, 37 deletions

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e50026b21b27..acf858536f9b 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -365,72 +365,62 @@ namespace
             return nChar;
 
         sal_Unicode nOffset(0);
-        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:
                 break;
 
-            case LANGUAGE_ARABIC:
-                // FALLTHROUGS intended
-            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: //???
+            case LANGUAGE_ARABIC_SAUDI_ARABIA  & LANGUAGE_MASK_PRIMARY:
+            case LANGUAGE_URDU          & LANGUAGE_MASK_PRIMARY:
+            case LANGUAGE_PUNJABI       & LANGUAGE_MASK_PRIMARY: //???
                 nOffset = 0x0660 - '0';  // arabic/persian/urdu
                 break;
-            case LANGUAGE_BENGALI:
+            case LANGUAGE_BENGALI       & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x09E6 - '0';  // bengali
                 break;
-            case LANGUAGE_HINDI:
+            case LANGUAGE_BURMESE       & LANGUAGE_MASK_PRIMARY:
+                nOffset = 0x1040 - '0';  // burmese
+                break;
+            case LANGUAGE_HINDI         & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0966 - '0';  // devanagari
                 break;
-            case LANGUAGE_GUJARATI:
+            case LANGUAGE_GUJARATI      & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0AE6 - '0';  // gujarati
                 break;
-            case LANGUAGE_KANNADA:
+            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:
+            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;
-            case LANGUAGE_ORIYA:
+            case LANGUAGE_ORIYA         & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0B66 - '0';   // oriya
                 break;
-            case LANGUAGE_TAMIL:
+            case LANGUAGE_TAMIL         & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0BE7 - '0';   // tamil
                 break;
-            case LANGUAGE_TELUGU:
+            case LANGUAGE_TELUGU        & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0C66 - '0';   // telugu
                 break;
-            case LANGUAGE_THAI:
+            case LANGUAGE_THAI          & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0E50 - '0';   // thai
                 break;
-            case LANGUAGE_TIBETAN:
+            case LANGUAGE_TIBETAN       & LANGUAGE_MASK_PRIMARY:
                 nOffset = 0x0F20 - '0';   // tibetan
                 break;
         }