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>

16 files changed, 87 insertions, 99 deletions

diff --git a/reportdesign/IwyuFilter_reportdesign.yaml b/reportdesign/IwyuFilter_reportdesign.yaml
index df8d5db20e36..49d95b6f0143 100644
--- a/reportdesign/IwyuFilter_reportdesign.yaml
+++ b/reportdesign/IwyuFilter_reportdesign.yaml
@@ -1,9 +1,6 @@
 ---
 assumeFilename: reportdesign/source/ui/report/ReportController.cxx
 excludelist:
-    reportdesign/inc/RptDef.hxx:
-    # Needed for macro define
-    - svx/fmglob.hxx
     reportdesign/source/core/api/FormatCondition.cxx:
     # Needed for COL_TRANSPARENT in REPORTCONTROLFORMAT_IMPL
     - tools/color.hxx
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index fab7f9df7a57..f2dd5952684a 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -28,7 +28,7 @@
 #include "dllapi.h"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-#include <svx/fmglob.hxx>
+#include <svx/svdobjkind.hxx>
 #include <svx/svdtypes.hxx>
 
 namespace com::sun::star {
@@ -45,15 +45,6 @@ constexpr SdrLayerID RPT_LAYER_FRONT  (0);
 constexpr SdrLayerID RPT_LAYER_BACK   (1);
 constexpr SdrLayerID RPT_LAYER_HIDDEN (2);
 
-
-
-#define OBJ_DLG_FIXEDTEXT       (sal_uInt16(OBJ_MAXI) + 1)
-#define OBJ_DLG_IMAGECONTROL    OBJ_FM_IMAGECONTROL
-#define OBJ_DLG_FORMATTEDFIELD  (sal_uInt16(OBJ_MAXI) + 3)
-#define OBJ_DLG_HFIXEDLINE      (sal_uInt16(OBJ_MAXI) + 4)
-#define OBJ_DLG_VFIXEDLINE      (sal_uInt16(OBJ_MAXI) + 5)
-#define OBJ_DLG_SUBREPORT       (sal_uInt16(OBJ_MAXI) + 6)
-
 // allows the alignment and resizing of controls
 enum class ControlModification
 {
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 652ae055af8c..fa2c7c3890ed 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -114,7 +114,7 @@ public:
     static SdrObject* createObject(
         SdrModel& rTargetModel,
         const css::uno::Reference< css::report::XReportComponent>& _xComponent);
-    static sal_uInt16 getObjectType(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
+    static SdrObjKind getObjectType(const css::uno::Reference< css::report::XReportComponent>& _xComponent);
 };
 
 // OCustomShape
@@ -139,7 +139,7 @@ public:
     virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
 
     virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
-    virtual sal_uInt16 GetObjIdentifier() const override;
+    virtual SdrObjKind GetObjIdentifier() const override;
     virtual SdrInventor GetObjInventor() const override;
 
 private:
@@ -176,7 +176,7 @@ public:
     static OOle2Obj* Create(
         SdrModel& rSdrModel,
         const css::uno::Reference< css::report::XReportComponent>& _xComponent,
-        sal_uInt16 _nType)
+        SdrObjKind _nType)
     {
         return new OOle2Obj(rSdrModel, _xComponent, _nType);
     }
@@ -184,7 +184,7 @@ public:
     virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent() override;
 
     virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
-    virtual sal_uInt16 GetObjIdentifier() const override;
+    virtual SdrObjKind GetObjIdentifier() const override;
     virtual SdrInventor GetObjInventor() const override;
     // Clone() should make a complete copy of the object.
     virtual OOle2Obj* CloneSdrObject(SdrModel& rTargetModel) const override;
@@ -198,11 +198,11 @@ private:
     OOle2Obj(
         SdrModel& rSdrModel,
         const css::uno::Reference< css::report::XReportComponent>& _xComponent,
-        sal_uInt16 _nType);
+        SdrObjKind _nType);
     OOle2Obj(
         SdrModel& rSdrModel,
         const OUString& _sComponentName,
-        sal_uInt16 _nType);
+        SdrObjKind _nType);
 
     virtual void NbcMove( const Size& rSize ) override;
     virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
