diff options
| author | Eike Rathke <erack@redhat.com> | 2023-01-04 21:14:03 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2023-01-06 14:11:53 +0000 |
| commit | 3aa8e02ce9de14225fe8aa1c31618abe1baa4f5e (patch) | |
| tree | f6743845bd7d2323fc2b94fc8ee90fd05a1f4f2d /svtools | |
| parent | 1a7db8daf9da33133c49e803cb1b834d9351bf59 (diff) | |
Related: tdf#152781 Add also non-on-the-fly IDs to language list
This is a combination of 2 commits.
Related: tdf#152781 s/lang-tag of/generated/ in SAL_WARN
Only cosmetical to clarify, if possible a complete UI name is
generated, not just the language tag as before.
xChange-Id: Id38e397793807762c2698948c325e6eeda989cc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145048
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 8343376c10eef50a022f600e0bd03f1384e9a288)
Related: tdf#152781 Add also non-on-the-fly IDs to language list
Generating names more than once is unnecessary.
This may happen for defined mappings that have no explicitly
predefined language list entry.
xChange-Id: I278e6d77181b661a90d0fb133cb3ca30c2a9b721
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145049
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit cb4c33ef88a0ef252383e7a12678f28c4432347e)
Change-Id: I278e6d77181b661a90d0fb133cb3ca30c2a9b721
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145092
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/langtab.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 18099a828f27..0f5f15257856 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -240,13 +240,11 @@ OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const OUString sLangTag( lcl_getDescription( LanguageTag(nLang))); SAL_WARN("svtools.misc", "Language: 0x" << std::hex << nLang - << " with unknown name, so returning lang-tag of: " + << " with unknown name, so returning generated: " << sLangTag); - // And add it to the table if it is an on-the-fly-id, which it usually is, - // so it is available in all subsequent language boxes. - if (LanguageTag::isOnTheFlyID( nLang)) - const_cast<SvtLanguageTableImpl*>(this)->AddEntry( sLangTag, nLang); + // And add it to the table, so it is available in all subsequent language boxes. + const_cast<SvtLanguageTableImpl*>(this)->AddEntry( sLangTag, nLang); return sLangTag; } |