summaryrefslogtreecommitdiff
path: root/sw
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 /sw
parent5b9480b5d29a7f5fc4ba509f180a71b162451b34 (diff)
convert SvxSpellArea to scoped enum
Change-Id: I91d3caabb667e7d4ff23e603026e072074058712
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx12
-rw-r--r--sw/source/uibase/lingu/hyp.cxx2
-rw-r--r--sw/source/uibase/uiview/viewling.cxx16
3 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index a3b10dbee5ec..8b48c376fd03 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -600,11 +600,11 @@ void SwHHCWrapper::Convert()
}
if ( m_bIsOtherContent )
- ConvStart_impl( m_pConvArgs, SVX_SPELL_OTHER );
+ ConvStart_impl( m_pConvArgs, SvxSpellArea::Other );
else
{
m_bStartChk = false;
- ConvStart_impl( m_pConvArgs, SVX_SPELL_BODY_END );
+ ConvStart_impl( m_pConvArgs, SvxSpellArea::BodyEnd );
}
ConvertDocument();
@@ -632,7 +632,7 @@ bool SwHHCWrapper::ConvNext_impl( )
if ( m_bIsOtherContent )
{
m_bStartChk = false;
- ConvStart_impl( m_pConvArgs, SVX_SPELL_BODY );
+ ConvStart_impl( m_pConvArgs, SvxSpellArea::Body );
bGoOn = true;
}
else if ( m_bStartDone && m_bEndDone )
@@ -640,14 +640,14 @@ bool SwHHCWrapper::ConvNext_impl( )
// body region done, ask about special region
if( HasOtherCnt_impl() )
{
- ConvStart_impl( m_pConvArgs, SVX_SPELL_OTHER );
+ ConvStart_impl( m_pConvArgs, SvxSpellArea::Other );
m_bIsOtherContent = bGoOn = true;
}
}
else
{
m_bStartChk = !m_bStartDone;
- ConvStart_impl( m_pConvArgs, m_bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
+ ConvStart_impl( m_pConvArgs, m_bStartChk ? SvxSpellArea::BodyStart : SvxSpellArea::BodyEnd );
bGoOn = true;
}
return bGoOn;
@@ -686,7 +686,7 @@ bool SwHHCWrapper::HasOtherCnt_impl()
void SwHHCWrapper::ConvStart_impl( SwConversionArgs /* [out] */ *pConversionArgs, SvxSpellArea eArea )
{
- SetDrawObj( SVX_SPELL_OTHER == eArea );
+ SetDrawObj( SvxSpellArea::Other == eArea );
m_pView->SpellStart( eArea, m_bStartDone, m_bEndDone, /* [out] */ pConversionArgs );
}
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index dc2a33cc89ff..756c5c975613 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -59,7 +59,7 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw,
void SwHyphWrapper::SpellStart( SvxSpellArea eSpell )
{
- if( SVX_SPELL_OTHER == eSpell && nPageCount )
+ if( SvxSpellArea::Other == eSpell && nPageCount )
{
::EndProgress( pView->GetDocShell() );
nPageCount = 0;
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 0514637477d1..f9000619abca 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -278,13 +278,13 @@ void SwView::SpellStart( SvxSpellArea eWhich,
SwDocPositions eCurr = DOCPOS_CURR;
switch ( eWhich )
{
- case SVX_SPELL_BODY:
+ case SvxSpellArea::Body:
if( bIsWrapReverse )
eCurr = DOCPOS_END;
else
eCurr = DOCPOS_START;
break;
- case SVX_SPELL_BODY_END:
+ case SvxSpellArea::BodyEnd:
if( bIsWrapReverse )
{
if( bStartDone )
@@ -294,7 +294,7 @@ void SwView::SpellStart( SvxSpellArea eWhich,
else if( bStartDone )
eCurr = DOCPOS_START;
break;
- case SVX_SPELL_BODY_START:
+ case SvxSpellArea::BodyStart:
if( !bIsWrapReverse )
{
if( bEndDone )
@@ -304,7 +304,7 @@ void SwView::SpellStart( SvxSpellArea eWhich,
else if( bEndDone )
eCurr = DOCPOS_END;
break;
- case SVX_SPELL_OTHER:
+ case SvxSpellArea::Other:
if( bIsWrapReverse )
{
eStart = DOCPOS_OTHERSTART;
@@ -397,16 +397,16 @@ void SwView::HyphStart( SvxSpellArea eWhich )
{
switch ( eWhich )
{
- case SVX_SPELL_BODY:
+ case SvxSpellArea::Body:
m_pWrtShell->HyphStart( DOCPOS_START, DOCPOS_END );
break;
- case SVX_SPELL_BODY_END:
+ case SvxSpellArea::BodyEnd:
m_pWrtShell->HyphStart( DOCPOS_CURR, DOCPOS_END );
break;
- case SVX_SPELL_BODY_START:
+ case SvxSpellArea::BodyStart:
m_pWrtShell->HyphStart( DOCPOS_START, DOCPOS_CURR );
break;
- case SVX_SPELL_OTHER:
+ case SvxSpellArea::Other:
m_pWrtShell->HyphStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND );
break;
default: