[Libreoffice-commits] core.git: 3 commits - svtools/source

[Eike Rathke]

 svtools/source/misc/langtab.src    |    4 +++-
 svtools/source/misc/sampletext.cxx |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d8cc122981724d50c1285accba023f8dcf8d3b30
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 17 18:11:55 2013 +0200

    added "Uzbek Cyrillic"
    
    Change-Id: I9a542f09d9f09e25082eea1327722b0021a34d0c

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 9ff5cf2..1752742 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -195,6 +195,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Urdu (India)" ; LANGUAGE_URDU_INDIA ; > ;
         < "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ;
         < "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ;
+        < "Uzbek Cyrillic" ; LANGUAGE_UZBEK_CYRILLIC ; > ;
         < "Welsh" ; LANGUAGE_WELSH ; > ;
         < "Latin" ; LANGUAGE_LATIN ; > ;
         < "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ;
commit 562ba963be28db0eb8dc3043db9e28319d1da1c8
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 17 18:06:28 2013 +0200

    USCRIPT_MONGOLIAN only for LANGUAGE_MONGOLIAN_MONGOLIAN
    
    Although LANGUAGE_MONGOLIAN and LANGUAGE_MONGOLIAN_MONGOLIAN have the
    same primary language they are of different scripts.
    
    Change-Id: If72bf51a339b8daa71dfd2f8cd97877c17bbe5f4

diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index fc54c0d..c8ba114 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -587,7 +587,8 @@ OUString makeRepresentativeTextForLanguage(LanguageType eLang)
             sRet = makeRepresentativeTextForScript(USCRIPT_KHMER);
             break;
         case LANGUAGE_MONGOLIAN & LANGUAGE_MASK_PRIMARY:
-            sRet = makeRepresentativeTextForScript(USCRIPT_MONGOLIAN);
+            if (eLang == LANGUAGE_MONGOLIAN_MONGOLIAN)
+                sRet = makeRepresentativeTextForScript(USCRIPT_MONGOLIAN);
             break;
         case LANGUAGE_JAPANESE & LANGUAGE_MASK_PRIMARY:
             sRet = makeRepresentativeTextForScript(USCRIPT_JAPANESE);
commit ac60f166dae444618503d569d12823bc9a8c925a
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Sep 17 18:03:24 2013 +0200

    "Mongolian Cyrillic" and "Mongolian Mongolian"
    
    Change-Id: I6b4e6ae9eb1c2c54b9b876b675344ced34315e29

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ddc190c..9ff5cf2 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -204,7 +204,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Dhivehi" ; LANGUAGE_DHIVEHI ; > ;
         < "Northern Sotho" ; LANGUAGE_SEPEDI ; > ;
         < "Gaelic (Scotland)" ; LANGUAGE_GAELIC_SCOTLAND ; > ;
-        < "Mongolian" ; LANGUAGE_MONGOLIAN ; > ;
+        < "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN ; > ;
+        < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN ; > ;
         < "Interlingua" ; LANGUAGE_USER_INTERLINGUA ; > ;
         < "Bosnian" ; LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA ; > ;
         < "Bengali (Bangladesh)" ; LANGUAGE_BENGALI_BANGLADESH ; > ;