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 /svx/source/dialog/_contdlg.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 'svx/source/dialog/_contdlg.cxx')
| -rw-r--r-- | svx/source/dialog/_contdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 712544ff0c01..fbd6f40bc547 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -382,17 +382,17 @@ IMPL_LINK(SvxSuperContourDlg, Tbx1ClickHdl, const OString&, rId, void) else if (rId == "TBI_RECT") { SetActiveTool(rId); - m_xContourWnd->SetObjKind( OBJ_RECT ); + m_xContourWnd->SetObjKind( SdrObjKind::Rectangle ); } else if (rId == "TBI_CIRCLE") { SetActiveTool(rId); - m_xContourWnd->SetObjKind( OBJ_CIRC ); + m_xContourWnd->SetObjKind( SdrObjKind::CircleOrEllipse ); } else if (rId == "TBI_POLY") { SetActiveTool(rId); - m_xContourWnd->SetObjKind( OBJ_POLY ); + m_xContourWnd->SetObjKind( SdrObjKind::Polygon ); } else if (rId == "TBI_POLYEDIT") { |