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

9 files changed, 37 insertions, 37 deletions

diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 5b657c359368..4ac6708d24c7 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -558,7 +558,7 @@ namespace drawinglayer
 
                 // #i107346#
                 const SdrOutliner& rDrawTextOutliner = rText.GetModel()->GetDrawOutliner(&rTextObj);
-                const bool bWrongSpell(rDrawTextOutliner.GetControlWord() & EE_CNTRL_ONLINESPELLING);
+                const bool bWrongSpell(rDrawTextOutliner.GetControlWord() & EEControlBits::ONLINESPELLING);
 
                 return attribute::SdrTextAttribute(
                     rText,
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 5cf1ca1d34d8..f04c617b8a8b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -206,12 +206,12 @@ void SdrObjEditView::ModelHasChanged()
                     pTextEditOutliner->SetPaperSize(Size(0,0)); // re-format Outliner
                     if (!bContourFrame) {
                         pTextEditOutliner->ClearPolygon();
-                        sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
-                        nStat|=EE_CNTRL_AUTOPAGESIZE;
+                        EEControlBits nStat=pTextEditOutliner->GetControlWord();
+                        nStat|=EEControlBits::AUTOPAGESIZE;
                         pTextEditOutliner->SetControlWord(nStat);
                     } else {
-                        sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
-                        nStat&=~EE_CNTRL_AUTOPAGESIZE;
+                        EEControlBits nStat=pTextEditOutliner->GetControlWord();
+                        nStat&=~EEControlBits::AUTOPAGESIZE;
                         pTextEditOutliner->SetControlWord(nStat);
                         Rectangle aAnchorRect;
                         pTextObj->TakeTextAnchorRect(aAnchorRect);
@@ -323,7 +323,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
 {
     const SdrTextObj* pText = PTR_CAST(SdrTextObj,GetTextEditObject());
     bool bTextFrame(pText && pText->IsTextFrame());
-    bool bFitToSize(0 != (pTextEditOutliner->GetControlWord() & EE_CNTRL_STRETCHING));
+    bool bFitToSize(pTextEditOutliner->GetControlWord() & EEControlBits::STRETCHING);
     bool bModifyMerk(pTextEditOutliner->IsModified()); // #43095#
     Rectangle aBlankRect(rOutlView.GetOutputArea());
     aBlankRect.Union(aMinTextEditArea);
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index d769b5d4a5fd..a3826c74b85a 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2703,10 +2703,10 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
     TakeTextAnchorRect(aAnkRect);
     SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
     SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
-    sal_uIntPtr nStat0=rOutliner.GetControlWord();
+    EEControlBits nStat0=rOutliner.GetControlWord();
     Size aNullSize;
 
-    rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
+    rOutliner.SetControlWord(nStat0|EEControlBits::AUTOPAGESIZE);
     rOutliner.SetMinAutoPaperSize(aNullSize);
     sal_Int32 nMaxAutoPaperWidth = 1000000;
     sal_Int32 nMaxAutoPaperHeight= 1000000;
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0ce0b3957824..56d3ee61ee9d 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -714,11 +714,11 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
     bool bContourFrame=IsContourTextFrame();
 
     bool bFrame=IsTextFrame();
-    sal_uIntPtr nStat0=rOutliner.GetControlWord();
+    EEControlBits nStat0=rOutliner.GetControlWord();
     Size aNullSize;
     if (!bContourFrame)
     {
-        rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
+        rOutliner.SetControlWord(nStat0|EEControlBits::AUTOPAGESIZE);
         rOutliner.SetMinAutoPaperSize(aNullSize);
         rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
     }
@@ -1226,8 +1226,8 @@ void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
     rOutl.Init( nOutlinerMode );
 
     rOutl.SetGlobalCharStretching(100,100);
-    sal_uIntPtr nStat=rOutl.GetControlWord();
-    nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE);
+    EEControlBits nStat=rOutl.GetControlWord();
+    nStat &= ~EEControlBits(EEControlBits::STRETCHING|EEControlBits::AUTOPAGESIZE);
     rOutl.SetControlWord(nStat);
     Size aNullSize;
     Size aMaxSize(100000,100000);
@@ -1260,8 +1260,8 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool             bContourFrame,
         // FitToSize can't be used together with ContourFrame for now
         if (IsFitToSize() || IsAutoFit())
         {
-            sal_uIntPtr nStat=rOutliner.GetControlWord();
-            nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE;
+            EEControlBits nStat=rOutliner.GetControlWord();
+            nStat|=EEControlBits::STRETCHING|EEControlBits::AUTOPAGESIZE;
             rOutliner.SetControlWord(nStat);
         }
     }
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 2f1003a2d6b3..60302d260f40 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -746,13 +746,13 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
     SdrOutliner& rOutliner = ImpGetDrawOutliner();
     SdrTextVertAdjust eVAdj = GetTextVerticalAdjust(rTextItemSet);
     SdrTextHorzAdjust eHAdj = GetTextHorizontalAdjust(rTextItemSet);
-    const sal_uInt32 nOriginalControlWord(rOutliner.GetControlWord());
+    const EEControlBits nOriginalControlWord(rOutliner.GetControlWord());
     const Size aNullSize;
 
     // set visualizing page at Outliner; needed e.g. for PageNumberField decomposition
     rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage()));
 
