diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-30 20:33:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-07 14:22:07 +0100 |
| commit | 8295a3344704ce9a18489933c499a50c403f1a3d (patch) | |
| tree | 92a10017311909e3010624b39acddfcf7d3eba00 /sw/source/uibase/ribbar/conarc.cxx | |
| parent | 8accfa30343195b5d7cfd111301677a6a9b6a21b (diff) | |
remove E3D_INVENTOR_FLAG and convert SdrObjKind to scoped enum
We don't need E3D_INVENTOR_FLAG, we can just check if the SdrObjKind is
in the right range.
Which exposes some dodgy code in DrawViewShell::GetMenuStateSel
SfxItemState::DEFAULT == rSet.GetItemState( OBJ_TITLETEXT ) ||
SfxItemState::DEFAULT == rSet.GetItemState( OBJ_OUTLINETEXT ) ||
which has been there ever since
commit f47a9d9db3d06927380bb79b04bb6d4721a92d2b
Date: Mon Sep 18 16:07:07 2000 +0000
initial import
just remove that.
In SwFEShell::ImpEndCreate() move some logic around to avoid
using an out-of-range SdrObjKind value
Change-Id: I4620bfe61aca8f7415503debe3c84bfe5f4368a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127763
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/ribbar/conarc.cxx')
| -rw-r--r-- | sw/source/uibase/ribbar/conarc.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx index 8be117f13c99..4e55dc59ce1f 100644 --- a/sw/source/uibase/ribbar/conarc.cxx +++ b/sw/source/uibase/ribbar/conarc.cxx @@ -75,16 +75,16 @@ void ConstArc::Activate(const sal_uInt16 nSlotId) switch (nSlotId) { case SID_DRAW_ARC: - m_pWin->SetSdrDrawMode(OBJ_CARC); + m_pWin->SetSdrDrawMode(SdrObjKind::CircleArc); break; case SID_DRAW_PIE: - m_pWin->SetSdrDrawMode(OBJ_SECT); + m_pWin->SetSdrDrawMode(SdrObjKind::CircleSection); break; case SID_DRAW_CIRCLECUT: - m_pWin->SetSdrDrawMode(OBJ_CCUT); + m_pWin->SetSdrDrawMode(SdrObjKind::CircleCut); break; default: - m_pWin->SetSdrDrawMode(OBJ_NONE); + m_pWin->SetSdrDrawMode(SdrObjKind::NONE); break; } |