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>

1 files changed, 2 insertions, 40 deletions

diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index c19c3db282e1..0cb0a6dc8573 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -19,48 +19,10 @@
 
 #pragma once
 
-namespace basctl
-{
+#include <svx/svdobjkind.hxx>
 
-enum
+namespace basctl
 {
-    OBJ_DLG_CONTROL         =  1,
-    OBJ_DLG_DIALOG          =  2,
-    OBJ_DLG_PUSHBUTTON      =  3,
-    OBJ_DLG_RADIOBUTTON     =  4,
-    OBJ_DLG_CHECKBOX        =  5,
-    OBJ_DLG_LISTBOX         =  6,
-    OBJ_DLG_COMBOBOX        =  7,
-    OBJ_DLG_GROUPBOX        =  8,
-    OBJ_DLG_EDIT            =  9,
-    OBJ_DLG_FIXEDTEXT       = 10,
-    OBJ_DLG_IMAGECONTROL    = 11,
-    OBJ_DLG_PROGRESSBAR     = 12,
-    OBJ_DLG_HSCROLLBAR      = 13,
-    OBJ_DLG_VSCROLLBAR      = 14,
-    OBJ_DLG_HFIXEDLINE      = 15,
-    OBJ_DLG_VFIXEDLINE      = 16,
-    OBJ_DLG_DATEFIELD       = 17,
-    OBJ_DLG_TIMEFIELD       = 18,
-    OBJ_DLG_NUMERICFIELD    = 19,
-    OBJ_DLG_CURRENCYFIELD   = 20,
-    OBJ_DLG_FORMATTEDFIELD  = 21,
-    OBJ_DLG_PATTERNFIELD    = 22,
-    OBJ_DLG_FILECONTROL     = 23,
-    OBJ_DLG_TREECONTROL     = 24,
-    OBJ_DLG_SPINBUTTON      = 25,
-    OBJ_DLG_GRIDCONTROL     = 26,
-    OBJ_DLG_HYPERLINKCONTROL = 27,
-
-    OBJ_DLG_FORMRADIO       = 28,
-    OBJ_DLG_FORMCHECK       = 29,
-    OBJ_DLG_FORMLIST        = 30,
-    OBJ_DLG_FORMCOMBO       = 31,
-    OBJ_DLG_FORMSPIN        = 32,
-    OBJ_DLG_FORMVSCROLL     = 33,
-    OBJ_DLG_FORMHSCROLL     = 34,
-
-};
 
 // control properties
 #define DLGED_PROP_BACKGROUNDCOLOR   "BackgroundColor"