@@ -214,7 +214,7 @@ private:
     void impl_createDataProvider_nothrow( const css::uno::Reference< css::frame::XModel>& _xModel);
     virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override;
 
-    sal_uInt16 m_nType;
+    SdrObjKind m_nType;
     bool    m_bOnlyOnce;
 };
 
@@ -227,7 +227,7 @@ class REPORTDESIGN_DLLPUBLIC OUnoObject: public SdrUnoObj , public OObjectBase
     friend class OObjectBase;
     friend class DlgEdFactory;
 
-    sal_uInt16   m_nObjectType;
+    SdrObjKind m_nObjectType;
     // tdf#118730 remember if this object was created interactively (due to ::EndCreate being called)
     bool         m_bSetDefaultLabel;
 
@@ -235,12 +235,12 @@ protected:
     OUnoObject(SdrModel& rSdrModel,
         const OUString& _sComponentName,
         const OUString& rModelName,
-        sal_uInt16   _nObjectType);
+        SdrObjKind _nObjectType);
     OUnoObject(
         SdrModel& rSdrModel,
         const css::uno::Reference< css::report::XReportComponent>& _xComponent,
         const OUString& rModelName,
-        sal_uInt16 _nObjectType);
+        SdrObjKind _nObjectType);
 
     // protected destructor
     virtual ~OUnoObject() override;
@@ -266,7 +266,7 @@ public:
     static OUString GetDefaultName(const OUnoObject* _pObj);
 
     virtual css::uno::Reference< css::uno::XInterface > getUnoShape() override;
-    virtual sal_uInt16 GetObjIdentifier() const override;
+    virtual SdrObjKind GetObjIdentifier() const override;
     virtual SdrInventor GetObjInventor() const override;
     virtual OUnoObject* CloneSdrObject(SdrModel& rTargetModel) const override;
 
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index e3053e57fe4c..5c8da47c1cc6 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -78,14 +78,14 @@ uno::Reference< drawing::XShape >  OReportDrawPage::CreateShape( SdrObject *pObj
         if (dynamic_cast< const OUnoObject* >(pObj) != nullptr)
         {
             OUnoObject& rUnoObj = dynamic_cast<OUnoObject&>(*pObj);
-            if (rUnoObj.GetObjIdentifier() == OBJ_DLG_FIXEDTEXT)
+            if (rUnoObj.GetObjIdentifier() == OBJ_RD_FIXEDTEXT)
             {
                 uno::Reference<beans::XPropertySet> xControlModel(rUnoObj.GetUnoControlModel(),uno::UNO_QUERY);
                 if ( xControlModel.is() )
                     xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(true));
             }
             else
-                bChangeOrientation = rUnoObj.GetObjIdentifier() == OBJ_DLG_HFIXEDLINE;
+                bChangeOrientation = rUnoObj.GetObjIdentifier() == OBJ_RD_HFIXEDLINE;
             SvxShapeControl* pShape = new SvxShapeControl( pObj );
             xShape = static_cast<SvxShape_UnoImplHelper *>(pShape);
             pShape->setShapeKind(pObj->GetObjIdentifier());
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index df0062753b6f..427bf45aa16a 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -58,32 +58,32 @@ using namespace reportdesign;
 using namespace container;
 using namespace report;
 
-sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportComponent>& _xComponent)
+SdrObjKind OObjectBase::getObjectType(const uno::Reference< report::XReportComponent>& _xComponent)
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( _xComponent , uno::UNO_QUERY );
     OSL_ENSURE(xServiceInfo.is(),"Who deletes the XServiceInfo interface!");
     if ( xServiceInfo.is() )
     {
         if ( xServiceInfo->supportsService( SERVICE_FIXEDTEXT ))
-            return OBJ_DLG_FIXEDTEXT;
+            return OBJ_RD_FIXEDTEXT;
         if ( xServiceInfo->supportsService( SERVICE_FIXEDLINE ))
         {
             uno::Reference< report::XFixedLine> xFixedLine(_xComponent,uno::UNO_QUERY);
-            return xFixedLine->getOrientation() ? OBJ_DLG_HFIXEDLINE : OBJ_DLG_VFIXEDLINE;
+            return xFixedLine->getOrientation() ? OBJ_RD_HFIXEDLINE : OBJ_RD_VFIXEDLINE;
         }
         if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL))
