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>

2 files changed, 33 insertions, 32 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 823868ae2dfe..8832617a4e58 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -481,16 +481,16 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                     if( nInventor == SdrInventor::Default )
                     {
                         bool bValidGluePoint = false;
-                        sal_uInt32 nObjId = pO->GetObjIdentifier();
+                        SdrObjKind nObjId = pO->GetObjIdentifier();
                         switch( nObjId )
                         {
-                            case OBJ_GRUP :
-                            case OBJ_GRAF :
-                            case OBJ_RECT :
-                            case OBJ_TEXT :
-                            case OBJ_PAGE :
-                            case OBJ_TITLETEXT :
-                            case OBJ_OUTLINETEXT :
+                            case SdrObjKind::Group :
+                            case SdrObjKind::Graphic :
+                            case SdrObjKind::Rectangle :
+                            case SdrObjKind::Text :
+                            case SdrObjKind::Page :
+                            case SdrObjKind::TitleText :
+                            case SdrObjKind::OutlineText :
                             {
                                 if ( nC & 1 )
                                 {
@@ -521,17 +521,17 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                                     bValidGluePoint = true;
                             }
                             break;
-                            case OBJ_POLY :
-                            case OBJ_PLIN :
-                            case OBJ_LINE :
-                            case OBJ_PATHLINE :
-                            case OBJ_PATHFILL :
-                            case OBJ_FREELINE :
-                            case OBJ_FREEFILL :
-                            case OBJ_SPLNLINE :
-                            case OBJ_SPLNFILL :
-                            case OBJ_PATHPOLY :
-                            case OBJ_PATHPLIN :
+                            case SdrObjKind::Polygon :
+                            case SdrObjKind::PolyLine :
+                            case SdrObjKind::Line :
+                            case SdrObjKind::PathLine :
+                            case SdrObjKind::PathFill :
+                            case SdrObjKind::FreehandLine :
+                            case SdrObjKind::FreehandFill :
+                            case SdrObjKind::SplineLine :
+                            case SdrObjKind::SplineFill :
+                            case SdrObjKind::PathPoly :
+                            case SdrObjKind::PathPolyLine :
                             {
                                 if (pList)
                                 {
@@ -597,7 +597,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                             }
                             break;
 
-                            case OBJ_CUSTOMSHAPE :
+                            case SdrObjKind::CustomShape :
                             {
                                 const SfxPoolItem& aCustomShape =  static_cast<SdrObjCustomShape*>(pO)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
                                 SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(aCustomShape) );
@@ -748,6 +748,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver )
                                 }
                             }
                             break;
+                            default: ;
                         }
                         if ( bValidGluePoint )
                         {
@@ -4340,7 +4341,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
                 aPoly.append(basegfx::B2DPoint(aObjData.aBoundRect.Right(), aObjData.aBoundRect.Bottom()));
                 pRet = new SdrPathObj(
                     *pSdrModel,
-                    OBJ_LINE,
+                    SdrObjKind::Line,
                     basegfx::B2DPolyPolygon(aPoly));
                 ApplyAttributes( rSt, aSet, aObjData );
                 pRet->SetMergedItemSet(aSet);
@@ -5293,7 +5294,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
 
             pTextObj = new SdrRectObj(
                 *pSdrModel,
-                OBJ_TEXT,
+                SdrObjKind::Text,
                 rTextRect);
             pTextImpRec = new SvxMSDffImportRec(*pImpRec);
             bDeleteTextImpRec = true;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 9828b287bda5..9ab29d66458f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -987,18 +987,18 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
                     nMinFrameHeight = rTextRect.GetHeight() - ( nTextTop + nTextBottom );
                 }
 
