[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source include/i18nlangtag l10ntools/source svtools/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx  |    1 +
 i18nlangtag/source/isolang/mslangid.cxx |    2 ++
 include/i18nlangtag/lang.h              |    1 +
 l10ntools/source/export.cxx             |    2 +-
 svtools/source/misc/langtab.src         |    1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 99bd42d8e6a239c5365a5487b3d1fea76d84a561
Author: Eike Rathke <erack at redhat.com>
Date:   Sat May 11 01:53:18 2013 +0200

    added N'ko [nqo-GN] to language list, fdo#64331
    
    RTL and CTL
    
    Change-Id: Ifdce9e3e08a715dcf493c4103479c5fd64a42d74

diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index a6a467c..00d21b5 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -511,6 +511,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_YOMBE,                 "yom", "CD" },
     { LANGUAGE_USER_YOMBE_CONGO,           "yom", "CG" },
     { LANGUAGE_USER_SIDAMA,                "sid", "ET" },
+    { LANGUAGE_USER_NKO,                   "nqo", "GN" },
     { LANGUAGE_MULTIPLE,                   "mul", ""   },   // multiple languages, many languages are used
     { LANGUAGE_UNDETERMINED,               "und", ""   },   // undetermined language, language cannot be identified
     { LANGUAGE_NONE,                       "zxx", ""   },   // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
diff --git a/i18nlangtag/source/isolang/mslangid.cxx b/i18nlangtag/source/isolang/mslangid.cxx
index 8955f55..34c017b 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -231,6 +231,7 @@ bool MsLangId::isRightToLeft( LanguageType nLang )
         case LANGUAGE_SINDHI              & LANGUAGE_MASK_PRIMARY :
         case LANGUAGE_UIGHUR_CHINA        & LANGUAGE_MASK_PRIMARY :
         case LANGUAGE_USER_KYRGYZ_CHINA   & LANGUAGE_MASK_PRIMARY :
+        case LANGUAGE_USER_NKO            & LANGUAGE_MASK_PRIMARY :
             return true;
 
         default:
@@ -393,6 +394,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
         case LANGUAGE_UIGHUR_CHINA:
         case LANGUAGE_USER_LIMBU:
         case LANGUAGE_USER_KYRGYZ_CHINA:
+        case LANGUAGE_USER_NKO:
             nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
             break;
 
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index d4f5ca7..aa6dc46 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -554,6 +554,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_YOMBE                 0x0684
 #define LANGUAGE_USER_YOMBE_CONGO           0x8284  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_USER_YOMBE)) */
 #define LANGUAGE_USER_SIDAMA                0x0685
+#define LANGUAGE_USER_NKO                   0x0686
 
 #define LANGUAGE_USER_PRIV_JOKER            0xFFEB  /* privateuse "*" (sic! bad! nasty!), primary 0x3eb, sub 0x3f */
 #define LANGUAGE_USER_PRIV_COMMENT          0xFFEC  /* privateuse "x-comment", primary 0x3ec, sub 0x3f */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 48f670c..6639472 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -360,6 +360,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Tsaangi" ; LANGUAGE_USER_TSAANGI ; > ;
         < "Yaka" ; LANGUAGE_USER_YAKA ; > ;
         < "Yombe (Congo)" ; LANGUAGE_USER_YOMBE_CONGO ; > ;
+        < "N'ko" ; LANGUAGE_USER_NKO ; > ;
     };
 };
 
commit f9bb8a6da4434fc521b26214aeec349504c3a82b
Author: Eike Rathke <erack at redhat.com>
Date:   Sat May 11 01:29:47 2013 +0200

    fixed transex3 out of bounds access to vMergeEntryVector
    
    transex3 crashed if a new language was added to the StringArray
    PairedList in svtools/source/misc/langtab.src and that resource was
    attempted to be built.
    
    For the new entry doesn't exist a MergeEntrys entry in vMergeEntryVector
    yet, but ExportList::GetSourceLanguageListEntryCount() already includes
    it so nMaxList is greater than size of vMergeEntryVector. Check nLIndex
    first.
    
    Change-Id: I3b706bea7aea7cd7ecd8245d99587b944510952d

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index f817e21..5d285ad 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1476,7 +1476,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
                                 }
                             }
 
-                            if( bTranslateList )
+                            if( bTranslateList && nLIndex < vMergeEntryVector.size() )
                             {
                                 OString sText;
                                 sal_Bool bText;