convert EnumContext::Context to scoped enum

Change-Id: I16ec63beb801073e5d604d852892c2fd6e8d8fc3
Reviewed-on: https://gerrit.libreoffice.org/32272
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 177 insertions, 177 deletions

diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx
index d77c903ad0ea..7ee232f22528 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -32,12 +32,12 @@ namespace svx { namespace sidebar {
 
 EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMarkList& rMarkList)
 {
-    EnumContext::Context eContext = EnumContext::Context_Unknown;
+    EnumContext::Context eContext = EnumContext::Context::Unknown;
 
     switch (rMarkList.GetMarkCount())
     {
         case 0:
-            // Empty selection.  Return Context_Unknown to let the caller
+            // Empty selection.  Return Context::Unknown to let the caller
             // substitute it with the default context.
             break;
 
@@ -46,7 +46,7 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark
             SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
             if ( dynamic_cast<const SdrTextObj*>( pObj) != nullptr && static_cast<SdrTextObj*>(pObj)->IsInEditMode() )
             {
-                eContext = EnumContext::Context_DrawText;
+                eContext = EnumContext::Context::DrawText;
             }
             else
             {
@@ -55,7 +55,7 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark
                 if (nInv == SdrInventor::Default)
                     eContext = GetContextForObjectId_SC(nObjId);
                 else if (nInv == SdrInventor::FmForm)
-                    eContext = EnumContext::Context_Form;
+                    eContext = EnumContext::Context::Form;
             }
             break;
         }
@@ -69,18 +69,18 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SC (const SdrMark
                 {
                     const sal_uInt16 nObjId (GetObjectTypeFromMark(rMarkList));
                     if (nObjId == 0)
-                        eContext = EnumContext::Context_MultiObject;
+                        eContext = EnumContext::Context::MultiObject;
                     else
                         eContext = GetContextForObjectId_SC(nObjId);
                     break;
                 }
 
                 case SdrInventor::FmForm:
-                    eContext = EnumContext::Context_Form;
+                    eContext = EnumContext::Context::Form;
                     break;
 
                 case SdrInventor::Unknown:
-                    eContext = EnumContext::Context_MultiObject;
+                    eContext = EnumContext::Context::MultiObject;
                     break;
 
                 default: break;
@@ -96,7 +96,7 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD (
     const SdrMarkList& rMarkList,
     const ViewType eViewType)
 {
-    EnumContext::Context eContext = EnumContext::Context_Unknown;
+    EnumContext::Context eContext = EnumContext::Context::Unknown;
 
     // Note that some cases are handled by the caller.  They rely on
     // sd specific data.
@@ -106,19 +106,19 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD (
             switch(eViewType)
             {
                 case ViewType::Standard:
-                    eContext = EnumContext::Context_DrawPage;
+                    eContext = EnumContext::Context::DrawPage;
                     break;
                 case ViewType::Master:
-                    eContext = EnumContext::Context_MasterPage;
+                    eContext = EnumContext::Context::MasterPage;
                     break;
                 case ViewType::Handout:
-                    eContext = EnumContext::Context_HandoutPage;
+                    eContext = EnumContext::Context::HandoutPage;
                     break;
                 case ViewType::Notes:
-                    eContext = EnumContext::Context_NotesPage;
+                    eContext = EnumContext::Context::NotesPage;
                     break;
                 case ViewType::Outline:
-                    eContext = EnumContext::Context_OutlineText;
+                    eContext = EnumContext::Context::OutlineText;
                     break;
             }
             break;
@@ -133,10 +133,10 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD (
                     // Let a table object take precedence over text
                     // edit mode.  The panels for text editing are
                     // present for table context as well, anyway.
-                    eContext = EnumContext::Context_Table;
+                    eContext = EnumContext::Context::Table;
                 }
                 else
-                    eContext = EnumContext::Context_DrawText;
+                    eContext = EnumContext::Context::DrawText;
             }
             else
             {
@@ -154,11 +154,11 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD (
                 }
                 else if (nInv == SdrInventor::E3d)
                 {
-                    eContext = EnumContext::Context_3DObject;
+                    eContext = EnumContext::Context::ThreeDObject;
                 }
                 else if (nInv == SdrInventor::FmForm)
                 {
-                    eContext = EnumContext::Context_Form;
+                    eContext = EnumContext::Context::Form;
                 }
             }
             break;
@@ -172,22 +172,22 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD (
                 {
                     const sal_uInt16 nObjId = GetObjectTypeFromMark(rMarkList);
                     if (nObjId == 0)
-                        eContext = EnumContext::Context_MultiObject;
+                        eContext = EnumContext::Context::MultiObject;
                     else
                         eContext = GetContextForObjectId_SD(nObjId, eViewType);
                     break;
                 }
 
                 case SdrInventor::E3d:
-                    eContext = EnumContext::Context_3DObject;
+                    eContext = EnumContext::Context::ThreeDObject;
                     break;
 
                 case SdrInventor::FmForm:
-                    eContext = EnumContext::Context_Form;
+                    eContext = EnumContext::Context::Form;
                     break;
 
                 case SdrInventor::Unknown:
-                    eContext = EnumContext::Context_MultiObject;
+                    eContext = EnumContext::Context::MultiObject;
                     break;
 
                 default: break;
@@ -220,27 +220,27 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt
         case OBJ_CCUT:
         case OBJ_CUSTOMSHAPE:
         case OBJ_GRUP:
-            return EnumContext::Context_Draw;
+            return EnumContext::Context::Draw;
 
         case OBJ_PLIN:
         case OBJ_PATHLINE:
         case OBJ_FREELINE:
         case OBJ_LINE:
         case OBJ_EDGE:
-            return EnumContext::Context_DrawLine;
+            return EnumContext::Context::DrawLine;
 
         case OBJ_GRAF:
-            return EnumContext::Context_Graphic;
+            return EnumContext::Context::Graphic;
 
         case OBJ_OLE2:
-            return EnumContext::Context_OLE;
+            return EnumContext::Context::OLE;
 
         case OBJ_MEDIA:
-            return EnumContext::Context_Media;
+            return EnumContext::Context::Media;
             break;
 
         default:
-            return EnumContext::Context_Unknown;
+            return EnumContext::Context::Unknown;
     }
 }
 
@@ -263,48 +263,48 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD (
         case OBJ_CCUT:
         case OBJ_CUSTOMSHAPE:
         case OBJ_GRUP:
-            return EnumContext::Context_Draw;
+            return EnumContext::Context::Draw;
 
         case OBJ_EDGE:
         case OBJ_PATHLINE:
         case OBJ_FREELINE:
         case OBJ_PLIN:
         case OBJ_LINE:
-            return EnumContext::Context_DrawLine;
+            return EnumContext::Context::DrawLine;
 
         case OBJ_TITLETEXT:
         case OBJ_OUTLINETEXT:
         case OBJ_TEXT:
         case OBJ_TEXTEXT:
-            return EnumContext::Context_TextObject;
+            return EnumContext::Context::TextObject;
 
         case OBJ_GRAF:
-            return EnumContext::Context_Graphic;
+            return EnumContext::Context::Graphic;
 
         case OBJ_OLE2:
-            return EnumContext::Context_OLE;
+            return EnumContext::Context::OLE;
 
         case OBJ_MEDIA:
-            return EnumContext::Context_Media;
+            return EnumContext::Context::Media;
 
         case OBJ_TABLE:
-            return EnumContext::Context_Table;
+            return EnumContext::Context::Table;
 
         case OBJ_PAGE:
             switch (eViewType)
             {
                 case ViewType::Handout:
-                    return EnumContext::Context_HandoutPage;
+                    return EnumContext::Context::HandoutPage;
                 case ViewType::Notes:
-                    return EnumContext::Context_NotesPage;
+                    return EnumContext::Context::NotesPage;
                 case ViewType::Outline:
-                    return EnumContext::Context_OutlineText;
+                    return EnumContext::Context::OutlineText;
                 default:
-                    return EnumContext::Context_Unknown;
+                    return EnumContext::Context::Unknown;
             }
 
         default:
-            return EnumContext::Context_Unknown;
+            return EnumContext::Context::Unknown;
     }
 }
 
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index 76430afbd6b0..e00a015d34b2 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -57,7 +57,7 @@ void SAL_CALL SelectionChangeHandler::selectionChanged (const lang::EventObject&
             vcl::EnumContext::GetContextEnum(maSelectionChangeCallback()));
         ContextChangeEventMultiplexer::NotifyContextChange(
             mxController,
-            eContext==vcl::EnumContext::Context_Unknown
+            eContext==vcl::EnumContext::Context::Unknown
                 ? meDefaultContext
                 : eContext);
     }
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index e3f26039ff7d..85bb09bf8083 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -188,9 +188,9 @@ void LinePropertyPanel::HandleContextChange(
 
     switch(maContext.GetCombinedContext_DI())
     {
-        case CombinedEnumContext(Application::Calc, Context_DrawLine):
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawLine):
-        case CombinedEnumContext(Application::WriterVariants, Context_Draw):
+        case CombinedEnumContext(Application::Calc, Context::DrawLine):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawLine):
+        case CombinedEnumContext(Application::WriterVariants, Context::Draw):
             // TODO : Implement DrawLine context in Writer
             bShowArrows = true;
             break;
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 3ee1dd4e50a3..73099ed8509b 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -213,14 +213,14 @@ void ParaLineSpacingControl::Initialize()
     {
         switch (currentContext.GetCombinedContext_DI())
         {
-        case CombinedEnumContext(Application::DrawImpress, Context_Table):
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-        case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-        case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
-        case CombinedEnumContext(Application::Calc, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
+        case CombinedEnumContext(Application::DrawImpress, Context::Table):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+        case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+        case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
+        case CombinedEnumContext(Application::Calc, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
             {
                 mpLineDist->RemoveEntry(LLINESPACE_FIX);
             }
@@ -230,9 +230,9 @@ void ParaLineSpacingControl::Initialize()
     {
         switch (currentContext.GetCombinedContext_DI())
         {
-            case CombinedEnumContext(Application::WriterVariants, Context_Default):
-            case CombinedEnumContext(Application::WriterVariants, Context_Text):
-            case CombinedEnumContext(Application::WriterVariants, Context_Table):
+            case CombinedEnumContext(Application::WriterVariants, Context::Default):
+            case CombinedEnumContext(Application::WriterVariants, Context::Text):
+            case CombinedEnumContext(Application::WriterVariants, Context::Table):
             {
                 mpLineDist->InsertEntry(OUString("Fixed"), LLINESPACE_FIX);
             }
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 13e96ce3404c..3ece38aa122a 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -82,52 +82,52 @@ void ParaPropertyPanel::HandleContextChange (
     maContext = rContext;
     switch (maContext.GetCombinedContext_DI())
     {
-        case CombinedEnumContext(Application::Calc, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
+        case CombinedEnumContext(Application::Calc, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
             mpTBxVertAlign->Show();
             mpTBxBackColor->Hide();
             mpTBxNumBullet->Hide();
             ReSize(false);
             break;
 
-        case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-        case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-        case CombinedEnumContext(Application::DrawImpress, Context_Table):
+        case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+        case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+        case CombinedEnumContext(Application::DrawImpress, Context::Table):
             mpTBxVertAlign->Show();
             mpTBxBackColor->Hide();
             mpTBxNumBullet->Show();
             ReSize(true);
             break;
 
-        case CombinedEnumContext(Application::WriterVariants, Context_Default):
-        case CombinedEnumContext(Application::WriterVariants, Context_Text):
+        case CombinedEnumContext(Application::WriterVariants, Context::Default):
+        case CombinedEnumContext(Application::WriterVariants, Context::Text):
             mpTBxVertAlign->Hide();
             mpTBxBackColor->Show();
             mpTBxNumBullet->Show();
             ReSize(true);
             break;
 
-        case CombinedEnumContext(Application::WriterVariants, Context_Table):
+        case CombinedEnumContext(Application::WriterVariants, Context::Table):
             mpTBxVertAlign->Show();
             mpTBxBackColor->Show();
             mpTBxNumBullet->Show();
             ReSize(true);
             break;
 
-        case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
+        case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
             mpTBxVertAlign->Hide();
             mpTBxBackColor->Hide();
             mpTBxNumBullet->Hide();
             ReSize(false);
             break;
 
-        case CombinedEnumContext(Application::Calc, Context_EditCell):
-        case CombinedEnumContext(Application::Calc, Context_Cell):
-        case CombinedEnumContext(Application::Calc, Context_Pivot):
-        case CombinedEnumContext(Application::DrawImpress, Context_Text):
-        case CombinedEnumContext(Application::DrawImpress, Context_OutlineText):
+        case CombinedEnumContext(Application::Calc, Context::EditCell):
+        case CombinedEnumContext(Application::Calc, Context::Cell):
+        case CombinedEnumContext(Application::Calc, Context::Pivot):
+        case CombinedEnumContext(Application::DrawImpress, Context::Text):
+        case CombinedEnumContext(Application::DrawImpress, Context::OutlineText):
             break;
 
         default:
@@ -199,9 +199,9 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, v
         {
             switch (maContext.GetCombinedContext_DI())
             {
-            case CombinedEnumContext(Application::WriterVariants, Context_Default):
-            case CombinedEnumContext(Application::WriterVariants, Context_Text):
-            case CombinedEnumContext(Application::WriterVariants, Context_Table):
+            case CombinedEnumContext(Application::WriterVariants, Context::Default):
+            case CombinedEnumContext(Application::WriterVariants, Context::Text):
+            case CombinedEnumContext(Application::WriterVariants, Context::Table):
                 {
                     SfxBoolItem aMargin( SID_INC_INDENT, true );
                     GetBindings()->GetDispatcher()->ExecuteList(
@@ -228,9 +228,9 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, v
         {
             switch (maContext.GetCombinedContext_DI())
             {
-            case CombinedEnumContext(Application::WriterVariants, Context_Default):
-            case CombinedEnumContext(Application::WriterVariants, Context_Text):
-            case CombinedEnumContext(Application::WriterVariants, Context_Table):
+            case CombinedEnumContext(Application::WriterVariants, Context::Default):
+            case CombinedEnumContext(Application::WriterVariants, Context::Text):
+            case CombinedEnumContext(Application::WriterVariants, Context::Table):
                 {
                     SfxBoolItem aMargin( SID_DEC_INDENT, true );
                     GetBindings()->GetDispatcher()->ExecuteList(
@@ -327,23 +327,23 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
     switch (maContext.GetCombinedContext_DI())
     {
 
-    case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
-    case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
-    case CombinedEnumContext(Application::Calc, Context_DrawText):
-    case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-    case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-    case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-    case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
-    case CombinedEnumContext(Application::DrawImpress, Context_Table):
+    case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
+    case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
+    case CombinedEnumContext(Application::Calc, Context::DrawText):
+    case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+    case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+    case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+    case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
+    case CombinedEnumContext(Application::DrawImpress, Context::Table):
         {
             mpLeftIndent->SetMin( DEFAULT_VALUE );
             mpRightIndent->SetMin( DEFAULT_VALUE );
             mpFLineIndent->SetMin( DEFAULT_VALUE );
         }
         break;
-    case CombinedEnumContext(Application::WriterVariants, Context_Default):
-    case CombinedEnumContext(Application::WriterVariants, Context_Text):
-    case CombinedEnumContext(Application::WriterVariants, Context_Table):
+    case CombinedEnumContext(Application::WriterVariants, Context::Default):
+    case CombinedEnumContext(Application::WriterVariants, Context::Text):
+    case CombinedEnumContext(Application::WriterVariants, Context::Table):
         {
             mpLeftIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
             mpRightIndent->SetMin( NEGA_MAXVALUE, FUNIT_100TH_MM );
@@ -371,9 +371,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         long nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(MapUnit::MapTwip), MapUnit::Map100thMM );
         nVal = (long)mpLeftIndent->Normalize( (long)nVal );
 
-        if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text)
-             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default)
-             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table))
+        if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Text)
+             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default)
+             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Table))
         {
             mpFLineIndent->SetMin( nVal*(-1), FUNIT_100TH_MM );
         }
@@ -383,22 +383,22 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
 
         switch (maContext.GetCombinedContext_DI())
         {
-        case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_Text):
-        case CombinedEnumContext(Application::WriterVariants, Context_Default):
-        case CombinedEnumContext(Application::WriterVariants, Context_Table):
-        case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
+        case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::Text):
+        case CombinedEnumContext(Application::WriterVariants, Context::Default):
+        case CombinedEnumContext(Application::WriterVariants, Context::Table):
+        case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
             {
                 mpLeftIndent->SetMax( MAX_SW - nrVal, FUNIT_100TH_MM );
                 mpRightIndent->SetMax( MAX_SW - nVal, FUNIT_100TH_MM );
                 mpFLineIndent->SetMax( MAX_SW - nVal - nrVal, FUNIT_100TH_MM );
             }
             break;
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-        case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-        case CombinedEnumContext(Application::DrawImpress, Context_Table):
-        case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+        case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+        case CombinedEnumContext(Application::DrawImpress, Context::Table):
+        case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
             {
                 mpLeftIndent->SetMax( MAX_SC_SD - nrVal, FUNIT_100TH_MM );
                 mpRightIndent->SetMax( MAX_SC_SD - nVal, FUNIT_100TH_MM );
@@ -419,9 +419,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         const sal_uInt16 nIdDecrIndent  = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT);
 
         mpTbxIndent_IncDec->EnableItem(nIdHangingIndent);
-        if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text)
-             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default)
-             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table) )
+        if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Text)
+             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default)
+             && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Table) )
         {
             mpTbxIndent_IncDec->EnableItem(nIdIncrIndent);
             mpTbxIndent_IncDec->EnableItem(nIdDecrIndent);
@@ -432,9 +432,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         mpLeftIndent-> Disable();
         mpRightIndent->Disable();
         mpFLineIndent->Disable();
-        if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text)  &&
-            maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) &&
-            maContext.GetCombinedContext_DI() !=  CombinedEnumContext(Application::WriterVariants, Context_Table) )
+        if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Text)  &&
+            maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default) &&
+            maContext.GetCombinedContext_DI() !=  CombinedEnumContext(Application::WriterVariants, Context::Table) )
             mpTbxIndent_IncDec->Disable();
         else
             mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false);
