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>

47 files changed, 135 insertions, 126 deletions

diff --git a/svx/inc/extrud3d.hxx b/svx/inc/extrud3d.hxx
index 8b6d99d9ecf1..6836359a6ab5 100644
--- a/svx/inc/extrud3d.hxx
+++ b/svx/inc/extrud3d.hxx
@@ -92,7 +92,7 @@ public:
     bool GetCloseBack() const
         { return GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK).GetValue(); }
 
-    virtual sal_uInt16 GetObjIdentifier() const override;
+    virtual SdrObjKind GetObjIdentifier() const override;
 
     virtual E3dExtrudeObj* CloneSdrObject(SdrModel& rTargetModel) const override;
 
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index ecdcb1a6c289..d9b27ecb0499 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-09-21 15:24:05 using:
+ Generated on 2020-11-05 12:52:18 using:
  ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
@@ -65,6 +65,7 @@
 #include <osl/getglobalmutex.hxx>
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
+#include <osl/thread.h>
 #include <osl/time.h>
 #include <rtl/alloc.h>
 #include <rtl/character.hxx>
@@ -384,6 +385,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/debug.hxx>
+#include <tools/degree.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
@@ -392,6 +394,7 @@
 #include <tools/helpers.hxx>
 #include <tools/lineend.hxx>
 #include <tools/link.hxx>
+#include <tools/long.hxx>
 #include <tools/mapunit.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
@@ -437,11 +440,11 @@
 #include <svx/gallery1.hxx>
 #include <svx/galmisc.hxx>
 #include <svx/galtheme.hxx>
-#include <svx/globl3d.hxx>
 #include <svx/ipolypolygoneditorcontroller.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/scene3d.hxx>
+#include <svx/sdasitm.hxx>
 #include <svx/sdmetitm.hxx>
 #include <svx/sdooitm.hxx>
 #include <svx/sdr/animation/scheduler.hxx>
@@ -473,6 +476,7 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdobj.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdoedge.hxx>
 #include <svx/svdograf.hxx>
diff --git a/svx/inc/polygn3d.hxx b/svx/inc/polygn3d.hxx
index a97104cc412e..05b15c83fd1d 100644
--- a/svx/inc/polygn3d.hxx
+++ b/svx/inc/polygn3d.hxx
@@ -53,7 +53,7 @@ public:
     const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; }
     const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
 
-    virtual sal_uInt16 GetObjIdentifier() const override;
+    virtual SdrObjKind GetObjIdentifier() const override;
     virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
 
     virtual E3dPolygonObj* CloneSdrObject(SdrModel& rTargetModel) const override;
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 87943b34d804..05a02788d246 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -702,7 +702,7 @@ void GraphCtrl::SetEditMode( const bool _bEditMode )
         bEditMode = _bEditMode;
         pView->SetEditMode( bEditMode );
         eObjKind = OBJ_NONE;
-        pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
+        pView->SetCurrentObj(eObjKind);
     }
     else
         bEditMode = false;
@@ -730,7 +730,7 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
         bEditMode = false;
         pView->SetEditMode( bEditMode );
         eObjKind = _eObjKind;
-        pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
+        pView->SetCurrentObj(eObjKind);
     }
     else
         eObjKind = OBJ_NONE;
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 401e1b085410..9ee267afb061 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -22,7 +22,7 @@
 #include <svx/deflt3d.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/cube3d.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dcube.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -71,7 +71,7 @@ void E3dCubeObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
     bPosIsCenter = rDefault.GetDefaultCubePosIsCenter();
 }
 
-sal_uInt16 E3dCubeObj::GetObjIdentifier() const
+SdrObjKind E3dCubeObj::GetObjIdentifier() const
 {
     return E3D_CUBEOBJ_ID;
 }
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index d4aa1f024ae5..4a6d73419a6f 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -21,7 +21,7 @@
 #include <svx/strings.hrc>
 #include <svx/deflt3d.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <extrud3d.hxx>
 
 #include <svx/svdopath.hxx>
@@ -96,7 +96,7 @@ void E3dExtrudeObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
     GetProperties().SetObjectItemDirect(Svx3DTextureProjectionYItem(1));
 }
 
-sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const
+SdrObjKind E3dExtrudeObj::GetObjIdentifier() const
 {
     return E3D_EXTRUDEOBJ_ID;
 }
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index fbcfe3e44029..ebb04d5aaef5 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -21,7 +21,7 @@
 #include <svx/deflt3d.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdmodel.hxx>
@@ -101,7 +101,7 @@ void E3dLatheObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
     GetProperties().SetObjectItemDirect(Svx3DCloseBackItem(rDefault.GetDefaultLatheCloseBack()));
 }
 
