make SdrObject Identifiers SdrObjKind enum members

with unique values so that, e.g.

if (pObj->GetObjIdentifier() == OBJ_LINE)

is only true if pObj is a SdrPathObj and not a E3dScene

Change-Id: I30c91e57eb27141390c644dec42e2a4bee96edf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105374
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 11 insertions, 46 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index ab451f482a15..063828689a0f 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -391,7 +391,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
 void DialogWindow::ExecuteCommand( SfxRequest& rReq )
 {
     const sal_uInt16 nSlotId(rReq.GetSlot());
-    sal_uInt16 nInsertObj(0);
+    SdrObjKind nInsertObj(OBJ_NONE);
 
     switch ( nSlotId )
     {
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index b9da399830ac..533e2381f3e7 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -601,7 +601,7 @@ void DlgEditor::SetMode (Mode eNewMode )
 }
 
 
-void DlgEditor::SetInsertObj( sal_uInt16 eObj )
+void DlgEditor::SetInsertObj(SdrObjKind eObj)
 {
     eActObj = eObj;
 
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 3063e7f29e00..38c8dc0d1a9c 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -221,6 +221,8 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
             case OBJ_DLG_HYPERLINKCONTROL:
                  pNewObj = new DlgEdObj(aParams.rSdrModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel", xDialogSFact );
                  break;
+            default:
+                 break;
 
         }
     }
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 360c5b4d2d58..056006c4305e 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -768,7 +768,7 @@ SdrInventor DlgEdObj::GetObjInventor()   const
     return SdrInventor::BasicDialog;
 }
 
-sal_uInt16 DlgEdObj::GetObjIdentifier() const
+SdrObjKind DlgEdObj::GetObjIdentifier() const
 {
     if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ))
     {
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 6b83c402959b..82d3a14f605d 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -27,6 +27,7 @@
 #include <o3tl/deleter.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/hint.hxx>
+#include <svx/svdobjkind.hxx>
 #include <tools/gen.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
@@ -123,7 +124,7 @@ private:
     std::unique_ptr<DlgEdFunc>    pFunc;
     DialogWindowLayout& rLayout;
     Mode                eMode;
-    sal_uInt16          eActObj;
+    SdrObjKind          eActObj;
     bool                bFirstDraw;
     bool                bCreateOK;
     tools::Rectangle           aPaintRect;
@@ -184,7 +185,7 @@ public:
     bool            KeyInput( const KeyEvent& rKEvt );
 
     void            SetMode (Mode eMode);
-    void            SetInsertObj( sal_uInt16 eObj );
+    void            SetInsertObj(SdrObjKind eObj);
     void            CreateDefaultObject();
     Mode            GetMode() const { return eMode; }
     bool            IsCreateOK() const { return bCreateOK; }
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index c19c3db282e1..0cb0a6dc8573 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -19,48 +19,10 @@
 
 #pragma once
 
-namespace basctl
-{
+#include <svx/svdobjkind.hxx>
 
-enum
+namespace basctl
 {
-    OBJ_DLG_CONTROL         =  1,
-    OBJ_DLG_DIALOG          =  2,
-    OBJ_DLG_PUSHBUTTON      =  3,
-    OBJ_DLG_RADIOBUTTON     =  4,
-    OBJ_DLG_CHECKBOX        =  5,
-    OBJ_DLG_LISTBOX         =  6,
-    OBJ_DLG_COMBOBOX        =  7,
-    OBJ_DLG_GROUPBOX        =  8,
-    OBJ_DLG_EDIT            =  9,
-    OBJ_DLG_FIXEDTEXT       = 10,
-    OBJ_DLG_IMAGECONTROL    = 11,
-    OBJ_DLG_PROGRESSBAR     = 12,
-    OBJ_DLG_HSCROLLBAR      = 13,
-    OBJ_DLG_VSCROLLBAR      = 14,
-    OBJ_DLG_HFIXEDLINE      = 15,
-    OBJ_DLG_VFIXEDLINE      = 16,
-    OBJ_DLG_DATEFIELD       = 17,
-    OBJ_DLG_TIMEFIELD       = 18,
-    OBJ_DLG_NUMERICFIELD    = 19,
-    OBJ_DLG_CURRENCYFIELD   = 20,
-    OBJ_DLG_FORMATTEDFIELD  = 21,
-    OBJ_DLG_PATTERNFIELD    = 22,
-    OBJ_DLG_FILECONTROL     = 23,
-    OBJ_DLG_TREECONTROL     = 24,
-    OBJ_DLG_SPINBUTTON      = 25,
-    OBJ_DLG_GRIDCONTROL     = 26,
-    OBJ_DLG_HYPERLINKCONTROL = 27,
-
-    OBJ_DLG_FORMRADIO       = 28,
-    OBJ_DLG_FORMCHECK       = 29,
-    OBJ_DLG_FORMLIST        = 30,
-    OBJ_DLG_FORMCOMBO       = 31,
-    OBJ_DLG_FORMSPIN        = 32,
-    OBJ_DLG_FORMVSCROLL     = 33,
-    OBJ_DLG_FORMHSCROLL     = 34,
-
-};
 
 // control properties
 #define DLGED_PROP_BACKGROUNDCOLOR   "BackgroundColor"
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 37e5fc3209f3..8ae88ef5c80a 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -100,7 +100,7 @@ public:
     DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
 
     virtual SdrInventor GetObjInventor() const override;
-    virtual sal_uInt16 GetObjIdentifier() const override;
+    virtual SdrObjKind GetObjIdentifier() const override;
 
     virtual DlgEdObj* CloneSdrObject(SdrModel& rTargetModel) const override;                                          // not working yet
     void clonedFrom(const DlgEdObj* _pSource);                          // not working yet