-            return OBJ_DLG_IMAGECONTROL;
+            return OBJ_RD_IMAGECONTROL;
         if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD ))
-            return OBJ_DLG_FORMATTEDFIELD;
+            return OBJ_RD_FORMATTEDFIELD;
         if ( xServiceInfo->supportsService("com.sun.star.drawing.OLE2Shape") )
             return OBJ_OLE2;
         if ( xServiceInfo->supportsService( SERVICE_SHAPE ))
             return OBJ_CUSTOMSHAPE;
         if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) )
-            return OBJ_DLG_SUBREPORT;
+            return OBJ_RD_SUBREPORT;
         return OBJ_OLE2;
     }
-    return 0;
+    return OBJ_NONE;
 }
 
 SdrObject* OObjectBase::createObject(
@@ -91,16 +91,16 @@ SdrObject* OObjectBase::createObject(
     const uno::Reference< report::XReportComponent>& _xComponent)
 {
     SdrObject* pNewObj = nullptr;
-    sal_uInt16 nType = OObjectBase::getObjectType(_xComponent);
+    SdrObjKind nType = OObjectBase::getObjectType(_xComponent);
     switch( nType )
     {
-        case OBJ_DLG_FIXEDTEXT:
+        case OBJ_RD_FIXEDTEXT:
             {
                 OUnoObject* pUnoObj = new OUnoObject(
                     rTargetModel,
                     _xComponent,
                     OUString("com.sun.star.form.component.FixedText"),
-                    OBJ_DLG_FIXEDTEXT);
+                    OBJ_RD_FIXEDTEXT);
                 pNewObj = pUnoObj;
 
                 uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY);
@@ -108,22 +108,22 @@ SdrObject* OObjectBase::createObject(
                     xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(true));
             }
             break;
-        case OBJ_DLG_IMAGECONTROL:
+        case OBJ_RD_IMAGECONTROL:
             pNewObj = new OUnoObject(
                 rTargetModel,
                 _xComponent,
                 OUString("com.sun.star.form.component.DatabaseImageControl"),
-                OBJ_DLG_IMAGECONTROL);
+                OBJ_RD_IMAGECONTROL);
             break;
-        case OBJ_DLG_FORMATTEDFIELD:
+        case OBJ_RD_FORMATTEDFIELD:
             pNewObj = new OUnoObject(
                 rTargetModel,
                 _xComponent,
                 OUString("com.sun.star.form.component.FormattedField"),
-                OBJ_DLG_FORMATTEDFIELD);
+                OBJ_RD_FORMATTEDFIELD);
             break;
