diff options
author | Rob Snelders <programming@ertai.nl> | 2012-07-08 20:51:13 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-07-09 12:40:32 +0200 |
commit | 860b321d81633268e4b80b8fe10b73df615c28ae (patch) | |
tree | 71e7f6bb6b772f90166a1e1cdbf24a5f5801d485 /svx/source | |
parent | c3b6e14db7a8134a49da7bdb12d351cddcc866d5 (diff) |
- fdo#45830 - Language/User Interface: current choice indicated as default
Change-Id: I3ac2e8e3219c12be84ce38cb98342f0dce0d6476
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/langbox.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 0ec2329c4303..ff08724b4058 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -352,6 +352,10 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType); aStrEntry.AppendAscii(" - "); aStrEntry.Append(m_pLangTable->GetString( nRealLang )); + } else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) { + nRealLang = MsLangId::getSystemLanguage(); + aStrEntry.AppendAscii(" - "); + aStrEntry.Append(m_pLangTable->GetString( nRealLang )); } aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); @@ -388,6 +392,13 @@ sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nP //------------------------------------------------------------------------ +sal_uInt16 SvxLanguageBox::InsertSystemLanguage( sal_uInt16 nPos ) +{ + return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); +} + +//------------------------------------------------------------------------ + sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_Bool bCheckEntry, sal_uInt16 nPos ) { |