diff options
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optasian.cxx | 16 | ||||
| -rw-r--r-- | cui/source/options/optgenrl.cxx | 7 |
2 files changed, 7 insertions, 16 deletions
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 035aa7fa0fad..914923d71fed 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -33,6 +33,7 @@ #include <optasian.hrc> #include <dialmgr.hxx> #include <cuires.hrc> +#include <i18npool/mslangid.hxx> #include <tools/shl.hxx> #include <svl/asiancfg.hxx> #include <com/sun/star/lang/Locale.hpp> @@ -301,17 +302,10 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) { eLastUsedLanguageTypeForForbiddenCharacters = SvxLocaleToLanguage( Application::GetSettings().GetLocale() ); - switch(eLastUsedLanguageTypeForForbiddenCharacters) - { - case LANGUAGE_CHINESE : - case LANGUAGE_CHINESE_SINGAPORE : - eLastUsedLanguageTypeForForbiddenCharacters = LANGUAGE_CHINESE_SIMPLIFIED; - break; - case LANGUAGE_CHINESE_HONGKONG : - case LANGUAGE_CHINESE_MACAU : - eLastUsedLanguageTypeForForbiddenCharacters = LANGUAGE_CHINESE_TRADITIONAL; - break; - } + if (MsLangId::isSimplifiedChinese(eLastUsedLanguageTypeForForbiddenCharacters)) + eLastUsedLanguageTypeForForbiddenCharacters = LANGUAGE_CHINESE_SIMPLIFIED; + else if (MsLangId::isTraditionalChinese(eLastUsedLanguageTypeForForbiddenCharacters)) + eLastUsedLanguageTypeForForbiddenCharacters = LANGUAGE_CHINESE_TRADITIONAL; } aLanguageLB.SelectLanguage( eLastUsedLanguageTypeForForbiddenCharacters ); LanguageHdl(&aLanguageLB); diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 2454f17725fe..6645a2e66c9a 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -27,6 +27,7 @@ ************************************************************************/ #include <comphelper/string.hxx> +#include <i18npool/mslangid.hxx> #include <tools/shl.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> @@ -162,11 +163,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe aFirstName.SetZOrder( &aName, WINDOW_ZORDER_BEHIND ); aFatherName.SetZOrder( &aFirstName, WINDOW_ZORDER_BEHIND ); } - else if ( LANGUAGE_JAPANESE == eLang || - LANGUAGE_KOREAN == eLang || - LANGUAGE_HUNGARIAN == eLang || - LANGUAGE_CHINESE_TRADITIONAL == eLang || - LANGUAGE_CHINESE_SIMPLIFIED == eLang) + else if (MsLangId::isFamilyNameFirst(eLang)) { aUsCityEdit.Hide(); aUsStateEdit.Hide(); |