diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-22 16:19:37 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:38 +0200 |
commit | 07f6b08bdc7ac78905e8a6745bb58e026f31c9c7 (patch) | |
tree | 5e65b1d60624a57b3214f7f77a8905eb6e2afa9a /cui | |
parent | 641f375bec2fb65d64513ab9d74a3e3ca1489925 (diff) |
convert LANG_LIST constants to scoped enum
Change-Id: Ibd699cfdfd3266c2965a5b6368cfe2f4431b7fb4
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optasian.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optdict.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index dc58061832d7..3b2a4c949561 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -311,7 +311,7 @@ void SpellDialog::Init_Impl() m_pExplainLink->SetClickHdl( LINK( this, SpellDialog, HandleHyperlink ) ); // initialize language ListBox - m_pLanguageLB->SetLanguageList( LANG_LIST_SPELL_USED, false, false, true ); + m_pLanguageLB->SetLanguageList( SvxLanguageListFlags::SPELL_USED, false, false, true ); m_pSentenceED->ClearModifyFlag(); SvxGetChangeAllList()->clear(); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index c16711f621a4..fd637a9b96b5 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -146,7 +146,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& m_pStartED->SetModifyHdl(aLk); m_pEndED->SetModifyHdl(aLk); - m_pLanguageLB->SetLanguageList( LANG_LIST_FBD_CHARS, false, false ); + m_pLanguageLB->SetLanguageList( SvxLanguageListFlags::FBD_CHARS, false, false ); } SvxAsianLayoutPage::~SvxAsianLayoutPage() diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 4d154e26f0f0..de08c8ba7adf 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -113,7 +113,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent, pOKBtn->SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) ); // display languages - pLanguageLB->SetLanguageList( LANG_LIST_ALL, true, true ); + pLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL, true, true ); pLanguageLB->SelectEntryPos(0); } @@ -305,7 +305,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( } } - pLangLB->SetLanguageList( LANG_LIST_ALL, true, true ); + pLangLB->SetLanguageList( SvxLanguageListFlags::ALL, true, true ); pReplaceED->SetSpaces(true); pWordED->SetSpaces(true); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 0a9b466a792c..0949203066d1 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1190,14 +1190,14 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& SAL_WARN("cui.options", "ignoring Exception \"" << e.Message << "\""); } - m_pWesternLanguageLB->SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, true, false, true ); + m_pWesternLanguageLB->SetLanguageList( SvxLanguageListFlags::WESTERN | SvxLanguageListFlags::ONLY_KNOWN, true, false, true ); m_pWesternLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::LATIN ); - m_pAsianLanguageLB->SetLanguageList( LANG_LIST_CJK | LANG_LIST_ONLY_KNOWN, true, false, true ); + m_pAsianLanguageLB->SetLanguageList( SvxLanguageListFlags::CJK | SvxLanguageListFlags::ONLY_KNOWN, true, false, true ); m_pAsianLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::ASIAN ); - m_pComplexLanguageLB->SetLanguageList( LANG_LIST_CTL | LANG_LIST_ONLY_KNOWN, true, false, true ); + m_pComplexLanguageLB->SetLanguageList( SvxLanguageListFlags::CTL | SvxLanguageListFlags::ONLY_KNOWN, true, false, true ); m_pComplexLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX ); - m_pLocaleSettingLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, false, false, false); + m_pLocaleSettingLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false, false, false); m_pLocaleSettingLB->InsertSystemLanguage( ); const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 9d492b843612..d297d9ca4a5b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -111,10 +111,10 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) // initialize languages //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType //! will be set to LANGUAGE_UNDETERMINED - sal_Int16 nLangList = LANG_LIST_WESTERN; + SvxLanguageListFlags nLangList = SvxLanguageListFlags::WESTERN; if( SvtLanguageOptions().IsCTLFontEnabled() ) - nLangList |= LANG_LIST_CTL; + nLangList |= SvxLanguageListFlags::CTL; m_pLanguageLB->SetLanguageList( nLangList, true, true ); m_pLanguageLB->SelectLanguage( LANGUAGE_NONE ); sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 96da16d8c445..dfc5ba5ad107 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -359,9 +359,9 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet get(m_pPreviewWin, "preview"); - m_pWestFontLanguageLB->SetLanguageList(LANG_LIST_WESTERN, true, false, true); - m_pEastFontLanguageLB->SetLanguageList(LANG_LIST_CJK, true, false, true); - m_pCTLFontLanguageLB->SetLanguageList(LANG_LIST_CTL, true, false, true); + m_pWestFontLanguageLB->SetLanguageList(SvxLanguageListFlags::WESTERN, true, false, true); + m_pEastFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CJK, true, false, true); + m_pCTLFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CTL, true, false, true); if (!bShowNonWestern) { diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 2d600188dcf0..9ddc402a6291 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -366,7 +366,7 @@ void SvxNumberFormatTabPage::Init_Impl() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); /* TODO: any reason we're doing a manual init here instead of using - * SvxLanguageBoxBase::SetLanguageList( LANG_LIST_ONLY_KNOWN, ...)? */ + * SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags::ONLY_KNOWN, ...)? */ // Don't list ambiguous locales where we won't be able to convert the // LanguageType back to an identical Language_Country name and therefore // couldn't load the i18n LocaleData. Show DebugMsg in non-PRODUCT version. |