-sal_uInt16 E3dLatheObj::GetObjIdentifier() const
+SdrObjKind E3dLatheObj::GetObjIdentifier() const
 {
     return E3D_LATHEOBJ_ID;
 }
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 91f2bed2ae8e..8d813176ced4 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -23,7 +23,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/obj3d.hxx>
 #include <sdr/properties/e3dproperties.hxx>
@@ -88,7 +88,7 @@ SdrInventor E3dObject::GetObjInventor() const
     return SdrInventor::E3d;
 }
 
-sal_uInt16 E3dObject::GetObjIdentifier() const
+SdrObjKind E3dObject::GetObjIdentifier() const
 {
     return E3D_OBJECT_ID;
 }
@@ -542,7 +542,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const
     }
 }
 
-sal_uInt16 E3dCompoundObject::GetObjIdentifier() const
+SdrObjKind E3dCompoundObject::GetObjIdentifier() const
 {
     return E3D_COMPOUNDOBJ_ID;
 }
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 5c617127b0ec..db626f649463 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <extrud3d.hxx>
@@ -64,6 +64,8 @@ IMPL_STATIC_LINK( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrOb
                 return new E3dLatheObj(aParams.rSdrModel);
             case E3D_COMPOUNDOBJ_ID:
                 return new E3dCompoundObject(aParams.rSdrModel);
+            default:
+                break;
         }
     }
     return nullptr;
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index c33d9f096d23..5d2d290b3821 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <polygn3d.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
@@ -169,7 +169,7 @@ E3dPolygonObj::~E3dPolygonObj()
 {
 }
 
-sal_uInt16 E3dPolygonObj::GetObjIdentifier() const
+SdrObjKind E3dPolygonObj::GetObjIdentifier() const
 {
     return E3D_POLYGONOBJ_ID;
 }
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 9b52aceb5f2a..abd592d6ce01 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -23,7 +23,7 @@
 #include <svx/svditer.hxx>
 
 #include <stdlib.h>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/svdtrans.hxx>
@@ -261,7 +261,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const
     return nNewOrdNum;
 }
 
-sal_uInt16 E3dScene::GetObjIdentifier() const
+SdrObjKind E3dScene::GetObjIdentifier() const
 {
     return E3D_SCENE_ID;
 }
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index e5e6939c1872..5749be7696e6 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -22,7 +22,7 @@
 #include <svx/deflt3d.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/sphere3d.hxx>
 
 #include <sdr/properties/e3dsphereproperties.hxx>
@@ -77,7 +77,7 @@ void E3dSphereObj::SetDefaultAttributes(const E3dDefaultAttributes& rDefault)
     aSize = rDefault.GetDefaultSphereSize();
 }
 
-sal_uInt16 E3dSphereObj::GetObjIdentifier() const
+SdrObjKind E3dSphereObj::GetObjIdentifier() const
 {
     return E3D_SPHEREOBJ_ID;
 }
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index aeb070082c1d..1d4e3db2a160 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -22,7 +22,7 @@
 #include <fmexpl.hxx>
 
 #include <helpids.h>
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/fmtools.hxx>
 #include <fmexch.hxx>
 
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index b589077068e7..92d21e907c32 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -312,19 +312,16 @@ void FmFormObj::handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage)
     pNewFormPage->GetImpl().formObjectInserted( *this );
 }
 
-
 SdrInventor FmFormObj::GetObjInventor()   const
 {
     return SdrInventor::FmForm;
 }
 
-
-sal_uInt16 FmFormObj::GetObjIdentifier() const
+SdrObjKind FmFormObj::GetObjIdentifier() const
 {
     return OBJ_UNO;
 }
 
-
 void FmFormObj::clonedFrom(const FmFormObj* _pSource)
 {
     DBG_ASSERT(_pSource != nullptr, "FmFormObj::clonedFrom : invalid source !");
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 5694776e09cd..799106579ced 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -26,7 +26,7 @@
 
 #include <svx/fmobjfac.hxx>
 
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 
 #include <fmobj.hxx>
 
@@ -206,6 +206,9 @@ IMPL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, aParams, Sdr
                 sServiceSpecifier = FM_SUN_COMPONENT_SPINBUTTON;
                 aInitialProperties.emplace_back( FM_PROP_BORDER, makeAny( sal_Int16(0) ) );
                 break;
+
+            default:
+                break;
         }
 
         // create the actual object
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 848f5a9f0a01..572b4d59d155 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -42,7 +42,7 @@
 
 #include <svx/svxids.hrc>
 
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/svdpage.hxx>
@@ -354,7 +354,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
 
 
     // set the Identifier and Inventor of the Uno control