-    rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE|EE_CNTRL_STRETCHING);
+    rOutliner.SetControlWord(nOriginalControlWord|EEControlBits::AUTOPAGESIZE|EEControlBits::STRETCHING);
     rOutliner.SetMinAutoPaperSize(aNullSize);
     rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
 
@@ -880,13 +880,13 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
     SdrOutliner& rOutliner = ImpGetDrawOutliner();
     SdrTextHorzAdjust eHAdj = rSdrBlockTextPrimitive.getSdrTextHorzAdjust();
     SdrTextVertAdjust eVAdj = rSdrBlockTextPrimitive.getSdrTextVertAdjust();
-    const sal_uInt32 nOriginalControlWord(rOutliner.GetControlWord());
+    const EEControlBits nOriginalControlWord(rOutliner.GetControlWord());
     const Size aNullSize;
 
     // set visualizing page at Outliner; needed e.g. for PageNumberField decomposition
     rOutliner.setVisualizedPage(GetSdrPageFromXDrawPage(aViewInformation.getVisualizedPage()));
     rOutliner.SetFixedCellHeight(rSdrBlockTextPrimitive.isFixedCellHeight());
-    rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_AUTOPAGESIZE);
+    rOutliner.SetControlWord(nOriginalControlWord|EEControlBits::AUTOPAGESIZE);
     rOutliner.SetMinAutoPaperSize(aNullSize);
     rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
 
