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>

4 files changed, 95 insertions, 95 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 );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 13ff7a17ca36..69ffb81f3579 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -195,7 +195,7 @@ DlgEditor::DlgEditor (
     ,pFunc(new DlgEdFuncSelect(*this))
     ,rLayout(rLayout_)
     ,eMode( DlgEditor::SELECT )
-    ,eActObj( OBJ_DLG_PUSHBUTTON )
+    ,eActObj( SdrObjKind::BasicDialogPushButton )
     ,bFirstDraw(false)
     ,bCreateOK(true)
     ,bDialogModelChanged(false)
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 98c0f260b0f9..5c7d012344bb 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -60,40 +60,40 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
 
     SdrObject* pNewObj = nullptr;
     if( (aParams.nInventor == SdrInventor::BasicDialog) &&
-        (aParams.nObjIdentifier >= OBJ_DLG_PUSHBUTTON) &&
-        (aParams.nObjIdentifier <= OBJ_DLG_FORMHSCROLL)    )
+        (aParams.nObjIdentifier >= SdrObjKind::BasicDialogPushButton) &&
+        (aParams.nObjIdentifier <= SdrObjKind::BasicDialogFormHorizontalScroll)    )
     {
         switch( aParams.nObjIdentifier )
         {
-            case OBJ_DLG_PUSHBUTTON:
+            case SdrObjKind::BasicDialogPushButton:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlButtonModel", xDialogSFact );
                  break;
-            case OBJ_DLG_RADIOBUTTON:
+            case SdrObjKind::BasicDialogRadioButton:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlRadioButtonModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FORMRADIO:
+            case SdrObjKind::BasicDialogFormRadio:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.RadioButton", xDialogSFact );
                  static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
                  break;
-            case OBJ_DLG_CHECKBOX:
+            case SdrObjKind::BasicDialogCheckbox:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlCheckBoxModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FORMCHECK:
+            case SdrObjKind::BasicDialogFormCheck:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.CheckBox", xDialogSFact );
                  static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
                  break;
-            case OBJ_DLG_LISTBOX:
+            case SdrObjKind::BasicDialogListbox:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlListBoxModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FORMLIST:
+            case SdrObjKind::BasicDialogFormList:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ListBox", xDialogSFact );
                  static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
                  break;
-            case OBJ_DLG_FORMCOMBO:
-            case OBJ_DLG_COMBOBOX:
+            case SdrObjKind::BasicDialogFormCombo:
+            case SdrObjKind::BasicDialogCombobox:
             {
                  DlgEdObj* pNew = nullptr;
-                 if ( aParams.nObjIdentifier == OBJ_DLG_COMBOBOX )
+                 if ( aParams.nObjIdentifier == SdrObjKind::BasicDialogCombobox )
                      pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlComboBoxModel", xDialogSFact );
                  else
                  {
@@ -114,33 +114,33 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
                  }
             }
             break;
-            case OBJ_DLG_GROUPBOX:
+            case SdrObjKind::BasicDialogGroupBox:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlGroupBoxModel", xDialogSFact );
                  break;
-            case OBJ_DLG_EDIT:
+            case SdrObjKind::BasicDialogEdit:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlEditModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FIXEDTEXT:
+            case SdrObjKind::BasicDialogFixedText:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedTextModel", xDialogSFact );
                  break;
-            case OBJ_DLG_IMAGECONTROL:
+            case SdrObjKind::BasicDialogImageControl:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlImageControlModel", xDialogSFact );
                  break;
-            case OBJ_DLG_PROGRESSBAR:
+            case SdrObjKind::BasicDialogProgressbar:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlProgressBarModel", xDialogSFact );
                  break;
-            case OBJ_DLG_HSCROLLBAR:
+            case SdrObjKind::BasicDialogHorizontalScrollbar:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlScrollBarModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FORMHSCROLL:
+            case SdrObjKind::BasicDialogFormHorizontalScroll:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.ScrollBar", xDialogSFact );
                  static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
                  break;
-            case OBJ_DLG_FORMVSCROLL:
-            case OBJ_DLG_VSCROLLBAR:
+            case SdrObjKind::BasicDialogFormVerticalScroll:
+            case SdrObjKind::BasicDialogVerticalScrollbar:
             {
                  DlgEdObj* pNew = nullptr;
-                 if ( aParams.nObjIdentifier ==  OBJ_DLG_VSCROLLBAR )
+                 if ( aParams.nObjIdentifier == SdrObjKind::BasicDialogVerticalScrollbar )
                      pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlScrollBarModel", xDialogSFact );
                  else
                  {
@@ -161,10 +161,10 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
                  {
                  }
             }    break;
-            case OBJ_DLG_HFIXEDLINE:
+            case SdrObjKind::BasicDialogHorizontalFixedLine:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedLineModel", xDialogSFact );
                  break;
-            case OBJ_DLG_VFIXEDLINE:
+            case SdrObjKind::BasicDialogVerticalFixedLine:
             {
                  DlgEdObj* pNew = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedLineModel", xDialogSFact );
                  pNewObj = pNew;
@@ -181,41 +181,41 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
                  {
                  }
             }    break;
-            case OBJ_DLG_DATEFIELD:
+            case SdrObjKind::BasicDialogDateField:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlDateFieldModel", xDialogSFact );
                  break;
-            case OBJ_DLG_TIMEFIELD:
+            case SdrObjKind::BasicDialogTimeField:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlTimeFieldModel", xDialogSFact );
                  break;
-            case OBJ_DLG_NUMERICFIELD:
+            case SdrObjKind::BasicDialogNumericField:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlNumericFieldModel", xDialogSFact );
                  break;
-            case OBJ_DLG_CURRENCYFIELD:
+            case SdrObjKind::BasicDialogCurencyField:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlCurrencyFieldModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FORMATTEDFIELD:
+            case SdrObjKind::BasicDialogFormattedField:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFormattedFieldModel", xDialogSFact );
                  break;
-            case OBJ_DLG_PATTERNFIELD:
+            case SdrObjKind::BasicDialogPatternField:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlPatternFieldModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FILECONTROL:
+            case SdrObjKind::BasicDialogFileControl:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFileControlModel", xDialogSFact );
                  break;
-            case OBJ_DLG_SPINBUTTON:
+            case SdrObjKind::BasicDialogSpinButton:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlSpinButtonModel", xDialogSFact );
                  break;
-            case OBJ_DLG_FORMSPIN:
+            case SdrObjKind::BasicDialogFormSpin:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.form.component.SpinButton", xDialogSFact );
                  static_cast< DlgEdObj* >( pNewObj )->MakeDataAware( mxModel );
                  break;
-            case OBJ_DLG_TREECONTROL:
+            case SdrObjKind::BasicDialogTreeControl:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.tree.TreeControlModel", xDialogSFact );
                  break;
-            case OBJ_DLG_GRIDCONTROL:
+            case SdrObjKind::BasicDialogGridControl:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.grid.UnoControlGridModel", xDialogSFact );
                  break;
-            case OBJ_DLG_HYPERLINKCONTROL:
+            case SdrObjKind::BasicDialogHyperlinkControl:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel", xDialogSFact );
                  break;
             default:
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index c9ae1de4ae6e..1d89210b7dd5 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -810,99 +810,99 @@ SdrObjKind DlgEdObj::GetObjIdentifier() const
 {
     if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ))
     {
-        return OBJ_DLG_DIALOG;
+        return SdrObjKind::BasicDialogDialog;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ))
     {
-        return OBJ_DLG_PUSHBUTTON;
+        return SdrObjKind::BasicDialogPushButton;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ))
     {
-        return OBJ_DLG_RADIOBUTTON;
+        return SdrObjKind::BasicDialogRadioButton;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ))
     {
-        return OBJ_DLG_CHECKBOX;
+        return SdrObjKind::BasicDialogCheckbox;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlListBoxModel" ))
     {
-        return OBJ_DLG_LISTBOX;
+        return SdrObjKind::BasicDialogListbox;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ))
     {
-        return OBJ_DLG_COMBOBOX;
+        return SdrObjKind::BasicDialogCombobox;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ))
     {
-        return OBJ_DLG_GROUPBOX;
+        return SdrObjKind::BasicDialogGroupBox;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlEditModel" ))
     {
-        return OBJ_DLG_EDIT;
+        return SdrObjKind::BasicDialogEdit;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ))
     {
-        return OBJ_DLG_FIXEDTEXT;
+        return SdrObjKind::BasicDialogFixedText;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlImageControlModel" ))
     {
-        return OBJ_DLG_IMAGECONTROL;
+        return SdrObjKind::BasicDialogImageControl;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ))
     {
-        return OBJ_DLG_PROGRESSBAR;
+        return SdrObjKind::BasicDialogProgressbar;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ))
     {
-        return OBJ_DLG_HSCROLLBAR;
+        return SdrObjKind::BasicDialogHorizontalScrollbar;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ))
     {
-        return OBJ_DLG_HFIXEDLINE;
+        return SdrObjKind::BasicDialogHorizontalFixedLine;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ))
     {
-        return OBJ_DLG_DATEFIELD;
+        return SdrObjKind::BasicDialogDateField;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ))
     {
-        return OBJ_DLG_TIMEFIELD;
+        return SdrObjKind::BasicDialogTimeField;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ))
     {
-        return OBJ_DLG_NUMERICFIELD;
+        return SdrObjKind::BasicDialogNumericField;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ))
     {
-        return OBJ_DLG_CURRENCYFIELD;
+        return SdrObjKind::BasicDialogCurencyField;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ))
     {
-        return OBJ_DLG_FORMATTEDFIELD;
+        return SdrObjKind::BasicDialogFormattedField;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ))
     {
-        return OBJ_DLG_PATTERNFIELD;
+        return SdrObjKind::BasicDialogPatternField;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlFileControlModel" ))
     {
-        return OBJ_DLG_FILECONTROL;
+        return SdrObjKind::BasicDialogFileControl;
     }
     else if ( supportsService( "com.sun.star.awt.tree.TreeControlModel" ))
     {
-        return OBJ_DLG_TREECONTROL;
+        return SdrObjKind::BasicDialogTreeControl;
     }
     else if ( supportsService( "com.sun.star.awt.grid.UnoControlGridModel" ))
     {
-        return OBJ_DLG_GRIDCONTROL;
+        return SdrObjKind::BasicDialogGridControl;
     }
     else if ( supportsService( "com.sun.star.awt.UnoControlFixedHyperlinkModel" ))
     {
-        return OBJ_DLG_HYPERLINKCONTROL;
+        return SdrObjKind::BasicDialogHyperlinkControl;
     }
     else
     {
-        return OBJ_DLG_CONTROL;
+        return SdrObjKind::BasicDialogControl;
     }
 }