-    sal_uInt16 nIdentifier = 0;
+    SdrObjKind nIdentifier = OBJ_NONE;
     switch( nSlot )
     {
         case SID_FM_CHECKBOX:
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index df80dae12a11..b83e2a1cbc07 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -36,7 +36,7 @@
 #include <svx/svditer.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmshell.hxx>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 43cdd150a143..99e82fca3a33 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -21,7 +21,7 @@
 #include <fmprop.hxx>
 #include <fmservs.hxx>
 #include <svx/fmtools.hxx>
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index dec92f21f711..aec343857f75 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -545,10 +545,9 @@ FmFormObj* FmFormView::getMarkedGrid() const
     return pFormObject;
 }
 
-
 void FmFormView::createControlLabelPair( OutputDevice const * _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
     const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
-    sal_uInt16 _nControlObjectID, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID,
+    SdrObjKind _nControlObjectID, SdrInventor _nInventor, SdrObjKind _nLabelObjectID,
     SdrModel& _rModel,
     std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel,
     std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl )
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index dee422c834d0..148eba130028 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -33,7 +33,7 @@
 #include <svx/svditer.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmshell.hxx>
@@ -1239,7 +1239,7 @@ SdrObjectUniquePtr FmXFormView::implCreateFieldControl( const svx::ODataAccessDe
 
 
         // determine the control type by examining the data type of the bound column
-        sal_uInt16 nOBJID = 0;
+        SdrObjKind nOBJID = OBJ_NONE;
         bool bDateNTimeField = false;
 
         bool bIsCurrency = false;
@@ -1384,7 +1384,7 @@ SdrObjectUniquePtr FmXFormView::implCreateXFormsControl( const svx::OXFormsDescr
 
 
         // The service name decides which control should be created
-        sal_uInt16 nOBJID = OBJ_FM_EDIT;
+        SdrObjKind nOBJID = OBJ_FM_EDIT;
         if(_rDesc.szServiceName == FM_SUN_COMPONENT_NUMERICFIELD)
             nOBJID = OBJ_FM_NUMERICFIELD;
         if(_rDesc.szServiceName == FM_SUN_COMPONENT_CHECKBOX)
@@ -1434,7 +1434,7 @@ SdrObjectUniquePtr FmXFormView::implCreateXFormsControl( const svx::OXFormsDescr
             // create a button control
             const MapMode& eTargetMode( pOutDev->GetMapMode() );
             const MapMode eSourceMode(MapUnit::Map100thMM);
-            const sal_uInt16 nObjID = OBJ_FM_BUTTON;
+            const SdrObjKind nObjID = OBJ_FM_BUTTON;
             ::Size controlSize(4000, 500);
             FmFormObj *pControl = static_cast<FmFormObj*>(
                 SdrObjFactory::MakeNewObject(
@@ -1469,10 +1469,9 @@ SdrObjectUniquePtr FmXFormView::implCreateXFormsControl( const svx::OXFormsDescr
     return nullptr;
 }
 
-
 bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
         const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
-        sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix,
+        SdrObjKind _nControlObjectID, const OUString& _rFieldPostfix,
         std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel,
         std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl,
         const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName,
@@ -1517,8 +1516,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int
 
 bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
     const Reference< XPropertySet >& _rxField,
-    const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
-    const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID,
+    const Reference< XNumberFormats >& _rxNumberFormats, SdrObjKind _nControlObjectID,
+    const OUString& _rFieldPostfix, SdrInventor _nInventor, SdrObjKind _nLabelObjectID,
     SdrModel& _rModel,
     std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl)
 {
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 4f7467f493ce..d53ec819a808 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -75,7 +75,7 @@ public:
     virtual void handlePageChange(SdrPage* pOldPage, SdrPage* pNewPage) override;
 
     SAL_DLLPRIVATE virtual SdrInventor GetObjInventor() const override;
-    SAL_DLLPRIVATE virtual sal_uInt16 GetObjIdentifier() const override;
+    SAL_DLLPRIVATE virtual SdrObjKind GetObjIdentifier() const override;
     SAL_DLLPRIVATE virtual void NbcReformatText() override;
 
     SAL_DLLPRIVATE virtual FmFormObj* CloneSdrObject(SdrModel& rTargetModel) const override;
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 278c4eda597b..3a1f254d51e5 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -248,10 +248,10 @@ private:
         sal_Int32 _nYOffsetMM,
         const css::uno::Reference< css::beans::XPropertySet >& _rxField,
         const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats,
-        sal_uInt16 _nControlObjectID,
+        SdrObjKind _nControlObjectID,
         const OUString& _rFieldPostfix,
         SdrInventor _nInventor,
-        sal_uInt16 _nLabelObjectID,
+        SdrObjKind _nLabelObjectID,
 
         // tdf#118963 Need a SdrModel for SdrObject creation. To make the
         // demand clear, hand over a SdrMldel&
@@ -267,7 +267,7 @@ private:
         sal_Int32 _nYOffsetMM,
         const css::uno::Reference< css::beans::XPropertySet >& _rxField,
         const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats,
-        sal_uInt16 _nControlObjectID,
+        SdrObjKind _nControlObjectID,
         const OUString& _rFieldPostfix,
         std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel,
         std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl,
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 141c2f4cf22a..47a7d405c6e5 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -181,7 +181,7 @@ namespace
         if(1 == rMarkList.GetMarkCount())
         {
             const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-            const SdrObjKind eKind(static_cast<SdrObjKind>(pObj->GetObjIdentifier()));
+            const SdrObjKind eKind(pObj->GetObjIdentifier());
 
             if((pObj->GetObjInventor() == SdrInventor::Default) && (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind))
             {
@@ -713,7 +713,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
         case 1:
         {
             const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
-            const SdrObjKind eKind(static_cast<SdrObjKind>(pObj->GetObjIdentifier()));
+            const SdrObjKind eKind(pObj->GetObjIdentifier());
 
             if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::Draw)
                || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::TextObject)
@@ -737,7 +737,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
             while(isNoEdge && rMarkList.GetMark(nMarkObj))
             {
                 const SdrObject* pObj = rMarkList.GetMark(nMarkObj)->GetMarkedSdrObj();
-                const SdrObjKind eKind(static_cast<SdrObjKind>(pObj->GetObjIdentifier()));
+                const SdrObjKind eKind(pObj->GetObjIdentifier());
 
                 if(((nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::Draw)
                   || nCombinedContext == CombinedEnumContext(Application::DrawImpress, Context::TextObject)
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index d5e9f8d08473..de4d6b0ef466 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -328,7 +328,7 @@ bool SdrCreateView::IsMeasureTool() const
     return meEditMode==SdrViewEditMode::Create && nCurrentInvent==SdrInventor::Default && (nCurrentIdent==OBJ_MEASURE);
 }
 
-void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent)
+void SdrCreateView::SetCurrentObj(SdrObjKind nIdent, SdrInventor nInvent)
 {
     if (nCurrentInvent!=nInvent || nCurrentIdent!=nIdent)
     {
@@ -365,7 +365,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, SdrInventor nInvent)
     ImpSetGlueVisible3(IsEdgeTool());
 }
 
-bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
+bool SdrCreateView::ImpBegCreateObj(SdrInventor nInvent, SdrObjKind nIdent, const Point& rPnt, OutputDevice* pOut,
     sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
 {
     bool bRet=false;
@@ -498,7 +498,7 @@ bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nM
 bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject)
 {
     SdrInventor nInvent(nCurrentInvent);
-    sal_uInt16 nIdent(nCurrentIdent);
+    SdrObjKind nIdent(nCurrentIdent);
 
     if(pPreparedFactoryObject)
     {
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index a9af1d278458..11b4401349b8 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1582,7 +1582,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
             {
                 SdrPathObj* pPath = new SdrPathObj(
                     pSrcPath->getSdrModelFromSdrObject(),
-                    static_cast<SdrObjKind>(pSrcPath->GetObjIdentifier()),
+                    pSrcPath->GetObjIdentifier(),
                     basegfx::B2DPolyPolygon(rCandidate));
                 ImpCopyAttributes(pSrcPath, pPath);
                 pLast = pPath;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 55674f28e8dd..d761998f540c 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1546,7 +1546,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
                 if (pTEObj->IsInserted() && bDelObj
                     && pTEObj->GetObjInventor() == SdrInventor::Default && !bDontDeleteReally)
                 {
-                    SdrObjKind eIdent = static_cast<SdrObjKind>(pTEObj->GetObjIdentifier());
+                    SdrObjKind eIdent = pTEObj->GetObjIdentifier();
                     if (eIdent == OBJ_TEXT)
                     {
                         pDelUndo = GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pTEObj);
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 4413d3d700fb..09976fa5b7b0 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1347,9 +1347,9 @@ void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     }
 }
 
-sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const
+SdrObjKind SdrObjCustomShape::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_CUSTOMSHAPE);
+    return OBJ_CUSTOMSHAPE;
 }
 
 // #115391# This implementation is based on the TextFrame size of the CustomShape and the
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 90ae586775ef..638c590a52cd 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -555,9 +555,9 @@ SdrInventor SdrObject::GetObjInventor()   const
     return SdrInventor::Default;
 }
 
-sal_uInt16 SdrObject::GetObjIdentifier() const
+SdrObjKind SdrObject::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_NONE);
+    return OBJ_NONE;
 }
 
 void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
@@ -3041,7 +3041,7 @@ void SdrObject::MakeNameUnique(std::unordered_set<OUString>& rNameSet)
     SetName(sName);
 }
 
-SdrObject* SdrObjFactory::CreateObjectFromFactory(SdrModel& rSdrModel, SdrInventor nInventor, sal_uInt16 nObjIdentifier)
+SdrObject* SdrObjFactory::CreateObjectFromFactory(SdrModel& rSdrModel, SdrInventor nInventor, SdrObjKind nObjIdentifier)
 {
     SdrObjCreatorParams aParams { nInventor, nObjIdentifier, rSdrModel };
     for (const auto & i : ImpGetUserMakeObjHdl()) {
@@ -3056,7 +3056,7 @@ SdrObject* SdrObjFactory::CreateObjectFromFactory(SdrModel& rSdrModel, SdrInvent
 SdrObject* SdrObjFactory::MakeNewObject(
     SdrModel& rSdrModel,
     SdrInventor nInventor,
-    sal_uInt16 nIdentifier,
+    SdrObjKind nIdentifier,
     const tools::Rectangle* pSnapRect)
 {
     SdrObject* pObj(nullptr);
@@ -3116,7 +3116,7 @@ SdrObject* SdrObjFactory::MakeNewObject(
                 {
                     pObj = new SdrRectObj(
                         rSdrModel,
-                        static_cast<SdrObjKind>(nIdentifier),
+                        nIdentifier,
                         *pSnapRect);
                     bSetSnapRect = false;
                 }
@@ -3124,7 +3124,7 @@ SdrObject* SdrObjFactory::MakeNewObject(
                 {
                     pObj = new SdrRectObj(
                         rSdrModel,
-                        static_cast<SdrObjKind>(nIdentifier));
+                        nIdentifier);
                 }
             }
             break;
@@ -3133,7 +3133,7 @@ SdrObject* SdrObjFactory::MakeNewObject(
             case OBJ_CARC:
             case OBJ_CCUT:
             {
-                SdrCircKind eCircKind = ToSdrCircKind(static_cast<SdrObjKind>(nIdentifier));
+                SdrCircKind eCircKind = ToSdrCircKind(nIdentifier);
                 if(nullptr != pSnapRect)
                 {
                     pObj = new SdrCircObj(rSdrModel, eCircKind, *pSnapRect);
@@ -3145,29 +3145,30 @@ SdrObject* SdrObjFactory::MakeNewObject(
                 }
             }
             break;
-            case sal_uInt16(OBJ_NONE       ): pObj=new SdrObject(rSdrModel);                   break;
-            case sal_uInt16(OBJ_GRUP       ): pObj=new SdrObjGroup(rSdrModel);                 break;
-            case sal_uInt16(OBJ_POLY       ): pObj=new SdrPathObj(rSdrModel, OBJ_POLY       ); break;
-            case sal_uInt16(OBJ_PLIN       ): pObj=new SdrPathObj(rSdrModel, OBJ_PLIN       ); break;
-            case sal_uInt16(OBJ_PATHLINE   ): pObj=new SdrPathObj(rSdrModel, OBJ_PATHLINE   ); break;
-            case sal_uInt16(OBJ_PATHFILL   ): pObj=new SdrPathObj(rSdrModel, OBJ_PATHFILL   ); break;
-            case sal_uInt16(OBJ_FREELINE   ): pObj=new SdrPathObj(rSdrModel, OBJ_FREELINE   ); break;
-            case sal_uInt16(OBJ_FREEFILL   ): pObj=new SdrPathObj(rSdrModel, OBJ_FREEFILL   ); break;
-            case sal_uInt16(OBJ_PATHPOLY   ): pObj=new SdrPathObj(rSdrModel, OBJ_POLY       ); break;
-            case sal_uInt16(OBJ_PATHPLIN   ): pObj=new SdrPathObj(rSdrModel, OBJ_PLIN       ); break;
-            case sal_uInt16(OBJ_EDGE       ): pObj=new SdrEdgeObj(rSdrModel);                  break;
-            case sal_uInt16(OBJ_RECT       ): pObj=new SdrRectObj(rSdrModel);                  break;
-            case sal_uInt16(OBJ_GRAF       ): pObj=new SdrGrafObj(rSdrModel);                  break;
-            case sal_uInt16(OBJ_OLE2       ): pObj=new SdrOle2Obj(rSdrModel);                  break;
-            case sal_uInt16(OBJ_FRAME      ): pObj=new SdrOle2Obj(rSdrModel, true);            break;
-            case sal_uInt16(OBJ_CAPTION    ): pObj=new SdrCaptionObj(rSdrModel);               break;
-            case sal_uInt16(OBJ_PAGE       ): pObj=new SdrPageObj(rSdrModel);                  break;
-            case sal_uInt16(OBJ_UNO        ): pObj=new SdrUnoObj(rSdrModel, OUString());       break;
-            case sal_uInt16(OBJ_CUSTOMSHAPE  ): pObj=new SdrObjCustomShape(rSdrModel);       break;
+            case OBJ_NONE       : pObj=new SdrObject(rSdrModel);                   break;
+            case OBJ_GRUP       : pObj=new SdrObjGroup(rSdrModel);                 break;
+            case OBJ_POLY       : pObj=new SdrPathObj(rSdrModel, OBJ_POLY       ); break;
+            case OBJ_PLIN       : pObj=new SdrPathObj(rSdrModel, OBJ_PLIN       ); break;
+            case OBJ_PATHLINE   : pObj=new SdrPathObj(rSdrModel, OBJ_PATHLINE   ); break;
+            case OBJ_PATHFILL   : pObj=new SdrPathObj(rSdrModel, OBJ_PATHFILL   ); break;
+            case OBJ_FREELINE   : pObj=new SdrPathObj(rSdrModel, OBJ_FREELINE   ); break;
+            case OBJ_FREEFILL   : pObj=new SdrPathObj(rSdrModel, OBJ_FREEFILL   ); break;
+            case OBJ_PATHPOLY   : pObj=new SdrPathObj(rSdrModel, OBJ_POLY       ); break;
+            case OBJ_PATHPLIN   : pObj=new SdrPathObj(rSdrModel, OBJ_PLIN       ); break;
+            case OBJ_EDGE       : pObj=new SdrEdgeObj(rSdrModel);                  break;
+            case OBJ_RECT       : pObj=new SdrRectObj(rSdrModel);                  break;
+            case OBJ_GRAF       : pObj=new SdrGrafObj(rSdrModel);                  break;
+            case OBJ_OLE2       : pObj=new SdrOle2Obj(rSdrModel);                  break;
+            case OBJ_FRAME      : pObj=new SdrOle2Obj(rSdrModel, true);            break;
+            case OBJ_CAPTION    : pObj=new SdrCaptionObj(rSdrModel);               break;
+            case OBJ_PAGE       : pObj=new SdrPageObj(rSdrModel);                  break;
+            case OBJ_UNO        : pObj=new SdrUnoObj(rSdrModel, OUString());       break;
+            case OBJ_CUSTOMSHAPE: pObj=new SdrObjCustomShape(rSdrModel);       break;
 #if HAVE_FEATURE_AVMEDIA
-            case sal_uInt16(OBJ_MEDIA      ): pObj=new SdrMediaObj(rSdrModel);               break;
+            case OBJ_MEDIA      : pObj=new SdrMediaObj(rSdrModel);               break;
 #endif
-            case sal_uInt16(OBJ_TABLE      ): pObj=new sdr::table::SdrTableObj(rSdrModel);   break;
+            case OBJ_TABLE      : pObj=new sdr::table::SdrTableObj(rSdrModel);   break;
+            default: break;
         }
     }
 
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 29819052cdb4..1773901490e3 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -225,9 +225,9 @@ void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrCaptionObj::GetObjIdentifier() const
+SdrObjKind SdrCaptionObj::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_CAPTION);
+    return OBJ_CAPTION;
 }
 
 SdrCaptionObj* SdrCaptionObj::CloneSdrObject(SdrModel& rTargetModel) const
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index ec8b177550f0..47e03148a5fd 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -167,7 +167,7 @@ void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrCircObj::GetObjIdentifier() const
+SdrObjKind SdrCircObj::GetObjIdentifier() const
 {
     switch (meCircleKind)
     {
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 0e16e33b41c2..f1395767cd29 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -367,9 +367,9 @@ void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrEdgeObj::GetObjIdentifier() const
+SdrObjKind SdrEdgeObj::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_EDGE);
+    return OBJ_EDGE;
 }
 
 const tools::Rectangle& SdrEdgeObj::GetCurrentBoundRect() const
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 2359380c95e0..37a07321441e 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -534,9 +534,9 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrGrafObj::GetObjIdentifier() const
+SdrObjKind SdrGrafObj::GetObjIdentifier() const
 {
-    return sal_uInt16( OBJ_GRAF );
+    return OBJ_GRAF;
 }
 
 void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic )
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 7c32abb35cc0..b78a02cdfafe 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -121,19 +121,17 @@ void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     }
 }
 
-
 void SdrObjGroup::SetBoundRectDirty()
 {
     // avoid resetting aOutRect which in case of this object is model data,
     // not re-creatable view data
 }
 
-sal_uInt16 SdrObjGroup::GetObjIdentifier() const
+SdrObjKind SdrObjGroup::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_GRUP);
+    return OBJ_GRUP;
 }
 
-
 SdrLayerID SdrObjGroup::GetLayer() const
 {
     bool b1st = true;
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 30f9e32ee482..4bbfb61ea289 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -243,9 +243,9 @@ void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = LineGeometryUsageIsNecessary();
 }
 
-sal_uInt16 SdrMeasureObj::GetObjIdentifier() const
+SdrObjKind SdrMeasureObj::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_MEASURE);
+    return OBJ_MEASURE;
 }
 
 struct ImpMeasureRec : public SdrDragStatUserData
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 19f04554a246..42c7a6c59c8d 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -102,9 +102,9 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
     rInfo.bCanConvToPolyLineToArea = false;
 }
 
