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>

19 files changed, 66 insertions, 67 deletions

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();
 }