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 /sd/source/ui/unoidl/unopage.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 'sd/source/ui/unoidl/unopage.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 62c70998e18f..d5576855f923 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1395,10 +1395,10 @@ Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) co if(pObj->GetObjInventor() == SdrInventor::Default) { - sal_uInt32 nInventor = pObj->GetObjIdentifier(); + SdrObjKind nInventor = pObj->GetObjIdentifier(); switch( nInventor ) { - case OBJ_TITLETEXT: + case SdrObjKind::TitleText: pShape = new SvxShapeText( pObj ); if( GetPage()->GetPageKind() == PageKind::Notes && GetPage()->IsMasterPage() ) { @@ -1411,11 +1411,12 @@ Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) co } eKind = PresObjKind::NONE; break; - case OBJ_OUTLINETEXT: + case SdrObjKind::OutlineText: pShape = new SvxShapeText( pObj ); pShape->SetShapeType("com.sun.star.presentation.OutlinerShape"); eKind = PresObjKind::NONE; break; + default: ; } } |