-        case OBJ_DLG_HFIXEDLINE:
-        case OBJ_DLG_VFIXEDLINE:
+        case OBJ_RD_HFIXEDLINE:
+        case OBJ_RD_VFIXEDLINE:
             pNewObj = new OUnoObject(
                 rTargetModel,
                 _xComponent,
@@ -145,7 +145,7 @@ SdrObject* OObjectBase::createObject(
                 DBG_UNHANDLED_EXCEPTION("reportdesign");
             }
             break;
-        case OBJ_DLG_SUBREPORT:
+        case OBJ_RD_SUBREPORT:
         case OBJ_OLE2:
             pNewObj = OOle2Obj::Create(
                 rTargetModel,
@@ -227,7 +227,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
 {
     switch(_nObjectId)
     {
-        case OBJ_DLG_IMAGECONTROL:
+        case OBJ_RD_IMAGECONTROL:
             {
                 static TPropertyNamePair s_aNameMap = [&]()
                 {
@@ -241,7 +241,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                 return s_aNameMap;
             }
 
-        case OBJ_DLG_FIXEDTEXT:
+        case OBJ_RD_FIXEDTEXT:
             {
                 static TPropertyNamePair s_aNameMap = [&]()
                 {
@@ -263,7 +263,7 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
                 }();
                 return s_aNameMap;
             }
-        case OBJ_DLG_FORMATTEDFIELD:
+        case OBJ_RD_FORMATTEDFIELD:
             {
                 static TPropertyNamePair s_aNameMap = [&]()
                 {
@@ -476,9 +476,9 @@ OCustomShape::~OCustomShape()
 {
 }
 
-sal_uInt16 OCustomShape::GetObjIdentifier() const
+SdrObjKind OCustomShape::GetObjIdentifier() const
 {
-    return sal_uInt16(OBJ_CUSTOMSHAPE);
+    return OBJ_CUSTOMSHAPE;
 }
 
 SdrInventor OCustomShape::GetObjInventor() const
@@ -574,7 +574,7 @@ OUnoObject::OUnoObject(
     SdrModel& rSdrModel,
     const OUString& _sComponentName,
     const OUString& rModelName,
-    sal_uInt16 _nObjectType)
+    SdrObjKind _nObjectType)
 :   SdrUnoObj(rSdrModel, rModelName)
     ,OObjectBase(_sComponentName)
     ,m_nObjectType(_nObjectType)
@@ -589,7 +589,7 @@ OUnoObject::OUnoObject(
     SdrModel& rSdrModel,
     const uno::Reference< report::XReportComponent>& _xComponent,
     const OUString& rModelName,
-    sal_uInt16 _nObjectType)
+    SdrObjKind _nObjectType)
 :   SdrUnoObj(rSdrModel, rModelName)
     ,OObjectBase(_xComponent)
     ,m_nObjectType(_nObjectType)
@@ -625,7 +625,7 @@ void OUnoObject::impl_initializeModel_nothrow()
     }
 }
 
-sal_uInt16 OUnoObject::GetObjIdentifier() const
+SdrObjKind OUnoObject::GetObjIdentifier() const
 {
     return m_nObjectType;
 }
@@ -907,7 +907,7 @@ OUnoObject& OUnoObject::operator=(const OUnoObject& rObj)
 OOle2Obj::OOle2Obj(
     SdrModel& rSdrModel,
     const uno::Reference< report::XReportComponent>& _xComponent,
-    sal_uInt16 _nType)
+    SdrObjKind _nType)
 :   SdrOle2Obj(rSdrModel)
     ,OObjectBase(_xComponent)
     ,m_nType(_nType)
@@ -920,7 +920,7 @@ OOle2Obj::OOle2Obj(
 OOle2Obj::OOle2Obj(
     SdrModel& rSdrModel,
     const OUString& _sComponentName,
-    sal_uInt16 _nType)
+    SdrObjKind _nType)
 :   SdrOle2Obj(rSdrModel)
     ,OObjectBase(_sComponentName)
     ,m_nType(_nType)
@@ -933,7 +933,7 @@ OOle2Obj::~OOle2Obj()
 {
 }
 
-sal_uInt16 OOle2Obj::GetObjIdentifier() const
+SdrObjKind OOle2Obj::GetObjIdentifier() const
 {
     return m_nType;
 }
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 60ee506da7f7..15a7d2ed25b8 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -61,7 +61,7 @@ namespace rptui
         std::shared_ptr<ONavigator>         m_xReportExplorer;
         Idle                                m_aMarkIdle;
         DlgEdMode                           m_eMode;
-        sal_uInt16                          m_eActObj;
+        SdrObjKind                          m_eActObj;
         Size                                m_aGridSizeCoarse;
         Size                                m_aGridSizeFine;
         bool                                m_bDeleted;
@@ -97,8 +97,8 @@ namespace rptui
         OReportController&   getController() const { return m_rReportController; }
 
         void            SetMode( DlgEdMode m_eMode );
-        void            SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
-        sal_uInt16          GetInsertObj() const { return m_eActObj;}
+        void            SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType = OUString());
+        SdrObjKind      GetInsertObj() const { return m_eActObj;}
         OUString const &    GetInsertObjString() const;
         DlgEdMode       GetMode() const { return m_eMode; }
 
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 06ee94c3bd49..326c5ff0308c 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -126,7 +126,7 @@ namespace rptui
         * \param _xSection the section where to create the formatted field
         * \param _sFunction the function which will be set at the data field.
         */
-        void createControl(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs,const css::uno::Reference< css::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD);
+        void createControl(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs,const css::uno::Reference< css::report::XSection>& _xSection,const OUString& _sFunction ,SdrObjKind _nObjectId = OBJ_RD_FORMATTEDFIELD);
         /** switch the report header/footer sectionon off with undo or without depending on the given id.
         *
         * \param _nId   Can either be SID_REPORTHEADER_WITHOUT_UNDO or SID_REPORTFOOTER_WITHOUT_UNDO or SID_REPORTHEADERFOOTER.
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index d794a33f13a4..c634dcf098f4 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -74,7 +74,7 @@ namespace rptui
         OScrollWindowHelper* getScrollWindow() const { return m_pParent; }
 
         void            SetMode( DlgEdMode m_eMode );
-        void            SetInsertObj( sal_uInt16 eObj, const OUString& _sShapeType);
+        void            SetInsertObj(SdrObjKind eObj, const OUString& _sShapeType);
         OUString const & GetInsertObjString() const;
         void            setGridSnap(bool bOn);
         void            setDragStripes(bool bOn);
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index c166e1f759d5..eab5c7dd3b8b 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -84,7 +84,7 @@ namespace rptui
 
         // forwards
         void                    SetMode( DlgEdMode _eMode );
-        void                    SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType);
+        void                    SetInsertObj(SdrObjKind eObj, const OUString& _sShapeType);
         OUString const &        GetInsertObjString() const;
         void                    setGridSnap(bool bOn);
         void                    setDragStripes(bool bOn);
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index e03ff63648df..c270aae409fc 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -148,7 +148,7 @@ namespace rptui
 
         bool     empty() const { return m_aSections.empty(); }
         void            SetMode( DlgEdMode m_eMode );
-        void            SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType);
+        void            SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType);
         const OUString& GetInsertObjString() const { return m_sShapeType;}
         /** copies the current selection in this section
         */
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index dc85e34acd2d..e4eb5f653659 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -289,7 +289,7 @@ void ODesignView::SetMode( DlgEdMode _eNewMode )
     m_aScrollWindow->SetMode(_eNewMode);
 }
 