@@ -444,9 +444,9 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
         mpLeftIndent->SetEmptyFieldValue();
         mpRightIndent->SetEmptyFieldValue();
         mpFLineIndent->SetEmptyFieldValue();
-        if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text)  &&
-            maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default) &&
-            maContext.GetCombinedContext_DI() !=  CombinedEnumContext(Application::WriterVariants, Context_Table) )
+        if( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Text)  &&
+            maContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default) &&
+            maContext.GetCombinedContext_DI() !=  CombinedEnumContext(Application::WriterVariants, Context::Table) )
             mpTbxIndent_IncDec->Disable();
         else
             mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false);
@@ -492,9 +492,9 @@ void ParaPropertyPanel::StateChangedULImpl( sal_uInt16 /*nSID*/, SfxItemState eS
 
 void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
-    if ( ( maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context_Text)
-           || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context_Default)
-           || maContext.GetCombinedContext_DI() ==  CombinedEnumContext(Application::WriterVariants, Context_Table) )
+    if ( ( maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context::Text)
+           || maContext.GetCombinedContext_DI() == CombinedEnumContext(Application::WriterVariants, Context::Default)
+           || maContext.GetCombinedContext_DI() ==  CombinedEnumContext(Application::WriterVariants, Context::Table) )
          && ( nSID == SID_INC_INDENT || nSID == SID_DEC_INDENT ) )
     {
         // Writer's text shell is the only one which provides reasonable states for Slots SID_INC_INDENT and SID_DEC_INDENT
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index e822d2224709..9ebea6a25c98 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -147,23 +147,23 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat
     switch(m_aContext.GetCombinedContext_DI())
     {
 
-    case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
-    case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
-    case CombinedEnumContext(Application::Calc, Context_DrawText):
-    case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-    case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-    case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-    case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
-    case CombinedEnumContext(Application::DrawImpress, Context_Table):
+    case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
+    case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
+    case CombinedEnumContext(Application::Calc, Context::DrawText):
+    case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+    case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+    case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+    case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
+    case CombinedEnumContext(Application::DrawImpress, Context::Table):
         {
             m_pBeforeSpacing->SetMin(DEFAULT_VALUE);
             m_pAfterSpacing->SetMin(DEFAULT_VALUE);
             m_pFLSpacing->SetMin(DEFAULT_VALUE);
         }
         break;
-    case CombinedEnumContext(Application::WriterVariants, Context_Default):
-    case CombinedEnumContext(Application::WriterVariants, Context_Text):
-    case CombinedEnumContext(Application::WriterVariants, Context_Table):
+    case CombinedEnumContext(Application::WriterVariants, Context::Default):
+    case CombinedEnumContext(Application::WriterVariants, Context::Text):
+    case CombinedEnumContext(Application::WriterVariants, Context::Table):
         {
             m_pBeforeSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM);
             m_pAfterSpacing->SetMin(NEGA_MAXVALUE, FUNIT_100TH_MM);
@@ -185,9 +185,9 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat
 
         aTxtLeft = (long)m_pBeforeSpacing->Normalize(aTxtLeft);
 
-        if(m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Text)
-             && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Default)
-             && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context_Table))
+        if(m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Text)
+             && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Default)
+             && m_aContext.GetCombinedContext_DI() != CombinedEnumContext(Application::WriterVariants, Context::Table))
         {
             m_pFLSpacing->SetMin(aTxtLeft*(-1), FUNIT_100TH_MM);
         }
