diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 11:45:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-21 12:09:09 +0000 |
| commit | beb8cfcf32f855a0fb638caef4782d9d867e3102 (patch) | |
| tree | 23b5a2376ecacc2977c3ce5f3a2be182abb05b3b /svx/source/engine3d | |
| parent | 2b14fb3a4f92b928f0a5fc536c6a5f4a6e51a9b8 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/engine3d')
| -rw-r--r-- | svx/source/engine3d/obj3d.cxx | 4 | ||||
| -rw-r--r-- | svx/source/engine3d/objfac3d.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 54b0b429fe36..877575cd6758 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -243,9 +243,9 @@ void E3dObject::SetRectsDirty(bool bNotMyself) } } -sal_uInt32 E3dObject::GetObjInventor() const +SdrInventor E3dObject::GetObjInventor() const { - return E3dInventor; + return SdrInventor::E3d; } sal_uInt16 E3dObject::GetObjIdentifier() const diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 185205a0de45..7baa7a5eba2b 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -47,7 +47,7 @@ E3dObjFactory::~E3dObjFactory() IMPL_STATIC_LINK( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { - if ( aParams.nInventor == E3dInventor ) + if ( aParams.nInventor == SdrInventor::E3d ) { switch ( aParams.nObjIdentifier ) { |