-void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void ODesignView::SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType )
 {
     m_eActObj = eObj;
     m_aScrollWindow->SetInsertObj( eObj,_sShapeType );
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 0c2ba10ea590..cae05f329d5a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -600,23 +600,23 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
             break;
         case SID_FM_FIXEDTEXT:
             aReturn.bEnabled = isEditable();
-            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_FIXEDTEXT;
+            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_FIXEDTEXT;
             break;
         case SID_INSERT_HFIXEDLINE:
             aReturn.bEnabled = isEditable();
-            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_HFIXEDLINE;
+            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_HFIXEDLINE;
             break;
         case SID_INSERT_VFIXEDLINE:
             aReturn.bEnabled = isEditable();
-            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_VFIXEDLINE;
+            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_VFIXEDLINE;
             break;
         case SID_FM_EDIT:
             aReturn.bEnabled = isEditable();
-            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_FORMATTEDFIELD;
+            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_FORMATTEDFIELD;
             break;
         case SID_FM_IMAGECONTROL:
             aReturn.bEnabled = isEditable();
-            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_IMAGECONTROL;
+            aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_IMAGECONTROL;
             break;
         case SID_DRAWTBX_CS_BASIC:
         case SID_DRAWTBX_CS_BASIC1:
@@ -1116,10 +1116,10 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
             InvalidateFeature( SID_OBJECT_SELECT );
             break;
         case SID_SELECT_ALL_EDITS:
-            getDesignView()->SelectAll(OBJ_DLG_FORMATTEDFIELD);
+            getDesignView()->SelectAll(OBJ_RD_FORMATTEDFIELD);
             break;
         case SID_SELECT_ALL_LABELS:
-            getDesignView()->SelectAll(OBJ_DLG_FIXEDTEXT);
+            getDesignView()->SelectAll(OBJ_RD_FIXEDTEXT);
             break;
         case SID_TERMINATE_INPLACEACTIVATION:
             {
@@ -1200,31 +1200,31 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
             break;
         case SID_FM_FIXEDTEXT:
             getDesignView()->SetMode( DlgEdMode::Insert );
-            getDesignView()->SetInsertObj( OBJ_DLG_FIXEDTEXT );
+            getDesignView()->SetInsertObj( OBJ_RD_FIXEDTEXT );
             createDefaultControl(aArgs);
             InvalidateAll();
             break;
         case SID_INSERT_HFIXEDLINE:
             getDesignView()->SetMode( DlgEdMode::Insert );
-            getDesignView()->SetInsertObj( OBJ_DLG_HFIXEDLINE );
+            getDesignView()->SetInsertObj( OBJ_RD_HFIXEDLINE );
             createDefaultControl(aArgs);
             InvalidateAll();
             break;
         case SID_INSERT_VFIXEDLINE:
             getDesignView()->SetMode( DlgEdMode::Insert );
-            getDesignView()->SetInsertObj( OBJ_DLG_VFIXEDLINE );
+            getDesignView()->SetInsertObj( OBJ_RD_VFIXEDLINE );
             createDefaultControl(aArgs);
             InvalidateAll();
             break;
         case SID_FM_EDIT:
             getDesignView()->SetMode( DlgEdMode::Insert );
-            getDesignView()->SetInsertObj( OBJ_DLG_FORMATTEDFIELD );
+            getDesignView()->SetInsertObj( OBJ_RD_FORMATTEDFIELD );
             createDefaultControl(aArgs);
             InvalidateAll();
             break;
         case SID_FM_IMAGECONTROL:
             getDesignView()->SetMode( DlgEdMode::Insert );
-            getDesignView()->SetInsertObj( OBJ_DLG_IMAGECONTROL );
+            getDesignView()->SetInsertObj( OBJ_RD_IMAGECONTROL );
             createDefaultControl(aArgs);
             InvalidateAll();
             break;
@@ -3012,7 +3012,7 @@ void OReportController::insertGraphic()
                     { PROPERTY_IMAGEURL, Any(aDialog.GetPath()) },
                     { PROPERTY_PRESERVEIRI, Any(bLink) }
                 }));