-sal_uInt16 SdrMediaObj::GetObjIdentifier() const
+SdrObjKind SdrMediaObj::GetObjIdentifier() const
 {
-    return sal_uInt16( OBJ_MEDIA );
+    return OBJ_MEDIA;
 }
 
 OUString SdrMediaObj::TakeObjNameSingul() const
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 83267133ac55..23eb06465e87 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1343,9 +1343,9 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = true;
 }
 
-sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
+SdrObjKind SdrOle2Obj::GetObjIdentifier() const
 {
-    return mpImpl->mbFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2);
+    return mpImpl->mbFrame ? OBJ_FRAME : OBJ_OLE2;
 }
 
 OUString SdrOle2Obj::TakeObjNameSingul() const
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 9b48e34436ef..f57dd7dd5e4d 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -123,9 +123,9 @@ void SdrPageObj::SetBoundRectDirty()
     // not re-creatable view data
 }
 
-sal_uInt16 SdrPageObj::GetObjIdentifier() const
+SdrObjKind SdrPageObj::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_PAGE);
+    return OBJ_PAGE;
 }
 
 void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 2ba5f7436781..a26aaec73210 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1248,11 +1248,11 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
     XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
     if (pView!=nullptr && pView->IsCreateMode()) {
         // switch to different CreateTool, if appropriate
-        sal_uInt16 nIdent;
+        SdrObjKind nIdent;
         SdrInventor nInvent;
         pView->TakeCurrentObj(nIdent,nInvent);
-        if (nInvent==SdrInventor::Default && pU->eCurrentKind!=static_cast<SdrObjKind>(nIdent)) {
-            SdrObjKind eNewKind=static_cast<SdrObjKind>(nIdent);
+        if (nInvent==SdrInventor::Default && pU->eCurrentKind != nIdent) {
+            SdrObjKind eNewKind = nIdent;
             switch (eNewKind) {
                 case OBJ_CARC:
                 case OBJ_CIRC:
@@ -1810,9 +1810,9 @@ void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrPathObj::GetObjIdentifier() const
+SdrObjKind SdrPathObj::GetObjIdentifier() const
 {
-    return sal_uInt16(meKind);
+    return meKind;
 }
 
 SdrPathObj* SdrPathObj::CloneSdrObject(SdrModel& rTargetModel) const
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index e2a78f35aaa1..c3a2a66c8483 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -161,10 +161,10 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrRectObj::GetObjIdentifier() const
+SdrObjKind SdrRectObj::GetObjIdentifier() const
 {
-    if (IsTextFrame()) return sal_uInt16(eTextKind);
-    else return sal_uInt16(OBJ_RECT);
+    if (IsTextFrame()) return eTextKind;
+    else return OBJ_RECT;
 }
 
 void SdrRectObj::TakeUnrotatedSnapRect(tools::Rectangle& rRect) const
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b7450c83a44d..e58c5f89d629 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -412,9 +412,9 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
 }
 
-sal_uInt16 SdrTextObj::GetObjIdentifier() const
+SdrObjKind SdrTextObj::GetObjIdentifier() const
 {
-    return sal_uInt16(eTextKind);
+    return eTextKind;
 }
 
 bool SdrTextObj::HasTextImpl( SdrOutliner const * pOutliner )
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 0116ee8f3992..95c73228e64e 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -205,9 +205,9 @@ void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = false;
 }
 
-sal_uInt16 SdrUnoObj::GetObjIdentifier() const
+SdrObjKind SdrUnoObj::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_UNO);
+    return OBJ_UNO;
 }
 
 void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index eba2814f6c28..9a1957c628f4 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -88,7 +88,7 @@ SdrInventor SdrVirtObj::GetObjInventor() const
     return rRefObj.GetObjInventor();
 }
 
