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/svdopath.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/svdopath.cxx')
| -rw-r--r-- | svx/source/svdraw/svdopath.cxx | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index db5197fb8cc2..1ba7ff83f623 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1294,18 +1294,27 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) if (pView!=nullptr && pView->IsCreateMode()) { // switch to different CreateTool, if appropriate sal_uInt16 nIdent; - sal_uInt32 nInvent; + SdrInventor nInvent; pView->TakeCurrentObj(nIdent,nInvent); - if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) { + if (nInvent==SdrInventor::Default && pU->eAktKind!=(SdrObjKind)nIdent) { SdrObjKind eNewKind=(SdrObjKind)nIdent; switch (eNewKind) { - case OBJ_CARC: case OBJ_CIRC: case OBJ_CCUT: case OBJ_SECT: eNewKind=OBJ_CARC; + case OBJ_CARC: + case OBJ_CIRC: + case OBJ_CCUT: + case OBJ_SECT: + eNewKind=OBJ_CARC; SAL_FALLTHROUGH; case OBJ_RECT: - case OBJ_LINE: case OBJ_PLIN: case OBJ_POLY: - case OBJ_PATHLINE: case OBJ_PATHFILL: - case OBJ_FREELINE: case OBJ_FREEFILL: - case OBJ_SPLNLINE: case OBJ_SPLNFILL: { + case OBJ_LINE: + case OBJ_PLIN: + case OBJ_POLY: + case OBJ_PATHLINE: + case OBJ_PATHFILL: + case OBJ_FREELINE: + case OBJ_FREEFILL: + case OBJ_SPLNLINE: + case OBJ_SPLNFILL: { pU->eAktKind=eNewKind; pU->bMixedCreate=true; pU->nBezierStartPoint=rXPoly.GetPointCount(); |