summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-24 16:23:31 +0200
committerNoel Grandin <noel@peralex.com>2015-03-25 08:56:15 +0200
commitc7c0723dd97e278edeb7686d350ffe6d8706ed66 (patch)
treee8c9c9635ddca3ecec98ab05b109922ab7fab861 /sc
parentabf60c4a0fd111985891e2faa30a1e32799fdf9c (diff)
convert EV_CNTRL constants to enum class
Change-Id: I0ffc0e222c978ce7c734228f712e88422d3a615f
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/inputwin.cxx8
-rw-r--r--sc/source/ui/view/viewdata.cxx12
2 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 728e14e952ef..747ff2e69321 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1389,8 +1389,8 @@ void ScMultiTextWnd::InitEditEngine()
pEditView->SetInsertMode(bIsInsertMode);
// Text from Clipboard is taken over as ASCII in a single row
- sal_uLong n = pEditView->GetControlWord();
- pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE );
+ EVControlBits n = pEditView->GetControlWord();
+ pEditView->SetControlWord( n | EVControlBits::SINGLELINEPASTE );
pEditEngine->InsertView( pEditView, EE_APPEND );
@@ -1762,8 +1762,8 @@ void ScTextWnd::StartEditEngine()
pEditView->SetInsertMode(bIsInsertMode);
// The text from the Clipboard is taken over as ASCII in a single row
- sal_uLong n = pEditView->GetControlWord();
- pEditView->SetControlWord( n | EV_CNTRL_SINGLELINEPASTE );
+ EVControlBits n = pEditView->GetControlWord();
+ pEditView->SetControlWord( n | EVControlBits::SINGLELINEPASTE );
pEditEngine->InsertView( pEditView, EE_APPEND );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 5675d68e5720..5d7a93b9a355 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -945,8 +945,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
EEControlBits nEC = pNewEngine->GetControlWord();
pNewEngine->SetControlWord(nEC & ~EEControlBits::DOIDLEFORMAT);
- sal_uLong nVC = pEditView[eWhich]->GetControlWord();
- pEditView[eWhich]->SetControlWord(nVC & ~EV_CNTRL_AUTOSCROLL);
+ EVControlBits nVC = pEditView[eWhich]->GetControlWord();
+ pEditView[eWhich]->SetControlWord(nVC & ~EVControlBits::AUTOSCROLL);
bEditActive[eWhich] = true;
@@ -1315,8 +1315,8 @@ void ScViewData::EditGrowY( bool bInitial )
if ( !pCurView || !bEditActive[eWhich])
return;
- sal_uLong nControl = pEditView[eWhich]->GetControlWord();
- if ( nControl & EV_CNTRL_AUTOSCROLL )
+ EVControlBits nControl = pEditView[eWhich]->GetControlWord();
+ if ( nControl & EVControlBits::AUTOSCROLL )
{
// if end of screen had already been reached and scrolling enabled,
// don't further try to grow the edit area
@@ -1377,8 +1377,8 @@ void ScViewData::EditGrowY( bool bInitial )
if (nEditEndRow >= nBottom || bMaxReached)
{
- if ((nControl & EV_CNTRL_AUTOSCROLL) == 0)
- pCurView->SetControlWord( nControl | EV_CNTRL_AUTOSCROLL );
+ if (!(nControl & EVControlBits::AUTOSCROLL))
+ pCurView->SetControlWord( nControl | EVControlBits::AUTOSCROLL );
}
aArea.Top() = nOldBottom;