diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 12:30:13 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 12:44:34 +0200 |
commit | fd2ffceefc942c7f28f2a0146df09e4ff6ad7d09 (patch) | |
tree | e2eeeeac51f853358d41549ae8dfd2f4a124d820 /editeng/source | |
parent | 4e19742382708a691c6f62c47744fd2fa663216c (diff) |
convert EESpellState to scoped enum
and drop unused EE_SPELL_NOLANGUAGE enumerator
Change-Id: I74a5f89335883a13d77b39f78b7de55bddb1f107
Diffstat (limited to 'editeng/source')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 14 |
4 files changed, 11 insertions, 11 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index d3bf03f7dd92..dccbed4dbe64 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2168,7 +2168,7 @@ bool EditEngine::SpellNextDocument() EESpellState EditEngine::HasSpellErrors() { if ( !pImpEditEngine->GetSpeller().is() ) - return EE_SPELL_NOSPELLER; + return EESpellState::NoSpeller; return pImpEditEngine->HasSpellErrors(); } diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 897569e58fbc..75774fb5ff29 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -763,7 +763,7 @@ void EditView::CompleteAutoCorrect( vcl::Window* pFrameWin ) EESpellState EditView::StartSpeller( bool bMultipleDoc ) { if ( !pImpEditView->pEditEngine->pImpEditEngine->GetSpeller().is() ) - return EE_SPELL_NOSPELLER; + return EESpellState::NoSpeller; return pImpEditView->pEditEngine->pImpEditEngine->Spell( this, bMultipleDoc ); } @@ -771,7 +771,7 @@ EESpellState EditView::StartSpeller( bool bMultipleDoc ) EESpellState EditView::StartThesaurus() { if ( !pImpEditView->pEditEngine->pImpEditEngine->GetSpeller().is() ) - return EE_SPELL_NOSPELLER; + return EESpellState::NoSpeller; return pImpEditView->pEditEngine->pImpEditEngine->StartThesaurus( this ); } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index d9ec4848cf2a..51452ad7ed27 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -172,7 +172,7 @@ struct SpellInfo svx::SpellPortions aLastSpellPortions; SpellContentSelections aLastSpellContentSelections; SpellInfo() - { bSpellToEnd = true; eState = EE_SPELL_OK; bMultipleDoc = false; } + { bSpellToEnd = true; eState = EESpellState::Ok; bMultipleDoc = false; } }; // used for text conversion diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 0c457228676e..56d8566a2ec4 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1477,7 +1477,7 @@ EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc ) SAL_WARN_IF( !xSpeller.is(), "editeng", "No Spell checker set!" ); if ( !xSpeller.is() ) - return EE_SPELL_NOSPELLER; + return EESpellState::NoSpeller; aOnlineSpellTimer.Stop(); @@ -1898,7 +1898,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpSpell( EditView* pEditView ) if ( !xSpellAlt.is() ) aCurSel = WordRight( aCurSel.Min(), css::i18n::WordType::DICTIONARY_WORD ); else - pSpellInfo->eState = EE_SPELL_ERRORFOUND; + pSpellInfo->eState = EESpellState::ErrorFound; } pEditView->pImpEditView->DrawSelection(); @@ -1946,7 +1946,7 @@ Reference< XSpellAlternatives > ImpEditEngine::ImpFindNextError(EditSelection& r aCurSel = WordRight( aCurSel.Min(), css::i18n::WordType::DICTIONARY_WORD ); else { - pSpellInfo->eState = EE_SPELL_ERRORFOUND; + pSpellInfo->eState = EESpellState::ErrorFound; rSelection = aCurSel; } } @@ -2456,7 +2456,7 @@ EESpellState ImpEditEngine::HasSpellErrors() if ( ( aCurSel.Max().GetNode() == pLastNode ) && ( aCurSel.Max().GetIndex() >= pLastNode->Len() ) ) { - return EE_SPELL_OK; + return EESpellState::Ok; } aCurSel = SelectWord( aCurSel, css::i18n::WordType::DICTIONARY_WORD ); @@ -2470,7 +2470,7 @@ EESpellState ImpEditEngine::HasSpellErrors() aCurSel = WordRight( aCurSel.Max(), css::i18n::WordType::DICTIONARY_WORD ); } - return EE_SPELL_ERRORFOUND; + return EESpellState::ErrorFound; } void ImpEditEngine::ClearSpellErrors() @@ -2487,7 +2487,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView ) Reference< XThesaurus > xThes( LinguMgr::GetThesaurus() ); if (!xThes.is()) - return EE_SPELL_ERRORFOUND; + return EESpellState::ErrorFound; EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create(); ScopedVclPtr<AbstractThesaurusDialog> xDlg(pFact->CreateThesaurusDialog( pEditView->GetWindow(), xThes, aWord, GetLanguage( aCurSel.Max() ) )); @@ -2501,7 +2501,7 @@ EESpellState ImpEditEngine::StartThesaurus( EditView* pEditView ) pEditView->ShowCursor(true, false); } - return EE_SPELL_OK; + return EESpellState::Ok; } sal_Int32 ImpEditEngine::StartSearchAndReplace( EditView* pEditView, const SvxSearchItem& rSearchItem ) |