-            createControl(aArgs,xSection,OUString(),OBJ_DLG_IMAGECONTROL);
+            createControl(aArgs,xSection,OUString(),OBJ_RD_IMAGECONTROL);
         }
     }
     catch(const Exception&)
@@ -3099,7 +3099,7 @@ IMPL_LINK_NOARG( OReportController, OnExecuteReport, void*, void )
     executeReport();
 }
 
-void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId)
+void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,SdrObjKind _nObjectId)
 {
     SequenceAsHashMap aMap(_aArgs);
     getDesignView()->setMarked(_xSection, true);
@@ -3131,7 +3131,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
         OReportSection::createDefault(sCustomShapeType,pNewControl);
         pNewControl->SetLogicRect(tools::Rectangle(3000,500,6000,3500)); // switch height and width
     }
-    else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId  )
+    else if ( _nObjectId == OBJ_OLE2 || OBJ_RD_SUBREPORT == _nObjectId  )
     {
         pNewControl = SdrObjFactory::MakeNewObject(
             *m_aReportModel,
@@ -3159,7 +3159,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
             nullptr,
             _nObjectId,
             SdrInventor::ReportDesign,
-            OBJ_DLG_FIXEDTEXT,
+            OBJ_RD_FIXEDTEXT,
 
             // tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
             // m_aReportModel seems pretty safe, it's done in other places, initialized
@@ -3216,9 +3216,9 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
 
             pObj->CreateMediator(true);
 
-            if ( _nObjectId == OBJ_DLG_FIXEDTEXT ) // special case for fixed text
+            if ( _nObjectId == OBJ_RD_FIXEDTEXT ) // special case for fixed text
                 xUnoProp->setPropertyValue(PROPERTY_LABEL,uno::makeAny(OUnoObject::GetDefaultName(pObj)));
-            else if ( _nObjectId == OBJ_DLG_VFIXEDLINE )
+            else if ( _nObjectId == OBJ_RD_VFIXEDLINE )
             {
                 awt::Size aOlSize = xShapeProp->getSize();
                 xShapeProp->setSize(awt::Size(aOlSize.Height,aOlSize.Width)); // switch height and width
@@ -3427,7 +3427,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
             if ( !xField.is() )
                 continue;
 
-            sal_uInt16 nOBJID = 0;
+            SdrObjKind nOBJID = OBJ_NONE;
             sal_Int32 nDataType = sdbc::DataType::BINARY;
             xField->getPropertyValue(PROPERTY_TYPE) >>= nDataType;
             switch ( nDataType )
@@ -3435,10 +3435,10 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                 case sdbc::DataType::BINARY:
                 case sdbc::DataType::VARBINARY:
                 case sdbc::DataType::LONGVARBINARY:
-                    nOBJID = OBJ_DLG_IMAGECONTROL;
+                    nOBJID = OBJ_RD_IMAGECONTROL;
                     break;
                 default:
-                    nOBJID = OBJ_DLG_FORMATTEDFIELD;
+                    nOBJID = OBJ_RD_FORMATTEDFIELD;
                     break;
             }
 
@@ -3466,7 +3466,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                 xNumberFormats,
                 nOBJID,
                 SdrInventor::ReportDesign,
-                OBJ_DLG_FIXEDTEXT,
+                OBJ_RD_FIXEDTEXT,
 
                 // tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
                 // m_aReportModel seems pretty safe, it's done in other places, initialized
@@ -3537,7 +3537,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
                         xField->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
 
                     if (pSectionViews[0] != pSectionViews[1] &&
-                        nOBJID == OBJ_DLG_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD
+                        nOBJID == OBJ_RD_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD
                     {
                         uno::Reference< report::XReportComponent> xShapePropLabel(pObjs[0]->getUnoShape(),uno::UNO_QUERY_THROW);
                         uno::Reference< report::XReportComponent> xShapePropTextField(pObjs[1]->getUnoShape(),uno::UNO_QUERY_THROW);
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 674e72da8e9c..ed6f614b5859 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -89,7 +89,7 @@ void OReportWindow::dispose()
     vcl::Window::dispose();
 }
 
-void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void OReportWindow::SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType )
 {
     m_aViewsWindow->SetInsertObj( eObj,_sShapeType);
 }
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index a7a8fda02ad3..bb9691e8eabf 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -218,7 +218,7 @@ sal_uInt16 OScrollWindowHelper::getSectionCount() const
     return m_aReportWindow->getSectionCount();
 }
 
-void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void OScrollWindowHelper::SetInsertObj(SdrObjKind eObj, const OUString& _sShapeType)
 {
     m_aReportWindow->SetInsertObj(eObj,_sShapeType);
 }
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index db2b44b6d731..2274e85ca529 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -330,7 +330,7 @@ sal_uInt16 OViewsWindow::getSectionCount() const
     return static_cast<sal_uInt16>(m_aSections.size());
 }
 
