summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-18 11:17:26 +0200
committerNoel Grandin <noel@peralex.com>2016-08-19 08:18:37 +0200
commite00aa45d3456e2f76ed70d593d6ae1646aa1ae51 (patch)
tree3e7accfec5923d37ca5daa2ac20bf24ebcf9bf53 /svx
parent5252d3951f2febdfc714f37ffef9f4c0794c4cec (diff)
convert SdrObjListKind to scoped enum
Change-Id: I37577e43ad6b9f0843b52cb3667f654abb335677
Diffstat (limited to 'svx')
-rw-r--r--svx/source/engine3d/obj3d.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx4
-rw-r--r--svx/source/svdraw/svdogrp.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx8
-rw-r--r--svx/source/unodraw/unoshape.cxx6
5 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index f4af93b60196..390afa2f9b9f 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -187,7 +187,7 @@ E3dObject::E3dObject()
{
bIs3DObj = true;
maSubList.SetOwnerObj(this);
- maSubList.SetListKind(SDROBJLIST_GROUPOBJ);
+ maSubList.SetListKind(SdrObjListKind::GroupObj);
bClosedObj = true;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6379c4f02793..830b3f4a2483 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2737,7 +2737,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
{
SdrObject* pGroup = nullptr;
- if( pObjList && pObjList->GetListKind() == SDROBJLIST_GROUPOBJ )
+ if( pObjList && pObjList->GetListKind() == SdrObjListKind::GroupObj )
pGroup = pObjList->GetOwnerObj();
if ( pUserCall )
@@ -2789,7 +2789,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundR
}
if( pGroup->GetObjList() &&
- pGroup->GetObjList()->GetListKind() == SDROBJLIST_GROUPOBJ &&
+ pGroup->GetObjList()->GetListKind() == SdrObjListKind::GroupObj &&
pGroup != pObjList->GetOwnerObj() )
pGroup = pObjList->GetOwnerObj();
else
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 77fa19561479..62b8d6c10dac 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -71,7 +71,7 @@ SdrObjGroup::SdrObjGroup()
{
pSub=new SdrObjList(nullptr,nullptr);
pSub->SetOwnerObj(this);
- pSub->SetListKind(SDROBJLIST_GROUPOBJ);
+ pSub->SetListKind(SdrObjListKind::GroupObj);
bClosedObj=false;
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 5fdb308b1a74..6c93cce2b73f 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -83,7 +83,7 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU
bObjOrdNumsDirty=false;
bRectsDirty=false;
pOwnerObj=nullptr;
- eListKind=SDROBJLIST_UNKNOWN;
+ eListKind=SdrObjListKind::Unknown;
}
SdrObjList::SdrObjList():
@@ -98,7 +98,7 @@ SdrObjList::SdrObjList():
bObjOrdNumsDirty=false;
bRectsDirty=false;
pOwnerObj=nullptr;
- eListKind=SDROBJLIST_UNKNOWN;
+ eListKind=SdrObjListKind::Unknown;
}
SdrObjList::~SdrObjList()
@@ -1189,7 +1189,7 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
mbPageBorderOnlyLeftRight(false)
{
aPrefVisiLayers.SetAll();
- eListKind = (bMasterPage) ? SDROBJLIST_MASTERPAGE : SDROBJLIST_DRAWPAGE;
+ eListKind = (bMasterPage) ? SdrObjListKind::MasterPage : SdrObjListKind::DrawPage;
mpSdrPageProperties.reset(new SdrPageProperties(*this));
}
@@ -1307,7 +1307,7 @@ void SdrPage::lateInit(const SdrPage& rSrcPage, SdrModel* const pNewModel)
// be careful and correct eListKind, a member of SdrObjList which
// will be changed by the SdrObjList::lateInit before...
- eListKind = (mbMaster) ? SDROBJLIST_MASTERPAGE : SDROBJLIST_DRAWPAGE;
+ eListKind = (mbMaster) ? SdrObjListKind::MasterPage : SdrObjListKind::DrawPage;
}
SdrPage* SdrPage::Clone() const
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index a239ee34bc68..f7a2ea7e9f42 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3748,14 +3748,14 @@ uno::Reference<uno::XInterface> SAL_CALL SvxShape::getParent()
switch (pObjList->GetListKind())
{
- case SDROBJLIST_GROUPOBJ:
+ case SdrObjListKind::GroupObj:
if (SdrObjGroup *pGroup = dynamic_cast<SdrObjGroup*>(pObjList->GetOwnerObj()))
return pGroup->getUnoShape();
else if (E3dScene *pScene = dynamic_cast<E3dScene*>(pObjList->GetOwnerObj()))
return pScene->getUnoShape();
break;
- case SDROBJLIST_DRAWPAGE:
- case SDROBJLIST_MASTERPAGE:
+ case SdrObjListKind::DrawPage:
+ case SdrObjListKind::MasterPage:
return dynamic_cast<SdrPage&>(*pObjList).getUnoPage();
default:
OSL_FAIL( "SvxShape::getParent( ): unexpected SdrObjListKind" );