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/svdraw/svdobj.cxx | |
| 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/svdraw/svdobj.cxx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 0f3de29393c0..7d5a15d1110d 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -157,7 +157,7 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() : bDown(false) {} -SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId) : +SdrObjUserData::SdrObjUserData(SdrInventor nInv, sal_uInt16 nId) : nInventor(nInv), nIdentifier(nId) {} @@ -535,9 +535,9 @@ SfxItemPool & SdrObject::GetObjectItemPool() const return SdrObject::GetGlobalDrawObjectItemPool(); } -sal_uInt32 SdrObject::GetObjInventor() const +SdrInventor SdrObject::GetObjInventor() const { - return SdrInventor; + return SdrInventor::Default; } sal_uInt16 SdrObject::GetObjIdentifier() const @@ -3100,7 +3100,6 @@ bool SdrObject::HasText() const return false; } - SdrDelayBroadcastObjectChange::SdrDelayBroadcastObjectChange( SdrObject& rObj ) : mrObj(rObj), mbOldDelayBroadcastObjectChange( rObj.mbDelayBroadcastObjectChange) { @@ -3121,7 +3120,7 @@ SdrDelayBroadcastObjectChange::~SdrDelayBroadcastObjectChange() } -SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uInt16 nObjIdentifier, SdrPage* , SdrModel* ) +SdrObject* SdrObjFactory::CreateObjectFromFactory( SdrInventor nInventor, sal_uInt16 nObjIdentifier, SdrPage* , SdrModel* ) { SdrObjCreatorParams aParams { nInventor, nObjIdentifier }; for (const auto & i : ImpGetUserMakeObjHdl()) { @@ -3133,14 +3132,14 @@ SdrObject* SdrObjFactory::CreateObjectFromFactory( sal_uInt32 nInventor, sal_uIn return nullptr; } -SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) +SdrObject* SdrObjFactory::MakeNewObject(SdrInventor nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) { if (!pModel && pPage) pModel = pPage->GetModel(); SdrObject* pObj = nullptr; - if (nInvent == SdrInventor) + if (nInvent == SdrInventor::Default) { switch (nIdent) { @@ -3198,7 +3197,7 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S } SdrObject* SdrObjFactory::MakeNewObject( - sal_uInt32 nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ) + SdrInventor nInventor, sal_uInt16 nIdentifier, const Rectangle& rSnapRect, SdrPage* pPage ) { SdrModel* pModel = pPage ? pPage->GetModel() : nullptr; @@ -3206,7 +3205,7 @@ SdrObject* SdrObjFactory::MakeNewObject( bool bSetSnapRect = true; - if (nInventor == SdrInventor) + if (nInventor == SdrInventor::Default) { switch (nIdentifier) { |