@@ -196,22 +196,22 @@ void ParaLRSpacingWindow::SetValue(SfxItemState eState, const SfxPoolItem* pStat
 
         switch(m_aContext.GetCombinedContext_DI())
         {
-        case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_Text):
-        case CombinedEnumContext(Application::WriterVariants, Context_Default):
-        case CombinedEnumContext(Application::WriterVariants, Context_Table):
-        case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
+        case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::Text):
+        case CombinedEnumContext(Application::WriterVariants, Context::Default):
+        case CombinedEnumContext(Application::WriterVariants, Context::Table):
+        case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
             {
                 m_pBeforeSpacing->SetMax(MAX_SW - aTxtRight, FUNIT_100TH_MM);
                 m_pAfterSpacing->SetMax(MAX_SW - aTxtLeft, FUNIT_100TH_MM);
                 m_pFLSpacing->SetMax(MAX_SW - aTxtLeft - aTxtRight, FUNIT_100TH_MM);
             }
             break;
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-        case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-        case CombinedEnumContext(Application::DrawImpress, Context_Table):
-        case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+        case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+        case CombinedEnumContext(Application::DrawImpress, Context::Table):
+        case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
             {
                 m_pBeforeSpacing->SetMax(MAX_SC_SD - aTxtRight, FUNIT_100TH_MM);
                 m_pAfterSpacing->SetMax(MAX_SC_SD - aTxtLeft, FUNIT_100TH_MM);
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 89b9a00efe04..5861e13e6487 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -264,37 +264,37 @@ void PosSizePropertyPanel::HandleContextChange(
 
     switch (maContext.GetCombinedContext_DI())
     {
-        case CombinedEnumContext(Application::WriterVariants, Context_Draw):
+        case CombinedEnumContext(Application::WriterVariants, Context::Draw):
             bShowAngle = true;
             bShowFlip = true;
             break;
 
-        case CombinedEnumContext(Application::WriterVariants, Context_Graphic):
+        case CombinedEnumContext(Application::WriterVariants, Context::Graphic):
             bShowFlip = true;
             break;
 
-        case CombinedEnumContext(Application::Calc, Context_Draw):
-        case CombinedEnumContext(Application::Calc, Context_DrawLine):
-        case CombinedEnumContext(Application::Calc, Context_Graphic):
-        case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawLine):
-        case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
+        case CombinedEnumContext(Application::Calc, Context::Draw):
+        case CombinedEnumContext(Application::Calc, Context::DrawLine):
+        case CombinedEnumContext(Application::Calc, Context::Graphic):
+        case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawLine):
+        case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
             bShowPosition = true;
             bShowAngle = true;
             bShowFlip = true;
             break;
 
-        case CombinedEnumContext(Application::Calc, Context_Chart):
-        case CombinedEnumContext(Application::Calc, Context_Form):
-        case CombinedEnumContext(Application::Calc, Context_Media):
-        case CombinedEnumContext(Application::Calc, Context_OLE):
-        case CombinedEnumContext(Application::Calc, Context_MultiObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Media):
-        case CombinedEnumContext(Application::DrawImpress, Context_Form):
-        case CombinedEnumContext(Application::DrawImpress, Context_OLE):
-        case CombinedEnumContext(Application::DrawImpress, Context_3DObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_MultiObject):
+        case CombinedEnumContext(Application::Calc, Context::Chart):
+        case CombinedEnumContext(Application::Calc, Context::Form):
+        case CombinedEnumContext(Application::Calc, Context::Media):
+        case CombinedEnumContext(Application::Calc, Context::OLE):
+        case CombinedEnumContext(Application::Calc, Context::MultiObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Media):
+        case CombinedEnumContext(Application::DrawImpress, Context::Form):
+        case CombinedEnumContext(Application::DrawImpress, Context::OLE):
+        case CombinedEnumContext(Application::DrawImpress, Context::ThreeDObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::MultiObject):
             bShowPosition = true;
             break;
     }
