From de78304d92140901d19a6ea17bdc1d568df955c4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 5 Nov 2020 14:04:04 +0000
Subject: make SdrObject Identifiers SdrObjKind enum members
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 svx/inc/extrud3d.hxx                | 2 +-
 svx/inc/pch/precompiled_svxcore.hxx | 8 ++++++--
 svx/inc/polygn3d.hxx                | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'svx/inc')

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;
-- 
cgit