-sal_uInt16 SdrVirtObj::GetObjIdentifier() const
+SdrObjKind SdrVirtObj::GetObjIdentifier() const
 {
     return rRefObj.GetObjIdentifier();
 }
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 8eec244b8fcc..53e6133ac6de 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1450,10 +1450,9 @@ void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = false;
 }
 
-
-sal_uInt16 SdrTableObj::GetObjIdentifier() const
+SdrObjKind SdrTableObj::GetObjIdentifier() const
 {
-    return static_cast<sal_uInt16>(OBJ_TABLE);
+    return OBJ_TABLE;
 }
 
 void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, tools::Rectangle& rTextRect, bool bNoEditText, tools::Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 0e3ce64a4166..27651bc95e70 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -43,7 +43,7 @@
 #include <svx/unopage.hxx>
 #include "shapeimpl.hxx"
 #include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unoapi.hxx>
 #include <extrud3d.hxx>
@@ -498,7 +498,7 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
 
 SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xShape)
 {
-    sal_uInt16 nType = 0;
+    SdrObjKind nType = OBJ_NONE;
     SdrInventor nInventor;
 
     GetTypeAndInventor( nType, nInventor, xShape->getShapeType() );
@@ -566,7 +566,7 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS
     return pNewObj;
 }
 
-void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor, const OUString& aName ) throw()
+void SvxDrawPage::GetTypeAndInventor( SdrObjKind& rType, SdrInventor& rInventor, const OUString& aName ) throw()
 {
     sal_uInt32 nTempType = UHashMap::getId( aName );
 
@@ -589,12 +589,12 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor,
     else if(nTempType & E3D_INVENTOR_FLAG)
     {
         rInventor = SdrInventor::E3d;
-        rType = static_cast<sal_uInt16>(nTempType & ~E3D_INVENTOR_FLAG);
+        rType = static_cast<SdrObjKind>(nTempType & ~E3D_INVENTOR_FLAG);
     }
     else
     {
         rInventor = SdrInventor::Default;
-        rType = static_cast<sal_uInt16>(nTempType);
+        rType = static_cast<SdrObjKind>(nTempType);
 
         switch( rType )
         {
@@ -603,6 +603,8 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, SdrInventor& rInventor,
             case OBJ_OLE2_APPLET:
                 rType = OBJ_OLE2;
                 break;
+            default:
+                break;
         }
     }
 }
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index dcb8d61e8334..c6a6ab7ada94 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -38,7 +38,7 @@
 #include <svx/unoshprp.hxx>
 #include <svx/svx3ditems.hxx>
 #include <svx/svxids.hrc>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/strings.hrc>
 #include <strings.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index c7b0b6de609b..1ff2d3e03e9d 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1132,6 +1132,7 @@ drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const
             case OBJ_PATHFILL:  aRetval = drawing::PolygonKind_PATHFILL; break;
             case OBJ_FREELINE:  aRetval = drawing::PolygonKind_FREELINE; break;
             case OBJ_FREEFILL:  aRetval = drawing::PolygonKind_FREEFILL; break;
+            default: break;
         }
     }
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 9fbb60dbc55e..b60c6e686aea 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -43,7 +43,7 @@
 #include <svx/xlnstit.hxx>
 #include <svx/xlnedit.hxx>
 #include <svx/svdmodel.hxx>
-#include <svx/globl3d.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/unopage.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unoshtxt.hxx>
@@ -1120,6 +1120,8 @@ static bool svx_needLogicRectHack( SdrObject const * pObj )
         case OBJ_PATHPLIN:
         case OBJ_MEASURE:
             return true;
+        default:
+            break;
         }
     }
     return false;
@@ -1961,6 +1963,8 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet const & aSet, const SfxItemProperty
             case OBJ_SECT:          // sector
                 eKind = drawing::CircleKind_SECTION;
                 break;
+            default:
+                break;
             }
             aAny <<= eKind;
         }