@@ -763,8 +763,8 @@ void PosSizePropertyPanel::NotifyItemUpdate(
             const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
             const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
 
-            if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_Draw)
-               || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_TextObject)
+            if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::Draw)
+               || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::TextObject)
                  ) && OBJ_EDGE == eKind)
                || OBJ_CAPTION == eKind)
             {
@@ -787,8 +787,8 @@ void PosSizePropertyPanel::NotifyItemUpdate(
                 const SdrObject* pObj = rMarkList.GetMark(nMarkObj)->GetMarkedSdrObj();
                 const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
 
-                if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_Draw)
-                  || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_TextObject)
+                if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::Draw)
+                  || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::TextObject)
                      ) && OBJ_EDGE == eKind)
                   || OBJ_CAPTION == eKind)
                 {
@@ -810,7 +810,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
         }
     }
 
-    if(nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context_TextObject))
+    if(nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::TextObject))
     {
         mpFlipTbx->Disable();
         mpFtFlip->Disable();
@@ -855,8 +855,8 @@ void PosSizePropertyPanel::executeSize()
         SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)RectPoint::LT);
         const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI());
 
-        if( nCombinedContext == CombinedEnumContext(Application::WriterVariants, Context_Graphic)
-            || nCombinedContext == CombinedEnumContext(Application::WriterVariants, Context_OLE)
+        if( nCombinedContext == CombinedEnumContext(Application::WriterVariants, Context::Graphic)
+            || nCombinedContext == CombinedEnumContext(Application::WriterVariants, Context::OLE)
             )
         {
             GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 95bd906321ff..cad648cbf3d6 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -103,31 +103,31 @@ void TextPropertyPanel::HandleContextChange (
 
     switch (maContext.GetCombinedContext_DI())
     {
-        case CombinedEnumContext(Application::Calc, Context_Cell):
-        case CombinedEnumContext(Application::Calc, Context_Pivot):
+        case CombinedEnumContext(Application::Calc, Context::Cell):
+        case CombinedEnumContext(Application::Calc, Context::Pivot):
             // bNeedTextSpacing = false;
             break;
 
-        case CombinedEnumContext(Application::Calc, Context_EditCell):
+        case CombinedEnumContext(Application::Calc, Context::EditCell):
             bNeedTextSpacing = true;
             break;
 
-        case CombinedEnumContext(Application::Calc, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_DrawText):
-        case CombinedEnumContext(Application::WriterVariants, Context_Annotation):
-        case CombinedEnumContext(Application::DrawImpress, Context_DrawText):
-        case CombinedEnumContext(Application::DrawImpress, Context_Text):
-        case CombinedEnumContext(Application::DrawImpress, Context_Table):
-        case CombinedEnumContext(Application::DrawImpress, Context_OutlineText):
-        case CombinedEnumContext(Application::DrawImpress, Context_Draw):
-        case CombinedEnumContext(Application::DrawImpress, Context_TextObject):
-        case CombinedEnumContext(Application::DrawImpress, Context_Graphic):
+        case CombinedEnumContext(Application::Calc, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::DrawText):
+        case CombinedEnumContext(Application::WriterVariants, Context::Annotation):
+        case CombinedEnumContext(Application::DrawImpress, Context::DrawText):
+        case CombinedEnumContext(Application::DrawImpress, Context::Text):
+        case CombinedEnumContext(Application::DrawImpress, Context::Table):
+        case CombinedEnumContext(Application::DrawImpress, Context::OutlineText):
+        case CombinedEnumContext(Application::DrawImpress, Context::Draw):
+        case CombinedEnumContext(Application::DrawImpress, Context::TextObject):
+        case CombinedEnumContext(Application::DrawImpress, Context::Graphic):
             bNeedTextSpacing = true;
             bDrawText = true;
             break;
 
-        case CombinedEnumContext(Application::WriterVariants, Context_Text):
-        case CombinedEnumContext(Application::WriterVariants, Context_Table):
+        case CombinedEnumContext(Application::WriterVariants, Context::Text):
+        case CombinedEnumContext(Application::WriterVariants, Context::Table):
             bNeedTextSpacing = true;
             bWriterText = true;
             break;