[Libreoffice-commits] core.git: 2 commits - i18nlangtag/source svx/source

[Eike Rathke]

 i18nlangtag/source/languagetag/languagetag.cxx |    2 +-
 svx/source/dialog/langbox.cxx                  |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a727e93d10e7514bf9d962059fb91e36e362e0cc
Author: Eike Rathke <erack at redhat.com>
Date:   Sun Sep 22 02:53:10 2013 +0200

    insert on-the-fly-ID if select requested
    
    Change-Id: I2935b211aaee345827d89c63de207c7e4fbc78f4

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index e24bb80..3b3eca6 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -456,6 +456,9 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSel
 
     sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
 
+    if ( nAt == LISTBOX_ENTRY_NOTFOUND )
+        nAt = InsertLanguage( nLang );      // on-the-fly-ID
+
     if ( nAt != LISTBOX_ENTRY_NOTFOUND )
         SelectEntryPos( nAt, bSelect );
 }
commit 6fa84d196834e041550ec4de426865b8a6038cfa
Author: Eike Rathke <erack at redhat.com>
Date:   Sun Sep 22 02:21:52 2013 +0200

    in canonicalize() an unknown LangID is temporary
    
    Change-Id: I4ae0f04f6ba5d6d0f9668595adf0b6865a34d6ef

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 7ceb37b..fd14889 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1103,7 +1103,7 @@ bool LanguageTagImpl::canonicalize()
                 if (!mbInitializedLangID)
                 {
                     convertLocaleToLang( false);
-                    if (bTemporaryLocale)
+                    if (bTemporaryLocale || mnLangID == LANGUAGE_DONTKNOW)
                         bTemporaryLangID = true;
                 }
                 if (mnLangID != LANGUAGE_DONTKNOW && mnLangID != LANGUAGE_SYSTEM)