summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-15 13:53:33 +0200
committerNoel Grandin <noel@peralex.com>2016-08-15 13:54:05 +0200
commit6f6024610b6f5392a96ed07ce9abe5aab606519d (patch)
tree22dbeecaa8bc821084a1f5665b232bae7cfc775e /editeng
parent5b9480b5d29a7f5fc4ba509f180a71b162451b34 (diff)
convert SvxSpellArea to scoped enum
Change-Id: I91d3caabb667e7d4ff23e603026e072074058712
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/edtspell.cxx6
-rw-r--r--editeng/source/editeng/textconv.cxx14
-rw-r--r--editeng/source/misc/splwrap.cxx14
3 files changed, 17 insertions, 17 deletions
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 627ead706c26..4077ae5fcd63 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -57,7 +57,7 @@ void EditSpellWrapper::SpellStart( SvxSpellArea eArea )
ImpEditEngine* pImpEE = pEditView->GetImpEditEngine();
SpellInfo* pSpellInfo = pImpEE->GetSpellInfo();
- if ( eArea == SVX_SPELL_BODY_START )
+ if ( eArea == SvxSpellArea::BodyStart )
{
// Is called when
// a) Spell-Forward has arrived at the end and should restart at the top
@@ -76,7 +76,7 @@ void EditSpellWrapper::SpellStart( SvxSpellArea eArea )
pEE->GetEditDoc().GetStartPaM() );
}
}
- else if ( eArea == SVX_SPELL_BODY_END )
+ else if ( eArea == SvxSpellArea::BodyEnd )
{
// Is called when
// a) Spell-Forward is launched
@@ -95,7 +95,7 @@ void EditSpellWrapper::SpellStart( SvxSpellArea eArea )
pEE->GetEditDoc().GetEndPaM() );
}
}
- else if ( eArea == SVX_SPELL_BODY )
+ else if ( eArea == SvxSpellArea::Body )
{
; // Is handled by the App through SpellNextDocument
}
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index fd73733c8f12..7a8d6dbc752d 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -87,7 +87,7 @@ bool TextConvWrapper::ConvNext_impl()
{
m_bStartDone = true;
m_bEndDone = false;
- ConvStart_impl( SVX_SPELL_BODY );
+ ConvStart_impl( SvxSpellArea::Body );
return true;
}
return false;
@@ -100,14 +100,14 @@ bool TextConvWrapper::ConvNext_impl()
{
m_bStartDone = true;
m_bEndDone = false;
- ConvStart_impl( SVX_SPELL_BODY );
+ ConvStart_impl( SvxSpellArea::Body );
return true;
}
}
else if (!m_aConvSel.HasRange())
{
m_bStartChk = !m_bStartDone;
- ConvStart_impl( m_bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
+ ConvStart_impl( m_bStartChk ? SvxSpellArea::BodyStart : SvxSpellArea::BodyEnd );
return true;
}
@@ -160,7 +160,7 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
ImpEditEngine* pImpEE = m_pEditView->GetImpEditEngine();
ConvInfo* pConvInfo = pImpEE->GetConvInfo();
- if ( eArea == SVX_SPELL_BODY_START )
+ if ( eArea == SvxSpellArea::BodyStart )
{
// Is called when Spell-forward has reached the end, and to start over
if ( m_bEndDone )
@@ -178,7 +178,7 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
pEE->GetEditDoc().GetStartPaM() );
}
}
- else if ( eArea == SVX_SPELL_BODY_END )
+ else if ( eArea == SvxSpellArea::BodyEnd )
{
// Is called when Spell-forward starts
pConvInfo->bConvToEnd = true;
@@ -196,7 +196,7 @@ void TextConvWrapper::ConvStart_impl( SvxSpellArea eArea )
pEE->GetEditDoc().GetEndPaM() );
}
}
- else if ( eArea == SVX_SPELL_BODY )
+ else if ( eArea == SvxSpellArea::Body )
{
// called by ConvNext_impl...
pConvInfo->aConvContinue = pConvInfo->aConvStart;
@@ -542,7 +542,7 @@ void TextConvWrapper::ChangeText_impl( const OUString &rNewText, bool bKeepAttri
void TextConvWrapper::Convert()
{
m_bStartChk = false;
- ConvStart_impl( SVX_SPELL_BODY_END );
+ ConvStart_impl( SvxSpellArea::BodyEnd );
ConvertDocument();
}
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index c8f07694cf7a..35c68bef69ee 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -275,12 +275,12 @@ void SvxSpellWrapper::SpellDocument( )
if ( bOtherCntnt )
{
bReverse = false;
- SpellStart( SVX_SPELL_OTHER );
+ SpellStart( SvxSpellArea::Other );
}
else
{
bStartChk = bReverse;
- SpellStart( bReverse ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
+ SpellStart( bReverse ? SvxSpellArea::BodyStart : SvxSpellArea::BodyEnd );
}
if ( FindSpellError() )
@@ -340,7 +340,7 @@ bool SvxSpellWrapper::SpellNext( )
bOtherCntnt = false;
bStartDone = !bReverse;
bEndDone = bReverse;
- SpellStart( SVX_SPELL_BODY );
+ SpellStart( SvxSpellArea::Body );
return true;
}
return false;
@@ -351,7 +351,7 @@ bool SvxSpellWrapper::SpellNext( )
if ( bOtherCntnt )
{
bStartChk = false;
- SpellStart( SVX_SPELL_BODY );
+ SpellStart( SvxSpellArea::Body );
bGoOn = true;
}
else if ( bStartDone && bEndDone )
@@ -360,7 +360,7 @@ bool SvxSpellWrapper::SpellNext( )
// Body area done, ask for special area
if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
{
- SpellStart( SVX_SPELL_OTHER );
+ SpellStart( SvxSpellArea::Other );
bOtherCntnt = bGoOn = true;
}
else if ( SpellMore() ) // check another document?
@@ -368,7 +368,7 @@ bool SvxSpellWrapper::SpellNext( )
bOtherCntnt = false;
bStartDone = !bReverse;
bEndDone = bReverse;
- SpellStart( SVX_SPELL_BODY );
+ SpellStart( SvxSpellArea::Body );
return true;
}
}
@@ -389,7 +389,7 @@ bool SvxSpellWrapper::SpellNext( )
else
{
bStartChk = !bStartDone;
- SpellStart( bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
+ SpellStart( bStartChk ? SvxSpellArea::BodyStart : SvxSpellArea::BodyEnd );
bGoOn = true;
}
WAIT_ON();