From 8295a3344704ce9a18489933c499a50c403f1a3d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 30 Dec 2021 20:33:52 +0200 Subject: 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 --- oox/source/export/drawingml.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'oox') diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index c35bc9b02220..55cea6049c83 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -5410,7 +5410,7 @@ void DrawingML::WriteFromTo(const uno::Reference& rXShape, sal_Int16 nHalfWidth = aSize.Width / 2; sal_Int16 nHalfHeight = aSize.Height / 2; // aTopLeft needs correction for rotated customshapes - if (pObj->GetObjIdentifier() == OBJ_CUSTOMSHAPE) + if (pObj->GetObjIdentifier() == SdrObjKind::CustomShape) { // Center of bounding box of the rotated shape const auto aSnapRectCenter(pObj->GetSnapRect().Center()); -- cgit