diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-15 09:36:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-04-17 07:21:08 +0000 |
| commit | a7b7c64afc523cfd9ff4e724b3efbec6567fc1c8 (patch) | |
| tree | 52fd05ef3292f3dab172864cbc3be96a8d44a9d0 /svx | |
| parent | Breeze: some updates recs from jay (diff) | |
| download | core-a7b7c64afc523cfd9ff4e724b3efbec6567fc1c8.tar.gz core-a7b7c64afc523cfd9ff4e724b3efbec6567fc1c8.zip | |
convert SCRIPTTYPE_ constants to scoped enum
Change-Id: I5be3980ac865162d8d7626556ca47eca4b0ee433
Reviewed-on: https://gerrit.libreoffice.org/15344
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/langbox.cxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 7606ee3a6dd8..40ce13a0c0ad 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -269,13 +269,13 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 nLangList, ((nLangList & LANG_LIST_ALL) != 0 || ((nLangList & LANG_LIST_WESTERN) != 0 && (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == - SCRIPTTYPE_LATIN)) || + SvtScriptType::LATIN)) || ((nLangList & LANG_LIST_CTL) != 0 && (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == - SCRIPTTYPE_COMPLEX)) || + SvtScriptType::COMPLEX)) || ((nLangList & LANG_LIST_CJK) != 0 && (SvtLanguageOptions::GetScriptTypeOfLanguage(nLangType) == - SCRIPTTYPE_ASIAN)) || + SvtScriptType::ASIAN)) || ((nLangList & LANG_LIST_FBD_CHARS) != 0 && MsLangId::hasForbiddenCharacters(nLangType)) || ((nLangList & LANG_LIST_SPELL_AVAIL) != 0 && diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 367cd8fbedea..3a7c78965d2b 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1403,9 +1403,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible() } } -sal_uInt16 SdrObjEditView::GetScriptType() const +SvtScriptType SdrObjEditView::GetScriptType() const { - sal_uInt16 nScriptType = 0; + SvtScriptType nScriptType = SvtScriptType::NONE; if( IsTextEdit() ) { @@ -1430,8 +1430,8 @@ sal_uInt16 SdrObjEditView::GetScriptType() const } } - if( nScriptType == 0 ) - nScriptType = SCRIPTTYPE_LATIN; + if( nScriptType == SvtScriptType::NONE ) + nScriptType = SvtScriptType::LATIN; return nScriptType; } |