convert inventorId to scoped enum

SW_DRAWLAYER had the same value as SC_DRAWLAYER, so I merged it into the
ScOrSwDraw enum constant

Change-Id: I5c45d378c00364d11cc960c9e48a6e3f10928724
Reviewed-on: https://gerrit.libreoffice.org/31037
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 19 insertions, 17 deletions

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 1396caa9861c..e57729057b82 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1855,7 +1855,7 @@ namespace
         for( sal_uInt16 i = 0; i < nCount; i++ )
         {
             SdrObjUserData* pData = pObj->GetUserData( i );
-            if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == nId )
+            if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == nId )
                 return pData;
         }
         return nullptr;
@@ -1867,7 +1867,7 @@ namespace
         for( sal_uInt16 i = nCount; i > 0; i-- )
         {
             SdrObjUserData* pData = pObj->GetUserData( i-1 );
-            if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == nId )
+            if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == nId )
                 pObj->DeleteUserData(i-1);
         }
     }
@@ -1983,7 +1983,7 @@ ScDrawObjData* ScDrawLayer::GetNonRotatedObjData( SdrObject* pObj, bool bCreate
     for( sal_uInt16 i = 0; i < nCount; i++ )
     {
         SdrObjUserData* pData = pObj->GetUserData( i );
-        if( pData && pData->GetInventor() == SC_DRAWLAYER && pData->GetId() == SC_UD_OBJDATA && ++nFound == 2 )
+        if( pData && pData->GetInventor() == SdrInventor::ScOrSwDraw && pData->GetId() == SC_UD_OBJDATA && ++nFound == 2 )
             return static_cast<ScDrawObjData*>(pData);
     }
     if( pObj && bCreate )
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index cc5fe0d39875..1a76e397a081 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -34,7 +34,7 @@ ScDrawObjFactory::~ScDrawObjFactory()
 IMPL_STATIC_LINK(
     ScDrawObjFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* )
 {
-    if ( aParams.nInventor == SC_DRAWLAYER )
+    if ( aParams.nInventor == SdrInventor::ScOrSwDraw )
     {
         if ( aParams.nObjIdentifier == SC_UD_OBJDATA )
             return new ScDrawObjData;
@@ -48,7 +48,7 @@ IMPL_STATIC_LINK(
 }
 
 ScDrawObjData::ScDrawObjData() :
-    SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA ),
+    SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_OBJDATA ),
     maStart( ScAddress::INITIALIZE_INVALID ),
     maEnd( ScAddress::INITIALIZE_INVALID ),
     meType( DrawingObject )
@@ -61,12 +61,12 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const
 }
 
 ScIMapInfo::ScIMapInfo() :
-    SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA )
+    SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_IMAPDATA )
 {
 }
 
 ScIMapInfo::ScIMapInfo( const ImageMap& rImageMap ) :
-    SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA ),
+    SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_IMAPDATA ),
     aImageMap( rImageMap )
 {
 }
@@ -87,7 +87,7 @@ SdrObjUserData* ScIMapInfo::Clone( SdrObject* ) const
 }
 
 ScMacroInfo::ScMacroInfo() :
-    SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA )
+    SdrObjUserData( SdrInventor::ScOrSwDraw, SC_UD_MACRODATA )
 {
 }
 
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 0f7d5b257521..78a13d3c7956 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -128,7 +128,7 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain
             //  URL button
 
             SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObject );
-            if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
+            if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor())
             {
                 uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel();
                 OSL_ENSURE( xControlModel.is(), "uno control without model" );
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 8060b1ad3be6..5dbebf4e1141 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -44,7 +44,7 @@ static bool lcl_IsURLButton( SdrObject* pObject )
     bool bRet = false;
 
     SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObject );
-    if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
+    if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor())
        {
         uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel();
         OSL_ENSURE( xControlModel.is(), "uno control without model" );
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 989fc898657e..9851f081e2c1 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -81,7 +81,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet )             //  Hyperlink
             aHLinkItem.SetInsertMode(HLINK_FIELD);
         }
         SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj );
-        if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
+        if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor())
         {
             uno::Reference<awt::XControlModel> xControlModel = pUnoCtrl->GetUnoControlModel();
             OSL_ENSURE( xControlModel.is(), "UNO-Control ohne Model" );
@@ -167,7 +167,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
                         {
                             SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
                             SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj  );
-                            if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor())
+                            if (pUnoCtrl && SdrInventor::FmForm == pUnoCtrl->GetObjInventor())
                             {
                                 uno::Reference<awt::XControlModel> xControlModel =
                                                         pUnoCtrl->GetUnoControlModel();
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 449b0b2112fa..dfb4f0f09b0e 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -31,13 +31,13 @@
 FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP,
                    SdrModel* pDoc, SfxRequest& rReq)
     : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq)
-    , nInventor(0)
+    , nInventor(SdrInventor::Unknown)
     , nIdentifier(0)
 {
     const SfxUInt32Item* pInventorItem = rReq.GetArg<SfxUInt32Item>(SID_FM_CONTROL_INVENTOR);
     const SfxUInt16Item* pIdentifierItem = rReq.GetArg<SfxUInt16Item>(SID_FM_CONTROL_IDENTIFIER);
     if( pInventorItem )
-        nInventor = pInventorItem->GetValue();
+        nInventor = (SdrInventor)pInventorItem->GetValue();
     if( pIdentifierItem )
         nIdentifier = pIdentifierItem->GetValue();
 }
diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx
index 699e6c4f187b..b17cc84b5cc6 100644
--- a/sc/source/ui/inc/fuconuno.hxx
+++ b/sc/source/ui/inc/fuconuno.hxx
@@ -22,12 +22,14 @@
 
 #include "fuconstr.hxx"
 
+enum class SdrInventor : sal_uInt32;
+
 /** Draw Control */
 class FuConstUnoControl : public FuConstruct
 {
 protected:
-    sal_uInt32 nInventor;
-    sal_uInt16 nIdentifier;
+    SdrInventor nInventor;
+    sal_uInt16  nIdentifier;
 
 public:
     FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView,
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index 73cbb2ca2073..5b2a4dcbcb18 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -58,7 +58,7 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR
     ScDrawView* pDrView = pView->GetScDrawView();
     SdrModel*   pModel  = pDrView->GetModel();
 
-    SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON,
+    SdrObject* pObj = SdrObjFactory::MakeNewObject(SdrInventor::FmForm, OBJ_FM_BUTTON,
                                pDrView->GetSdrPageView()->GetPage(), pModel);
     SdrUnoObj* pUnoCtrl = dynamic_cast<SdrUnoObj*>( pObj );
     OSL_ENSURE( pUnoCtrl, "no SdrUnoObj");