From beb8cfcf32f855a0fb638caef4782d9d867e3102 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Nov 2016 11:45:50 +0200 Subject: convert inventorId to scoped enum SW_DRAWLAYER had the same value as SC_DRAWLAYER, so I merged it into the ScOrSwDraw enum constant Change-Id: I5c45d378c00364d11cc960c9e48a6e3f10928724 Reviewed-on: https://gerrit.libreoffice.org/31037 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basctl/source/dlged/dlged.cxx | 2 +- basctl/source/dlged/dlgedfac.cxx | 2 +- basctl/source/dlged/dlgedobj.cxx | 4 ++-- basctl/source/inc/dlgeddef.hxx | 5 ----- basctl/source/inc/dlgedobj.hxx | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) (limited to 'basctl') diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 9d8b0adccd84..411cb5506cd2 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -606,7 +606,7 @@ void DlgEditor::SetInsertObj( sal_uInt16 eObj ) { eActObj = eObj; - pDlgEdView->SetCurrentObj( eActObj, DlgInventor ); + pDlgEdView->SetCurrentObj( eActObj, SdrInventor::BasicDialog ); } void DlgEditor::CreateDefaultObject() diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index cb2fbc68660d..8933f9a305e0 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -61,7 +61,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) } SdrObject* pNewObj = nullptr; - if( (aParams.nInventor == DlgInventor) && + if( (aParams.nInventor == SdrInventor::BasicDialog) && (aParams.nObjIdentifier >= OBJ_DLG_PUSHBUTTON) && (aParams.nObjIdentifier <= OBJ_DLG_FORMHSCROLL) ) { diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 10020bfdf260..a8dd5625cf58 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -749,9 +749,9 @@ OUString DlgEdObj::GetUniqueName() const return aUniqueName; } -sal_uInt32 DlgEdObj::GetObjInventor() const +SdrInventor DlgEdObj::GetObjInventor() const { - return DlgInventor; + return SdrInventor::BasicDialog; } sal_uInt16 DlgEdObj::GetObjIdentifier() const diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index bb649a453ebe..e14bc28dd0f2 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -25,11 +25,6 @@ namespace basctl { -const sal_uInt32 DlgInventor = sal_uInt32('D')*0x00000001+ - sal_uInt32('L')*0x00000100+ - sal_uInt32('G')*0x00010000+ - sal_uInt32('1')*0x01000000; - enum { OBJ_DLG_CONTROL = 1, diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 101a69523f76..3eb50a29eb75 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -92,7 +92,7 @@ public: void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; } DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; } - virtual sal_uInt32 GetObjInventor() const override; + virtual SdrInventor GetObjInventor() const override; virtual sal_uInt16 GetObjIdentifier() const override; virtual DlgEdObj* Clone() const override; // not working yet -- cgit