-                SdrObjKind eTextKind = OBJ_RECT;
+                SdrObjKind eTextKind = SdrObjKind::Rectangle;
                 if ( ( aPlaceholderAtom.nPlaceholderId == PptPlaceholder::NOTESSLIDEIMAGE )
                     || ( aPlaceholderAtom.nPlaceholderId == PptPlaceholder::MASTERNOTESSLIDEIMAGE ) )
                 {
                     aTextObj.SetInstance( TSS_Type::Notes );
-                    eTextKind = OBJ_TITLETEXT;
+                    eTextKind = SdrObjKind::TitleText;
                 }
                 else if ( ( aPlaceholderAtom.nPlaceholderId == PptPlaceholder::MASTERNOTESBODYIMAGE )
                     || ( aPlaceholderAtom.nPlaceholderId == PptPlaceholder::NOTESBODY ) )
                 {
                     aTextObj.SetInstance( TSS_Type::Notes );
-                    eTextKind = OBJ_TEXT;
+                    eTextKind = SdrObjKind::Text;
                 }
 
                 TSS_Type nDestinationInstance = aTextObj.GetInstance();
@@ -1036,11 +1036,11 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
                 switch ( aTextObj.GetInstance() )
                 {
                     case TSS_Type::PageTitle :
-                    case TSS_Type::Title : eTextKind = OBJ_TITLETEXT; break;
-                    case TSS_Type::Subtitle : eTextKind = OBJ_TEXT; break;
+                    case TSS_Type::Title : eTextKind = SdrObjKind::TitleText; break;
+                    case TSS_Type::Subtitle : eTextKind = SdrObjKind::Text; break;
                     case TSS_Type::Body :
                     case TSS_Type::HalfBody :
-                    case TSS_Type::QuarterBody : eTextKind = OBJ_OUTLINETEXT; bAutoFit = true; break;
+                    case TSS_Type::QuarterBody : eTextKind = SdrObjKind::OutlineText; bAutoFit = true; break;
                     default: break;
                 }
                 if ( aTextObj.GetDestinationInstance() != TSS_Type::TextInShape )
@@ -1048,14 +1048,14 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
                     if ( !aTextObj.GetOEPlaceHolderAtom() || aTextObj.GetOEPlaceHolderAtom()->nPlaceholderId == PptPlaceholder::NONE )
                     {
                         aTextObj.SetDestinationInstance( TSS_Type::TextInShape );
-                        eTextKind = OBJ_RECT;
+                        eTextKind = SdrObjKind::Rectangle;
                     }
                 }
                 SdrObject* pTObj = nullptr;
                 bool bWordWrap = GetPropertyValue(DFF_Prop_WrapText, mso_wrapSquare) != mso_wrapNone;
                 bool bFitShapeToText = ( GetPropertyValue( DFF_Prop_FitTextToShape, 0 ) & 2 ) != 0;
 
-                if ( dynamic_cast<const SdrObjCustomShape* >(pRet) !=  nullptr && ( eTextKind == OBJ_RECT ) )
+                if ( dynamic_cast<const SdrObjCustomShape* >(pRet) !=  nullptr && ( eTextKind == SdrObjKind::Rectangle ) )
                 {
                     bAutoGrowHeight = bFitShapeToText;
                     bAutoGrowWidth = !bWordWrap;
@@ -1071,7 +1071,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, Svx
                     }
                     pTObj = new SdrRectObj(
                         *pSdrModel,
-                        eTextKind != OBJ_RECT ? eTextKind : OBJ_TEXT);
+                        eTextKind != SdrObjKind::Rectangle ? eTextKind : SdrObjKind::Text);
                     SfxItemSet aSet( pSdrModel->GetItemPool() );
                     if ( !pRet )
                         ApplyAttributes( rSt, aSet, rObjData );
@@ -2258,7 +2258,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
         bool bUndoEnabled = rOutliner.IsUndoEnabled();
         rOutliner.EnableUndo(false);
 
-        if ( ( pText->GetObjInventor() == SdrInventor::Default ) && ( pText->GetObjIdentifier() == OBJ_TITLETEXT ) ) // Outliner-Style for Title-Text object?!? (->of DL)
+        if ( ( pText->GetObjInventor() == SdrInventor::Default ) && ( pText->GetObjIdentifier() == SdrObjKind::TitleText ) ) // Outliner-Style for Title-Text object?!? (->of DL)
             rOutliner.Init( OutlinerMode::TitleObject );             // Outliner reset
 
         bool bOldUpdateMode = rOutliner.SetUpdateLayout( false );