commit d4375cf6e6086c3b9cb169cbb40781e8b1124b4d
author Eike Rathke <erack@redhat.com> Thu Apr 11 19:15:17 2024 +0200
committer Eike Rathke <erack@redhat.com> Fri Apr 12 12:06:28 2024 +0200
tree e32d4fc9df7c764e4d2b928dd8e999f869a411d0
parent 44ff9907eb1f2851b3b9087e7ec5e5dfae5a00c6

Resolves: tdf#160256 Add "[Multiple]" and "[Undetermined]" to language list

Such that they are added to the top of the list after "[None]" and
only if "[None]" was requested.

{mul} and {und} ISO codes.

Change-Id: I024311fe7d638124932a1d38759305e8efec5962
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166012
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

svtools/inc/langtab.hrc

diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index f2d2238..9cd73c3 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -27,6 +27,8 @@
const std::pair<TranslateId, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
{
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "[None]") , LANGUAGE_NONE },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "[Multiple]") , LANGUAGE_MULTIPLE },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "[Undetermined]") , LANGUAGE_UNDETERMINED },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Unknown") , LANGUAGE_DONTKNOW },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Default") , LANGUAGE_SYSTEM },
    { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Default") , LANGUAGE_USER_SYSTEM_CONFIG },

svx/source/dialog/langbox.cxx

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 8699a67..477e404 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -101,6 +101,8 @@ bool lcl_isPrerequisite(LanguageType nLangType, bool requireSublang)
        nLangType != LANGUAGE_DONTKNOW &&
        nLangType != LANGUAGE_SYSTEM &&
        nLangType != LANGUAGE_NONE &&
        nLangType != LANGUAGE_MULTIPLE &&
        nLangType != LANGUAGE_UNDETERMINED &&
        nLangType != LANGUAGE_USER_KEYID &&
        !MsLangId::isLegacy( nLangType) &&
        (!requireSublang || MsLangId::getSubLanguage( nLangType));
@@ -311,6 +313,8 @@ void SvxLanguageBox::SetLanguageList(SvxLanguageListFlags nLangList, bool bHasLa
    if (bHasLangNone)
    {
        m_xControl->append(BuildEntry(LANGUAGE_NONE));
        m_xControl->append(BuildEntry(LANGUAGE_MULTIPLE));
        m_xControl->append(BuildEntry(LANGUAGE_UNDETERMINED));
        bAddSeparator = true;
    }