remove E3D_INVENTOR_FLAG and convert SdrObjKind to scoped enum

We don't need E3D_INVENTOR_FLAG, we can just check if the SdrObjKind is
in the right range.

Which exposes some dodgy code in DrawViewShell::GetMenuStateSel
    SfxItemState::DEFAULT == rSet.GetItemState( OBJ_TITLETEXT ) ||
    SfxItemState::DEFAULT == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
which has been there ever since
    commit f47a9d9db3d06927380bb79b04bb6d4721a92d2b
    Date:   Mon Sep 18 16:07:07 2000 +0000
    initial import
just remove that.

In SwFEShell::ImpEndCreate() move some logic around to avoid
using an out-of-range SdrObjKind value

Change-Id: I4620bfe61aca8f7415503debe3c84bfe5f4368a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127763
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 34 insertions, 34 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 920e82da3d0a..91ac35a4bbc0 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -392,7 +392,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
 void DialogWindow::ExecuteCommand( SfxRequest& rReq )
 {
     const sal_uInt16 nSlotId(rReq.GetSlot());
-    SdrObjKind nInsertObj(OBJ_NONE);
+    SdrObjKind nInsertObj(SdrObjKind::NONE);
 
     switch ( nSlotId )
     {
@@ -425,100 +425,100 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
             break;
 
         case SID_INSERT_FORM_RADIO:
-            nInsertObj = OBJ_DLG_FORMRADIO;
+            nInsertObj = SdrObjKind::BasicDialogFormRadio;
             break;
         case SID_INSERT_FORM_CHECK:
-            nInsertObj = OBJ_DLG_FORMCHECK;
+            nInsertObj = SdrObjKind::BasicDialogFormCheck;
             break;
         case SID_INSERT_FORM_LIST:
-            nInsertObj = OBJ_DLG_FORMLIST;
+            nInsertObj = SdrObjKind::BasicDialogFormList;
             break;
         case SID_INSERT_FORM_COMBO:
-            nInsertObj = OBJ_DLG_FORMCOMBO;
+            nInsertObj = SdrObjKind::BasicDialogFormCombo;
             break;
         case SID_INSERT_FORM_SPIN:
-            nInsertObj = OBJ_DLG_FORMSPIN;
+            nInsertObj = SdrObjKind::BasicDialogFormSpin;
             break;
         case SID_INSERT_FORM_VSCROLL:
-            nInsertObj = OBJ_DLG_FORMVSCROLL;
+            nInsertObj = SdrObjKind::BasicDialogFormVerticalScroll;
             break;
         case SID_INSERT_FORM_HSCROLL:
-            nInsertObj = OBJ_DLG_FORMHSCROLL;
+            nInsertObj = SdrObjKind::BasicDialogFormHorizontalScroll;
             break;
         case SID_INSERT_PUSHBUTTON:
-            nInsertObj = OBJ_DLG_PUSHBUTTON;
+            nInsertObj = SdrObjKind::BasicDialogPushButton;
             break;
         case SID_INSERT_RADIOBUTTON:
-            nInsertObj = OBJ_DLG_RADIOBUTTON;
+            nInsertObj = SdrObjKind::BasicDialogRadioButton;
             break;
         case SID_INSERT_CHECKBOX:
-            nInsertObj = OBJ_DLG_CHECKBOX;
+            nInsertObj = SdrObjKind::BasicDialogCheckbox;
             break;
         case SID_INSERT_LISTBOX:
-            nInsertObj = OBJ_DLG_LISTBOX;
+            nInsertObj = SdrObjKind::BasicDialogListbox;
             break;
         case SID_INSERT_COMBOBOX:
-            nInsertObj = OBJ_DLG_COMBOBOX;
+            nInsertObj = SdrObjKind::BasicDialogCombobox;
             break;
         case SID_INSERT_GROUPBOX:
-            nInsertObj = OBJ_DLG_GROUPBOX;
+            nInsertObj = SdrObjKind::BasicDialogGroupBox;
             break;
         case SID_INSERT_EDIT:
-            nInsertObj = OBJ_DLG_EDIT;
+            nInsertObj = SdrObjKind::BasicDialogEdit;
             break;
         case SID_INSERT_FIXEDTEXT:
-            nInsertObj = OBJ_DLG_FIXEDTEXT;
+            nInsertObj = SdrObjKind::BasicDialogFixedText;
             break;
         case SID_INSERT_IMAGECONTROL:
-            nInsertObj = OBJ_DLG_IMAGECONTROL;
+            nInsertObj = SdrObjKind::BasicDialogImageControl;
             break;
         case SID_INSERT_PROGRESSBAR:
-            nInsertObj = OBJ_DLG_PROGRESSBAR;
+            nInsertObj = SdrObjKind::BasicDialogProgressbar;
             break;
         case SID_INSERT_HSCROLLBAR:
-            nInsertObj = OBJ_DLG_HSCROLLBAR;
+            nInsertObj = SdrObjKind::BasicDialogHorizontalScrollbar;
             break;
         case SID_INSERT_VSCROLLBAR:
-            nInsertObj = OBJ_DLG_VSCROLLBAR;
+            nInsertObj = SdrObjKind::BasicDialogVerticalScrollbar;
             break;
         case SID_INSERT_HFIXEDLINE:
-            nInsertObj = OBJ_DLG_HFIXEDLINE;
+            nInsertObj = SdrObjKind::BasicDialogHorizontalFixedLine;
             break;
         case SID_INSERT_VFIXEDLINE:
-            nInsertObj = OBJ_DLG_VFIXEDLINE;
+            nInsertObj = SdrObjKind::BasicDialogVerticalFixedLine;
             break;
         case SID_INSERT_DATEFIELD:
-            nInsertObj = OBJ_DLG_DATEFIELD;
+            nInsertObj = SdrObjKind::BasicDialogDateField;
             break;
         case SID_INSERT_TIMEFIELD:
-            nInsertObj = OBJ_DLG_TIMEFIELD;
+            nInsertObj = SdrObjKind::BasicDialogTimeField;
             break;
         case SID_INSERT_NUMERICFIELD:
-            nInsertObj = OBJ_DLG_NUMERICFIELD;
+            nInsertObj = SdrObjKind::BasicDialogNumericField;
             break;
         case SID_INSERT_CURRENCYFIELD:
-            nInsertObj = OBJ_DLG_CURRENCYFIELD;
+            nInsertObj = SdrObjKind::BasicDialogCurencyField;
             break;
         case SID_INSERT_FORMATTEDFIELD:
-            nInsertObj = OBJ_DLG_FORMATTEDFIELD;
+            nInsertObj = SdrObjKind::BasicDialogFormattedField;
             break;
         case SID_INSERT_PATTERNFIELD:
-            nInsertObj = OBJ_DLG_PATTERNFIELD;
+            nInsertObj = SdrObjKind::BasicDialogPatternField;
             break;
         case SID_INSERT_FILECONTROL:
-            nInsertObj = OBJ_DLG_FILECONTROL;
+            nInsertObj = SdrObjKind::BasicDialogFileControl;
             break;
         case SID_INSERT_SPINBUTTON:
-            nInsertObj = OBJ_DLG_SPINBUTTON;
+            nInsertObj = SdrObjKind::BasicDialogSpinButton;
             break;
         case SID_INSERT_GRIDCONTROL:
-            nInsertObj = OBJ_DLG_GRIDCONTROL;
+            nInsertObj = SdrObjKind::BasicDialogGridControl;
             break;
         case SID_INSERT_HYPERLINKCONTROL:
-            nInsertObj = OBJ_DLG_HYPERLINKCONTROL;
+            nInsertObj = SdrObjKind::BasicDialogHyperlinkControl;
             break;
         case SID_INSERT_TREECONTROL:
-            nInsertObj = OBJ_DLG_TREECONTROL;
+            nInsertObj = SdrObjKind::BasicDialogTreeControl;
             break;
         case SID_INSERT_SELECT:
             m_nControlSlotId = nSlotId;
@@ -556,7 +556,7 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
             break;
     }
 
-    if ( nInsertObj )
+    if ( nInsertObj != SdrObjKind::NONE )
     {
         m_nControlSlotId = nSlotId;
         GetEditor().SetMode( DlgEditor::INSERT );