convert EE_CNTRL constants to enum class

there were a couple of lines in SC and SW where the code was using a
EV_CNTRL constant. I switched it to used the same-valued constant from
EE_CNTRL

Change-Id: I027183cc3b6e700bf365d48833e37eddc9b50f04

15 files changed, 67 insertions, 67 deletions

diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx
index 8732926dd272..e03870c274e5 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -349,8 +349,8 @@ void ScCellValue::assign( const ScCellValue& rOther, ScDocument& rDestDoc, int n
             ScFieldEditEngine& rEngine = rDestDoc.GetEditEngine();
             if (rOther.mpEditText->HasOnlineSpellErrors())
             {
-                sal_uLong nControl = rEngine.GetControlWord();
-                const sal_uLong nSpellControl = EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS;
+                EEControlBits nControl = rEngine.GetControlWord();
+                const EEControlBits nSpellControl = EEControlBits::ONLINESPELLING | EEControlBits::ALLOWBIGOBJS;
                 bool bNewControl = ((nControl & nSpellControl) != nSpellControl);
                 if (bNewControl)
                     rEngine.SetControlWord(nControl | nSpellControl);
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 53d7ccf57f22..9376685bcbda 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -353,11 +353,11 @@ long ScColumn::GetNeededSize(
 
         pEngine->SetUpdateMode( false );
         bool bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER );
-        sal_uLong nCtrl = pEngine->GetControlWord();
+        EEControlBits nCtrl = pEngine->GetControlWord();
         if ( bTextWysiwyg )
-            nCtrl |= EE_CNTRL_FORMAT100;
+            nCtrl |= EEControlBits::FORMAT100;
         else
-            nCtrl &= ~EE_CNTRL_FORMAT100;
+            nCtrl &= ~EEControlBits::FORMAT100;
         pEngine->SetControlWord( nCtrl );
         MapMode aOld = pDev->GetMapMode();
         pDev->SetMapMode( aHMMMode );
@@ -504,7 +504,7 @@ long ScColumn::GetNeededSize(
             if ( !bTextWysiwyg && ( rZoomY.GetNumerator() != 1 || rZoomY.GetDenominator() != 1 ) &&
                  ( pEngine->GetParagraphCount() > 1 || ( bBreak && pEngine->GetLineCount(0) > 1 ) ) )
             {
-                pEngine->SetControlWord( nCtrl | EE_CNTRL_FORMAT100 );
+                pEngine->SetControlWord( nCtrl | EEControlBits::FORMAT100 );
                 pEngine->QuickFormatDoc( true );
                 long nSecondValue = pDev->LogicToPixel(Size( 0, pEngine->GetTextHeight() ), aHMMMode).Height();
                 if ( nSecondValue > nValue )
@@ -1056,8 +1056,8 @@ public:
         if (!mpEngine)
         {
             mpEngine.reset(new ScFieldEditEngine(mpDoc, mpDoc->GetEditPool()));
-            //  EE_CNTRL_ONLINESPELLING if there are errors already
-            mpEngine->SetControlWord(mpEngine->GetControlWord() | EE_CNTRL_ONLINESPELLING);
+            //  EEControlBits::ONLINESPELLING if there are errors already
+            mpEngine->SetControlWord(mpEngine->GetControlWord() | EEControlBits::ONLINESPELLING);
             mpDoc->ApplyAsianEditSettings(*mpEngine);
         }
         mpEngine->SetText(*pObj);
@@ -1081,10 +1081,10 @@ public:
 
         if (bNeedObject)                                      // remains edit cell
         {
-            sal_uInt32 nCtrl = mpEngine->GetControlWord();
-            sal_uInt32 nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
-            if ( ( nCtrl & EE_CNTRL_ALLOWBIGOBJS ) != nWantBig )
-                mpEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
+            EEControlBits nCtrl = mpEngine->GetControlWord();
+            EEControlBits nWantBig = bSpellErrors ? EEControlBits::ALLOWBIGOBJS : EEControlBits::NONE;
+            if ( ( nCtrl & EEControlBits::ALLOWBIGOBJS ) != nWantBig )
+                mpEngine->SetControlWord( (nCtrl & ~EEControlBits::ALLOWBIGOBJS) | nWantBig );
 
             // Overwrite the existing object.
             delete pObj;
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index d2478a880d58..dce8dd7cd0ed 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -164,8 +164,8 @@ EditTextObject* ScEditUtil::Clone( const EditTextObject& rObj, ScDocument& rDest
     EditEngine& rEngine = rDestDoc.GetEditEngine();
     if (rObj.HasOnlineSpellErrors())
     {
-        sal_uLong nControl = rEngine.GetControlWord();
-        const sal_uLong nSpellControl = EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS;
+        EEControlBits nControl = rEngine.GetControlWord();
+        const EEControlBits nSpellControl = EEControlBits::ONLINESPELLING | EEControlBits::ALLOWBIGOBJS;
         bool bNewControl = ( (nControl & nSpellControl) != nSpellControl );
         if (bNewControl)
             rEngine.SetControlWord(nControl | nSpellControl);
@@ -709,7 +709,7 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern )
     rPattern.FillEditItemSet( pEditDefaults );
     SetDefaults( pEditDefaults );
     // wir haben keine StyleSheets fuer Text
-    SetControlWord( GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS );
+    SetControlWord( GetControlWord() & ~EEControlBits::RTFSTYLESHEETS );
 }
 
 //      Feldbefehle fuer Kopf- und Fusszeilen
@@ -850,7 +850,7 @@ ScFieldEditEngine::ScFieldEditEngine(
 {
     if ( pTextObjectPool )
         SetEditTextObjectPool( pTextObjectPool );
-    SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS );
+    SetControlWord( EEControlBits(GetControlWord() | EEControlBits::MARKFIELDS) & ~EEControlBits::RTFSTYLESHEETS );
 }
 
 OUString ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
@@ -882,7 +882,7 @@ ScNoteEditEngine::ScNoteEditEngine( SfxItemPool* pEnginePoolP,
 {
     if ( pTextObjectPool )
         SetEditTextObjectPool( pTextObjectPool );
-    SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS );
+    SetControlWord( EEControlBits(GetControlWord() | EEControlBits::MARKFIELDS) & ~EEControlBits::RTFSTYLESHEETS );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 7375719c77d7..c3ea29bafff8 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -352,7 +352,7 @@ ScEditEngineDefaulter& XclRoot::GetEditEngine() const
         rEE.SetEditTextObjectPool( GetDoc().GetEditPool() );
         rEE.SetUpdateMode( false );
         rEE.EnableUndo( false );
-        rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
+        rEE.SetControlWord( rEE.GetControlWord() & ~EEControlBits::ALLOWBIGOBJS );
     }
     return *mrData.mxEditEngine;
 }
@@ -366,7 +366,7 @@ ScHeaderEditEngine& XclRoot::GetHFEditEngine() const
         rEE.SetRefMapMode( MAP_TWIP );  // headers/footers use twips as default metric
         rEE.SetUpdateMode( false );
         rEE.EnableUndo( false );
-        rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
+        rEE.SetControlWord( rEE.GetControlWord() & ~EEControlBits::ALLOWBIGOBJS );
 
         // set Calc header/footer defaults
         SfxItemSet* pEditSet = new SfxItemSet( rEE.GetEmptyItemSet() );
@@ -390,7 +390,7 @@ EditEngine& XclRoot::GetDrawEditEngine() const
         rEE.SetRefMapMode( MAP_100TH_MM );
         rEE.SetUpdateMode( false );
         rEE.EnableUndo( false );
-        rEE.SetControlWord( rEE.GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
+        rEE.SetControlWord( rEE.GetControlWord() & ~EEControlBits::ALLOWBIGOBJS );
     }
     return *mrData.mxDrawEditEng;
 }
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 1b77eeca9779..05a409c4359c 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -577,7 +577,7 @@ void WorkbookGlobals::initialize( bool bWorkbookFile )
     mxEditEngine->SetEditTextObjectPool( rDoc.GetEditPool() );
     mxEditEngine->SetUpdateMode( false );
     mxEditEngine->EnableUndo( false );
-    mxEditEngine->SetControlWord( mxEditEngine->GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS );
+    mxEditEngine->SetControlWord( mxEditEngine->GetControlWord() & ~EEControlBits::ALLOWBIGOBJS );
 
     // set some document properties needed during import
     if( mrBaseFilter.isImportFilter() )
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 25dd3dba6704..921b105e64b5 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3418,7 +3418,7 @@ ScEditEngineDefaulter* ScXMLImport::GetEditEngine()
         mpEditEngine->SetEditTextObjectPool(pDoc->GetEditPool());
         mpEditEngine->SetUpdateMode(false);
         mpEditEngine->EnableUndo(false);
-        mpEditEngine->SetControlWord(mpEditEngine->GetControlWord() & ~EE_CNTRL_ALLOWBIGOBJS);
+        mpEditEngine->SetControlWord(mpEditEngine->GetControlWord() & ~EEControlBits::ALLOWBIGOBJS);
     }
     return mpEditEngine.get();
 }
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 74c6222d11a9..d394c604b6e2 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -594,11 +594,11 @@ void ScInputHandler::UpdateRefDevice()
 
     bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
     bool bInPlace = pActiveViewSh && pActiveViewSh->GetViewFrame()->GetFrame().IsInPlace();
-    sal_uLong nCtrl = pEngine->GetControlWord();
+    EEControlBits nCtrl = pEngine->GetControlWord();
     if ( bTextWysiwyg || bInPlace )
-        nCtrl |= EE_CNTRL_FORMAT100;    // EditEngine default: always format for 100%
+        nCtrl |= EEControlBits::FORMAT100;    // EditEngine default: always format for 100%
     else
-        nCtrl &= ~EE_CNTRL_FORMAT100;   // when formatting for screen, use the actual MapMode
+        nCtrl &= ~EEControlBits::FORMAT100;   // when formatting for screen, use the actual MapMode
     pEngine->SetControlWord( nCtrl );
     if ( bTextWysiwyg && pActiveViewSh )
         pEngine->SetRefDevice( pActiveViewSh->GetViewData().GetDocument()->GetPrinter() );
@@ -632,7 +632,7 @@ void ScInputHandler::ImplCreateEditEngine()
         pEngine->SetPaperSize( Size( 1000000, 1000000 ) );
         pEditDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() );
 