-void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void OViewsWindow::SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType )
 {
     for (const auto& rxSection : m_aSections)
         rxSection->getReportSection().getSectionView().SetCurrentObj( eObj, SdrInventor::ReportDesign );
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index a0db6c64bc5d..bc68d60b896d 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -48,29 +48,29 @@ IMPL_STATIC_LINK(
     {
         switch( aParams.nObjIdentifier )
         {
-            case OBJ_DLG_FIXEDTEXT:
+            case OBJ_RD_FIXEDTEXT:
                     pNewObj = new OUnoObject(aParams.rSdrModel, SERVICE_FIXEDTEXT
                                                         ,OUString("com.sun.star.form.component.FixedText")
-                                                        ,OBJ_DLG_FIXEDTEXT);
+                                                        ,OBJ_RD_FIXEDTEXT);
                     break;
-            case OBJ_DLG_IMAGECONTROL:
+            case OBJ_RD_IMAGECONTROL:
                     pNewObj = new OUnoObject(aParams.rSdrModel, SERVICE_IMAGECONTROL
                                                         ,OUString("com.sun.star.form.component.DatabaseImageControl")
-                                                        ,OBJ_DLG_IMAGECONTROL);
+                                                        ,OBJ_RD_IMAGECONTROL);
                     break;
-            case OBJ_DLG_FORMATTEDFIELD:
+            case OBJ_RD_FORMATTEDFIELD:
                     pNewObj = new OUnoObject(aParams.rSdrModel, SERVICE_FORMATTEDFIELD
                                                         ,OUString("com.sun.star.form.component.FormattedField")
-                                                        ,OBJ_DLG_FORMATTEDFIELD);
+                                                        ,OBJ_RD_FORMATTEDFIELD);
                     break;
-            case OBJ_DLG_VFIXEDLINE:
-            case OBJ_DLG_HFIXEDLINE:
+            case OBJ_RD_VFIXEDLINE:
+            case OBJ_RD_HFIXEDLINE:
                 {
                     OUnoObject* pObj = new OUnoObject(aParams.rSdrModel, SERVICE_FIXEDLINE
                                                         ,OUString("com.sun.star.awt.UnoControlFixedLineModel")
                                                         ,aParams.nObjIdentifier);
                     pNewObj = pObj;
-                    if ( aParams.nObjIdentifier == OBJ_DLG_HFIXEDLINE )
+                    if ( aParams.nObjIdentifier == OBJ_RD_HFIXEDLINE )
                     {
                         uno::Reference<beans::XPropertySet> xProp = pObj->getAwtComponent();
                         xProp->setPropertyValue( PROPERTY_ORIENTATION, uno::makeAny(sal_Int32(0)) );
@@ -80,8 +80,8 @@ IMPL_STATIC_LINK(
             case OBJ_CUSTOMSHAPE:
                 pNewObj = new OCustomShape(aParams.rSdrModel, SERVICE_SHAPE);
                 break;
-            case OBJ_DLG_SUBREPORT:
-                pNewObj = new OOle2Obj(aParams.rSdrModel, SERVICE_REPORTDEFINITION, OBJ_DLG_SUBREPORT);
+            case OBJ_RD_SUBREPORT:
+                pNewObj = new OOle2Obj(aParams.rSdrModel, SERVICE_REPORTDEFINITION, OBJ_RD_SUBREPORT);
                 break;
             case OBJ_OLE2:
                 pNewObj = new OOle2Obj(aParams.rSdrModel, "com.sun.star.chart2.ChartDocument", OBJ_OLE2);