@@ -1119,10 +1119,10 @@ void SdrTextObj::impDecomposeStretchTextPrimitive(
 
     // prepare outliner
     SdrOutliner& rOutliner = ImpGetDrawOutliner();
-    const sal_uInt32 nOriginalControlWord(rOutliner.GetControlWord());
+    const EEControlBits nOriginalControlWord(rOutliner.GetControlWord());
     const Size aNullSize;
 
-    rOutliner.SetControlWord(nOriginalControlWord|EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE);
+    rOutliner.SetControlWord(nOriginalControlWord|EEControlBits::STRETCHING|EEControlBits::AUTOPAGESIZE);
     rOutliner.SetFixedCellHeight(rSdrStretchTextPrimitive.isFixedCellHeight());
     rOutliner.SetMinAutoPaperSize(aNullSize);
     rOutliner.SetMaxAutoPaperSize(Size(1000000,1000000));
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 7ac1db737a29..b0b2ccce3e64 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -53,12 +53,12 @@ bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
     ImpSetTextEditParams();
 
     if (!bContourFrame) {
-        sal_uIntPtr nStat=rOutl.GetControlWord();
-        nStat|=EE_CNTRL_AUTOPAGESIZE;
+        EEControlBits nStat=rOutl.GetControlWord();
+        nStat|=EEControlBits::AUTOPAGESIZE;
         if (bFitToSize || IsAutoFit())
-            nStat|=EE_CNTRL_STRETCHING;
+            nStat|=EEControlBits::STRETCHING;
         else
-            nStat&=~EE_CNTRL_STRETCHING;
+            nStat&=~EEControlBits::STRETCHING;
         rOutl.SetControlWord(nStat);
     }
 
@@ -270,8 +270,8 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
 
     pEdtOutl = NULL;
     rOutl.Clear();
-    sal_uInt32 nStat = rOutl.GetControlWord();
-    nStat &= ~EE_CNTRL_AUTOPAGESIZE;
+    EEControlBits nStat = rOutl.GetControlWord();
+    nStat &= ~EEControlBits::AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
     mbInEditMode = false;
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 970f09b06510..e657a273b9a9 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -51,8 +51,8 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
 
         SetGlobalCharStretching(100,100);
 
-        sal_uIntPtr nStat = GetControlWord();
-        nStat &= ~( EE_CNTRL_STRETCHING | EE_CNTRL_AUTOPAGESIZE );
+        EEControlBits nStat = GetControlWord();
+        nStat &= ~EEControlBits( EEControlBits::STRETCHING | EEControlBits::AUTOPAGESIZE );
         SetControlWord(nStat);
 
         Size aNullSize;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index d9739ade8672..15016d4595e2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1438,9 +1438,9 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
 
     SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
 
-    sal_uIntPtr nStat0=rOutliner.GetControlWord();
+    EEControlBits nStat0=rOutliner.GetControlWord();
     Size aNullSize;
-    nStat0 |= EE_CNTRL_AUTOPAGESIZE;
+    nStat0 |= EEControlBits::AUTOPAGESIZE;
     rOutliner.SetControlWord(nStat0);
     rOutliner.SetMinAutoPaperSize(aNullSize);
     rOutliner.SetMaxAutoPaperSize(aAnkRect.GetSize());
@@ -1841,9 +1841,9 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
 
         if (bUpdMerk) rOutl.SetUpdateMode(true);
 
-    sal_uIntPtr nStat=rOutl.GetControlWord();
-    nStat   |= EE_CNTRL_AUTOPAGESIZE;
-    nStat   &=~EE_CNTRL_STRETCHING;
+    EEControlBits nStat=rOutl.GetControlWord();
+    nStat   |= EEControlBits::AUTOPAGESIZE;
+    nStat   &=~EEControlBits::STRETCHING;
     rOutl.SetControlWord(nStat);
 
     OutlinerParaObject* pPara = GetOutlinerParaObject();
@@ -1896,8 +1896,8 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
 
     pEdtOutl = 0;
     rOutl.Clear();
-    sal_uInt32 nStat = rOutl.GetControlWord();
-    nStat &= ~EE_CNTRL_AUTOPAGESIZE;
+    EEControlBits nStat = rOutl.GetControlWord();
+    nStat &= ~EEControlBits::AUTOPAGESIZE;
     rOutl.SetControlWord(nStat);
 
     mbInEditMode = false;
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 63a64e511779..7f2a32ba18be 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -633,8 +633,8 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
     rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor() );
 
     // #i102251#
-    const sal_uInt32 nOldCntrl(rOutl.GetControlWord());
-    sal_uInt32 nCntrl = nOldCntrl & ~EE_CNTRL_ONLINESPELLING;
+    const EEControlBits nOldCntrl(rOutl.GetControlWord());
+    EEControlBits nCntrl = nOldCntrl & ~EEControlBits::ONLINESPELLING;
     rOutl.SetControlWord(nCntrl);
 
     SdrObject* pTempBackgroundShape = 0;