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

[Andras Timar]

 l10ntools/source/export.cxx     |    7 ++-----
 svtools/source/misc/langtab.src |    8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit a81156329dfc1bc8b2e9b69fc81876016c775e76
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Sep 27 10:54:44 2013 +0200

    Revert "moved newly inserted entries to the end"
    
    This reverts commit bcfb5f0e9b659d16b72fe0add599dd8ec1a7c098.
    82a844a688ea0db38190fbd57e42e56d0403c00d solves the root of the issue

diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f9bd866..1752742 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -84,6 +84,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Dutch (Belgium)" ; LANGUAGE_DUTCH_BELGIAN ; > ;
         < "English (USA)" ; LANGUAGE_ENGLISH_US ; > ;
         < "English (UK)" ; LANGUAGE_ENGLISH_UK ; > ;
+        < "English, OED spelling (UK)" ; LANGUAGE_USER_ENGLISH_UK_OED ; > ;
         < "English (Australia)" ; LANGUAGE_ENGLISH_AUS ; > ;
         < "English (Canada)" ; LANGUAGE_ENGLISH_CAN ; > ;
         < "English (New Zealand)" ; LANGUAGE_ENGLISH_NZ ; > ;
@@ -157,6 +158,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Serbian Latin (Serbia)" ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ; > ;
         < "Serbian Cyrillic (Montenegro)" ; LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ; > ;
         < "Serbian Latin (Montenegro)" ; LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ; > ;
+        < "Serbian Latin" ; LANGUAGE_SERBIAN_LATIN_NEUTRAL ; > ;
         < "Sidama" ; LANGUAGE_USER_SIDAMA ; > ;
         < "Sindhi" ; LANGUAGE_SINDHI ; > ;
         < "Slovak" ; LANGUAGE_SLOVAK ; > ;
@@ -193,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 ; > ;
@@ -203,6 +206,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Northern Sotho" ; LANGUAGE_SEPEDI ; > ;
         < "Gaelic (Scotland)" ; LANGUAGE_GAELIC_SCOTLAND ; > ;
         < "Mongolian Cyrillic" ; LANGUAGE_MONGOLIAN ; > ;
+        < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN ; > ;
         < "Interlingua" ; LANGUAGE_USER_INTERLINGUA ; > ;
         < "Bosnian" ; LANGUAGE_BOSNIAN_BOSNIA_HERZEGOVINA ; > ;
         < "Bengali (Bangladesh)" ; LANGUAGE_BENGALI_BANGLADESH ; > ;
@@ -366,10 +370,6 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Cornish" ; LANGUAGE_USER_CORNISH ; > ;
         < "Sami, Pite (Sweden)" ; LANGUAGE_USER_SAMI_PITE_SWEDEN ; > ;
         < "Ngäbere" ; LANGUAGE_USER_NGAEBERE ; > ;
-        < "Serbian Latin" ; LANGUAGE_SERBIAN_LATIN_NEUTRAL ; > ;
-        < "English, OED spelling (UK)" ; LANGUAGE_USER_ENGLISH_UK_OED ; > ;
-        < "Mongolian Mongolian" ; LANGUAGE_MONGOLIAN_MONGOLIAN ; > ;
-        < "Uzbek Cyrillic" ; LANGUAGE_UZBEK_CYRILLIC ; > ;
     };
 };
 
commit 82a844a688ea0db38190fbd57e42e56d0403c00d
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Fri Sep 27 10:53:45 2013 +0200

    fix po import of PairedList
    
    Change-Id: Ie086cf59ae86a845e0b84e0ecba7f7e578d83783

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 864e7b2..f68cf29 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1303,10 +1303,7 @@ bool Export::GetAllMergeEntrysOfList(ResData *pResData, std::vector<MergeEntrys*
             pResData->sId = OString::number(nLIndex);
 
         MergeEntrys* pEntrys = pMergeDataFile->GetMergeEntrys( pResData );
-        if( pEntrys )
-        {
-           o_vMergeEntrys.push_back(pEntrys);
-        }
+        o_vMergeEntrys.push_back(pEntrys);
     }
     return true;
  }
@@ -1470,7 +1467,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
                                 }
                             }
 
-                            if( bTranslateList && nLIndex < vMergeEntryVector.size() )
+                            if( bTranslateList && nLIndex < vMergeEntryVector.size() && vMergeEntryVector[nLIndex] )
                             {
                                 OString sText;
                                 sal_Bool bText;