-        pEngine->SetControlWord( pEngine->GetControlWord() | EE_CNTRL_AUTOCORRECT );
+        pEngine->SetControlWord( pEngine->GetControlWord() | EEControlBits::AUTOCORRECT );
         pEngine->SetModifyHdl( LINK( this, ScInputHandler, ModifyHdl ) );
     }
 
@@ -648,15 +648,15 @@ void ScInputHandler::ImplCreateEditEngine()
 
 void ScInputHandler::UpdateAutoCorrFlag()
 {
-    sal_uLong nCntrl = pEngine->GetControlWord();
-    sal_uLong nOld = nCntrl;
+    EEControlBits nCntrl = pEngine->GetControlWord();
+    EEControlBits nOld = nCntrl;
 
     // Don't use pLastPattern here (may be invalid because of AutoStyle)
     bool bDisable = bLastIsSymbol || bFormulaMode;
     if ( bDisable )
-        nCntrl &= ~EE_CNTRL_AUTOCORRECT;
+        nCntrl &= ~EEControlBits::AUTOCORRECT;
     else
-        nCntrl |= EE_CNTRL_AUTOCORRECT;
+        nCntrl |= EEControlBits::AUTOCORRECT;
 
     if ( nCntrl != nOld )
         pEngine->SetControlWord(nCntrl);
@@ -680,17 +680,17 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab )
 
         if ( bFromStartTab || eMode != SC_INPUT_NONE )
         {
-            sal_uLong nCntrl = pEngine->GetControlWord();
-            sal_uLong nOld = nCntrl;
+            EEControlBits nCntrl = pEngine->GetControlWord();
+            EEControlBits nOld = nCntrl;
             if( bOnlineSpell )
-                nCntrl |= EE_CNTRL_ONLINESPELLING;
+                nCntrl |= EEControlBits::ONLINESPELLING;
             else
-                nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+                nCntrl &= ~EEControlBits::ONLINESPELLING;
             // No AutoCorrect for Symbol Font (EditEngine does no evaluate Default)
             if ( pLastPattern && pLastPattern->IsSymbolFont() )
-                nCntrl &= ~EE_CNTRL_AUTOCORRECT;
+                nCntrl &= ~EEControlBits::AUTOCORRECT;
             else
-                nCntrl |= EE_CNTRL_AUTOCORRECT;
+                nCntrl |= EEControlBits::AUTOCORRECT;
             if ( nCntrl != nOld )
                 pEngine->SetControlWord(nCntrl);
 
@@ -3512,9 +3512,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                     //  Online spelling is turned back on in StartTable, after setting
                     //  the right language from cell attributes.
 
-                    sal_uLong nCntrl = pEngine->GetControlWord();
-                    if ( nCntrl & EE_CNTRL_ONLINESPELLING )
-                        pEngine->SetControlWord( nCntrl & ~EE_CNTRL_ONLINESPELLING );
+                    EEControlBits nCntrl = pEngine->GetControlWord();
+                    if ( nCntrl & EEControlBits::ONLINESPELLING )
+                        pEngine->SetControlWord( nCntrl & ~EEControlBits::ONLINESPELLING );
 
                     bModified = false;
                     bSelIsRef = false;
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index fb5abdfa215a..728e14e952ef 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1691,12 +1691,12 @@ void ScTextWnd::UpdateAutoCorrFlag()
 {
     if ( pEditEngine )
     {
-        sal_uLong nControl = pEditEngine->GetControlWord();
-        sal_uLong nOld = nControl;
+        EEControlBits nControl = pEditEngine->GetControlWord();
+        EEControlBits nOld = nControl;
         if ( bFormulaMode )
-            nControl &= ~EE_CNTRL_AUTOCORRECT; // No AutoCorrect in Formulas
+            nControl &= ~EEControlBits::AUTOCORRECT; // No AutoCorrect in Formulas
         else
-            nControl |= EE_CNTRL_AUTOCORRECT; // Else do enable it
+            nControl |= EEControlBits::AUTOCORRECT; // Else do enable it
 
         if ( nControl != nOld )
             pEditEngine->SetControlWord( nControl );
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index c0f3166be1cd..8f0a1b4a578b 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -94,7 +94,7 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits nBits, ScEditWindowLoc
 
         //  Feldbefehle:
     pEdEngine->SetData( aData );
-    pEdEngine->SetControlWord( pEdEngine->GetControlWord() | EE_CNTRL_MARKFIELDS );
+    pEdEngine->SetControlWord( pEdEngine->GetControlWord() | EEControlBits::MARKFIELDS );
     mbRTL = ScGlobal::IsSystemRTL();
     if (mbRTL)
         pEdEngine->SetDefaultHorizontalTextDirection(EE_HTEXTDIR_R2L);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3bbe8b8f6503..9881145b3a71 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5369,7 +5369,7 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow
     if (!aLogicEdit.IsInside(aLogicClick))
         return false;
 
-    pEngine->SetControlWord(pEngine->GetControlWord() | EE_CNTRL_ONLINESPELLING);
+    pEngine->SetControlWord(pEngine->GetControlWord() | EEControlBits::ONLINESPELLING);
     pEngine->SetAllMisspellRanges(*pRanges);
 
     EditView aTempView(pEngine.get(), this);
@@ -5536,7 +5536,7 @@ bool ScGridWindow::ContinueOnlineSpelling()
                 //  because MapMode must be set for some old documents
                 pEngine.reset(new ScTabEditEngine(pDoc));
                 pEngine->SetControlWord(
-                    pEngine->GetControlWord() | (EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS));
+                    pEngine->GetControlWord() | (EEControlBits::ONLINESPELLING | EEControlBits::ALLOWBIGOBJS));
                 pEngine->SetStatusEventHdl(LINK(&aStatus, SpellCheckStatus, EventHdl));
                 //  Delimiters hier wie in inputhdl.cxx !!!
                 pEngine->SetWordDelimiters(
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 6a6c13dd3f47..9391e4947f18 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2095,13 +2095,13 @@ ScFieldEditEngine* ScOutputData::CreateOutputEditEngine()
     pEngine->SetUpdateMode( false );
     // a RefDevice always has to be set, otherwise EditEngine would create a VirtualDevice
     pEngine->SetRefDevice( pFmtDevice );
-    sal_uLong nCtrl = pEngine->GetControlWord();
+    EEControlBits nCtrl = pEngine->GetControlWord();
     if ( bShowSpellErrors )
-        nCtrl |= EE_CNTRL_ONLINESPELLING;
+        nCtrl |= EEControlBits::ONLINESPELLING;
     if ( eType == OUTTYPE_PRINTER )
-        nCtrl &= ~EE_CNTRL_MARKFIELDS;
+        nCtrl &= ~EEControlBits::MARKFIELDS;
     if ( eType == OUTTYPE_WINDOW && mpRefDevice == pFmtDevice )
-        nCtrl &= ~EE_CNTRL_FORMAT100;       // use the actual MapMode
+        nCtrl &= ~EEControlBits::FORMAT100;       // use the actual MapMode
     pEngine->SetControlWord( nCtrl );
     mpDoc->ApplyAsianEditSettings( *pEngine );
     pEngine->EnableAutoColor( mbUseStyleColor );
@@ -2405,11 +2405,11 @@ void ScOutputData::DrawEditParam::setPatternToEngine(bool bUseStyleColor)
     mpOldCondSet = mpCondSet;
     mpOldPreviewFontSet = mpPreviewFontSet;
 
-    sal_uLong nControl = mpEngine->GetControlWord();
+    EEControlBits nControl = mpEngine->GetControlWord();
     if (meOrient == SVX_ORIENTATION_STACKED)
-        nControl |= EE_CNTRL_ONECHARPERLINE;
+        nControl |= EEControlBits::ONECHARPERLINE;
     else
-        nControl &= ~EE_CNTRL_ONECHARPERLINE;
+        nControl &= ~EEControlBits::ONECHARPERLINE;
     mpEngine->SetControlWord( nControl );
 
     if ( !mbHyphenatorSet && static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() )
@@ -3764,7 +3764,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam)
 
     if ( rParam.mbAsianVertical )
     {
-        // in asian mode, use EditEngine::SetVertical instead of EE_CNTRL_ONECHARPERLINE
+        // in asian mode, use EditEngine::SetVertical instead of EEControlBits::ONECHARPERLINE
         rParam.meOrient = SVX_ORIENTATION_STANDARD;
         DrawEditAsianVertical(rParam);
         return;
@@ -4764,11 +4764,11 @@ void ScOutputData::DrawRotated(bool bPixelToLogic)
                                 pOldPattern = pPattern;
                                 pOldCondSet = pCondSet;
 
-                                sal_uLong nControl = pEngine->GetControlWord();
+                                EEControlBits nControl = pEngine->GetControlWord();
                                 if (eOrient==SVX_ORIENTATION_STACKED)
-                                    nControl |= EE_CNTRL_ONECHARPERLINE;
+                                    nControl |= EEControlBits::ONECHARPERLINE;
                                 else
-                                    nControl &= ~EE_CNTRL_ONECHARPERLINE;
+                                    nControl &= ~EEControlBits::ONECHARPERLINE;
                                 pEngine->SetControlWord( nControl );
 
                                 if ( !bHyphenatorSet && static_cast<const SfxBoolItem&>(pSet->Get(EE_PARA_HYPHENATE)).GetValue() )
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index cf4d8e8fa5f7..095ef36fe5a6 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1676,7 +1676,7 @@ void ScPrintFunc::MakeEditEngine()
         pEditEngine->SetRefDevice(pPrinter ? pPrinter : pDoc->GetRefDevice());
         pEditEngine->SetWordDelimiters(
                 ScEditUtil::ModifyDelimiters( pEditEngine->GetWordDelimiters() ) );
-        pEditEngine->SetControlWord( pEditEngine->GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS );
+        pEditEngine->SetControlWord( pEditEngine->GetControlWord() & ~EEControlBits::RTFSTYLESHEETS );
         pDoc->ApplyAsianEditSettings( *pEditEngine );
         pEditEngine->EnableAutoColor( bUseStyleColor );
 
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index b3f75e402cb3..359876bcb9fe 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -251,7 +251,7 @@ void ScSpellDialogChildWindow::Init()
     mpViewData->SetSpellingView( pEditView );
     Rectangle aRect( Point( 0, 0 ), Point( 0, 0 ) );
     pEditView->SetOutputArea( aRect );
-    mxEngine->SetControlWord( EE_CNTRL_USECHARATTRIBS );
+    mxEngine->SetControlWord( EEControlBits::USECHARATTRIBS );
     mxEngine->EnableUndo( false );
     mxEngine->SetPaperSize( aRect.GetSize() );
     mxEngine->SetText( EMPTY_OUSTRING );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index db824d56a1cd..5675d68e5720 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -942,8 +942,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
 
     //  bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576)
 
-    sal_uLong nEC = pNewEngine->GetControlWord();
-    pNewEngine->SetControlWord(nEC & ~EE_CNTRL_DOIDLEFORMAT);
+    EEControlBits nEC = pNewEngine->GetControlWord();
+    pNewEngine->SetControlWord(nEC & ~EEControlBits::DOIDLEFORMAT);
 
     sal_uLong nVC = pEditView[eWhich]->GetControlWord();
     pEditView[eWhich]->SetControlWord(nVC & ~EV_CNTRL_AUTOSCROLL);
@@ -3013,13 +3013,13 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const
     ScDocument* pLocalDoc = GetDocument();
     bool bOnlineSpell = pLocalDoc->GetDocOptions().IsAutoSpell();
 
-    sal_uLong nCntrl = rOutl.GetControlWord();
-    nCntrl |= EE_CNTRL_MARKFIELDS;
-    nCntrl |= EE_CNTRL_AUTOCORRECT;
+    EEControlBits nCntrl = rOutl.GetControlWord();
+    nCntrl |= EEControlBits::MARKFIELDS;
+    nCntrl |= EEControlBits::AUTOCORRECT;
     if( bOnlineSpell )
-        nCntrl |= EE_CNTRL_ONLINESPELLING;
+        nCntrl |= EEControlBits::ONLINESPELLING;
     else
-        nCntrl &= ~EE_CNTRL_ONLINESPELLING;
+        nCntrl &= ~EEControlBits::ONLINESPELLING;
     rOutl.SetControlWord(nCntrl);
 
     rOutl.SetCalcFieldValueHdl( LINK( SC_MOD(), ScModule, CalcFieldValueHdl ) );
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index f9d054cfb8f0..0317fa4d7201 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -518,7 +518,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, bool bR
     rViewData.SetSpellingView( pEditView );
     Rectangle aRect( Point( 0, 0 ), Point( 0, 0 ) );
     pEditView->SetOutputArea( aRect );
-    pEngine->SetControlWord( EE_CNTRL_USECHARATTRIBS );
+    pEngine->SetControlWord( EEControlBits::USECHARATTRIBS );
     pEngine->EnableUndo( false );
     pEngine->SetPaperSize( aRect.GetSize() );
     pEngine->SetText( EMPTY_OUSTRING );