convert SDRINSERT constants to scoped enum

Change-Id: I6335e00cae161cea7ece922ecfa845c205626cd9

14 files changed, 29 insertions, 29 deletions

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 58c246f8035a..087010f3efba 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1098,7 +1098,7 @@ bool SdDrawDocument::InsertBookmarkAsObject(
             pBMView->GetDoc().SetAllocDocSh(true);
 
         SdDrawDocument* pTmpDoc = static_cast<SdDrawDocument*>( pBMView->GetMarkedObjModel() );
-        bOK = pView->Paste(*pTmpDoc, aObjPos, pPage, 0, OUString(), OUString());
+        bOK = pView->Paste(*pTmpDoc, aObjPos, pPage, SdrInsertFlags::NONE, OUString(), OUString());
 
         if (bOLEObjFound)
             pBMView->GetDoc().SetAllocDocSh(false);
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index d1d16558b05a..43f20a7e19b4 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -1029,7 +1029,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
         const Point aOrg( aWindowCenter.X() - ( aMaxSizeLog.Width() >> 1 ), aWindowCenter.Y() - ( aMaxSizeLog.Height() >> 1 ) );
 
         pGrafObj->SetLogicRect( Rectangle( aOrg, aMaxSizeLog ) );
-        rView.InsertObjectAtView( pGrafObj, *pPV, SDRINSERT_SETDEFLAYER);
+        rView.InsertObjectAtView( pGrafObj, *pPV, SdrInsertFlags::SETDEFLAYER);
     }
     else
     {
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 2fce438a7c2c..cc7d3769f0e0 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -98,7 +98,7 @@ void FuConstructArc::DoExecute( SfxRequest& rReq )
                        (long) (pPhiEnd->GetValue () * 10.0));
         SdrPageView *pPV = mpView->GetSdrPageView();
 
-        mpView->InsertObjectAtView(pNewCircle, *pPV, SDRINSERT_SETDEFLAYER);
+        mpView->InsertObjectAtView(pNewCircle, *pPV, SdrInsertFlags::SETDEFLAYER);
     }
 }
 
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 86129b98d8ce..d8ee5ddecd1b 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -113,7 +113,7 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
                 SdrCircObj  *pNewCircle = new SdrCircObj (OBJ_CIRC, aNewRectangle);
                 SdrPageView *pPV = mpView->GetSdrPageView();
 
-                mpView->InsertObjectAtView(pNewCircle, *pPV, SDRINSERT_SETDEFLAYER | SDRINSERT_SETDEFATTR);
+                mpView->InsertObjectAtView(pNewCircle, *pPV, SdrInsertFlags::SETDEFLAYER | SdrInsertFlags::SETDEFATTR);
             }
             break;
 
@@ -131,7 +131,7 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq )
                 SdrRectObj  *pNewRect = new SdrRectObj (aNewRectangle);
                 SdrPageView *pPV = mpView->GetSdrPageView();
 
-                mpView->InsertObjectAtView(pNewRect, *pPV, SDRINSERT_SETDEFLAYER | SDRINSERT_SETDEFATTR);
+                mpView->InsertObjectAtView(pNewRect, *pPV, SdrInsertFlags::SETDEFLAYER | SdrInsertFlags::SETDEFATTR);
             }
             break;
         }
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index a12d8b2ed52a..d3708df9bb04 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -375,7 +375,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
             if( pPickObj )
                 mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, true );
             else
-                bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER);
+                bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SdrInsertFlags::SETDEFLAYER);
 
             if( bRet )
             {
@@ -623,7 +623,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
 
                     SdrOle2Obj* pObj = new SdrOle2Obj( aObjRef, aName, aRect);
 
-                    if( mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER) )
+                    if( mpView->InsertObjectAtView(pObj, *pPV, SdrInsertFlags::SETDEFLAYER) )
                     {
                         //  Math objects change their object size during InsertObject.
                         //  New size must be set in SdrObject, or a wrong scale will be set at
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index d2fe87dc6e88..2e47df4e6f9a 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -439,7 +439,7 @@ void FuMorph::ImpInsertPolygons(
             pObjList->InsertObject( pObj1->Clone(), 0 );
             pObjList->InsertObject( pObj2->Clone() );
             mpView->DeleteMarked();
-            mpView->InsertObjectAtView( pObjGroup, *pPageView, SDRINSERT_SETDEFLAYER );
+            mpView->InsertObjectAtView( pObjGroup, *pPageView, SdrInsertFlags:: SETDEFLAYER );
         }
     }
 }
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index f4823faa8cdd..f0e3c436df09 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -171,7 +171,7 @@ public:
     SdrMediaObj*            InsertMediaObj( const OUString& rURL, const OUString& rMimeType, sal_Int8& rAction,
                                             const Point& rPos, const Size& rSize );
 
-    bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions );
+    bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions );
 
     bool                    IsPresObjSelected(bool bOnPage = true, bool bOnMasterPage = true, bool bCheckPresObjListOnly = false, bool bCheckLayoutOnly = false) const;
 
@@ -197,7 +197,7 @@ public:
 
     virtual SdrModel*   GetMarkedObjModel() const SAL_OVERRIDE;
     virtual bool Paste(
-        const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions,
+        const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions,
         const OUString& rSrcShellID, const OUString& rDestShellID ) SAL_OVERRIDE;
 
     using SdrExchangeView::Paste;
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 87452cc2aa52..6a242eb98433 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -188,7 +188,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
         if( pPickObj )
             mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, true );
         else
-            mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER);
+            mpView->InsertObjectAtView(pObj, *pPV, SdrInsertFlags::SETDEFLAYER);
 
         Invalidate(SID_DRAWTBX_INSERT);
         rReq.Ignore();
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index cdcddc26f201..17c070993c8f 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -129,7 +129,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& )
                     {
                         pGrafObj = new SdrGrafObj( Graphic( aScanBmp ), aRect );
                         SdrPageView* pPV = GetView()->GetSdrPageView();
-                        GetView()->InsertObjectAtView( pGrafObj, *pPV, SDRINSERT_SETDEFLAYER );
+                        GetView()->InsertObjectAtView( pGrafObj, *pPV, SdrInsertFlags::SETDEFLAYER );
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 7b2137113e9c..a45a1ede5b37 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -170,7 +170,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
         {
             pGrafObj = new SdrGrafObj(aGraphic, aRect);
             SdrPageView* pPV = mpDrawView->GetSdrPageView();
-            mpDrawView->InsertObjectAtView(pGrafObj, *pPV, SDRINSERT_SETDEFLAYER);
+            mpDrawView->InsertObjectAtView(pGrafObj, *pPV, SdrInsertFlags::SETDEFLAYER);
         }
     }
     // insert sound
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 402dbda474f4..ef6b102007d5 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1702,13 +1702,13 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText,
         aPos.Y() -= aSize.Height() / 2;
         pUnoCtrl->SetLogicRect(Rectangle(aPos, aSize));
 
-        sal_uLong nOptions = SDRINSERT_SETDEFLAYER;
+        SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER;
 
         OSL_ASSERT (GetViewShell()!=NULL);
         SfxInPlaceClient* pIpClient = GetViewShell()->GetIPClient();
         if (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive())
         {
-            nOptions |= SDRINSERT_DONTMARK;
+            nOptions |= SdrInsertFlags::DONTMARK;
         }
 
         mpDrawView->InsertObjectAtView(pUnoCtrl, *mpDrawView->GetSdrPageView(), nOptions);
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index b8862ca1650e..c279456e1348 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -951,7 +951,7 @@ SdrModel* View::GetMarkedObjModel() const
 }
 
 bool View::Paste(
-    const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions,
+    const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions,
     const OUString& rSrcShellID, const OUString& rDestShellID )
 {
     return FmFormView::Paste(rMod, rPos, pLst, nOptions, rSrcShellID, rDestShellID);
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 5619c15acf23..0458af1ac139 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -269,7 +269,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
     bool bReturn = false;
     bool                    bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 );
     bool                    bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink );
-    sal_uLong                   nPasteOptions = SDRINSERT_SETDEFLAYER;
+    SdrInsertFlags          nPasteOptions = SdrInsertFlags::SETDEFLAYER;
 
     if (mpViewSh != NULL)
     {
@@ -277,7 +277,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
         SfxInPlaceClient* pIpClient = mpViewSh->GetViewShell()->GetIPClient();
         if( mpViewSh->ISA(::sd::slidesorter::SlideSorterViewShell)
             || (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive()))
-        nPasteOptions |= SDRINSERT_DONTMARK;
+        nPasteOptions |= SdrInsertFlags::DONTMARK;
     }
 
     if( bDrag )
@@ -829,7 +829,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
 
                 aRect.SetPos( maDropPos );
                 pObj->SetLogicRect( aRect );
-                InsertObjectAtView( pObj, *GetSdrPageView(), SDRINSERT_SETDEFLAYER );
+                InsertObjectAtView( pObj, *GetSdrPageView(), SdrInsertFlags::SETDEFLAYER );
                 bReturn = true;
             }
         }
@@ -977,7 +977,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                     Rectangle       aRect( maDropPos, aSize );
                     SdrOle2Obj*     pObj = new SdrOle2Obj( aObjRef, aName, aRect );
                     SdrPageView*    pPV = GetSdrPageView();
-                    sal_uLong           nOptions = SDRINSERT_SETDEFLAYER;
+                    SdrInsertFlags  nOptions = SdrInsertFlags::SETDEFLAYER;
 
                     if (mpViewSh!=NULL)
                     {
@@ -985,7 +985,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                         SfxInPlaceClient* pIpClient
                             = mpViewSh->GetViewShell()->GetIPClient();
                         if (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive())
-                            nOptions |= SDRINSERT_DONTMARK;
+                            nOptions |= SdrInsertFlags::DONTMARK;
                     }
 
                     InsertObjectAtView( pObj, *pPV, nOptions );
@@ -1147,7 +1147,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                     Rectangle       aRect( maDropPos, aSize );
                     SdrOle2Obj*     pObj = new SdrOle2Obj( aObjRef, aName, aRect );
                     SdrPageView*    pPV = GetSdrPageView();
-                    sal_uLong           nOptions = SDRINSERT_SETDEFLAYER;
+                    SdrInsertFlags  nOptions = SdrInsertFlags::SETDEFLAYER;
 
                     if (mpViewSh!=NULL)
                     {
@@ -1155,7 +1155,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
                         SfxInPlaceClient* pIpClient
                             = mpViewSh->GetViewShell()->GetIPClient();
                         if (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive())
-                            nOptions |= SDRINSERT_DONTMARK;
+                            nOptions |= SdrInsertFlags::DONTMARK;
                     }
 
                     InsertObjectAtView( pObj, *pPV, nOptions );
@@ -1500,7 +1500,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
     return bReturn;
 }
 
-bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions )
+bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
 {
     boost::scoped_ptr<SdDrawDocument> pModel(new SdDrawDocument( DOCUMENT_TYPE_IMPRESS, mpDocSh ));
     pModel->NewOrLoadCompleted(NEW_DOC);
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 992c111d672c..929beb64ea6e 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -199,7 +199,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
         aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
         pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), true );
 
-        sal_uLong   nOptions = SDRINSERT_SETDEFLAYER;
+        SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER;
         bool    bIsPresTarget = false;
 
         if ((mpViewSh
@@ -207,7 +207,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
                 && mpViewSh->GetViewShell()->GetIPClient()
                 && mpViewSh->GetViewShell()->GetIPClient()->IsObjectInPlaceActive())
             || this->ISA(::sd::slidesorter::view::SlideSorterView))
-            nOptions |= SDRINSERT_DONTMARK;
+            nOptions |= SdrInsertFlags::DONTMARK;
 
         if( ( mnAction & DND_ACTION_MOVE ) && pPickObj && (pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall()) )
         {
@@ -373,7 +373,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
         if( pPickObj )
             ReplaceObjectAtView(pPickObj, *pPV, pNewMediaObj);
         else
-            InsertObjectAtView( pNewMediaObj, *pPV, SDRINSERT_SETDEFLAYER );
+            InsertObjectAtView( pNewMediaObj, *pPV, SdrInsertFlags::SETDEFLAYER );
 
         OUString referer;
         DrawDocShell * sh = GetDocSh();
@@ -552,7 +552,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
                             aRect = Rectangle( maDropPos, aSize );
 
                             SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aName, aRect );
-                            sal_uLong       nOptions = SDRINSERT_SETDEFLAYER;
+                            SdrInsertFlags nOptions = SdrInsertFlags::SETDEFLAYER;
 
                             if (mpViewSh != NULL)
                             {
@@ -560,7 +560,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
                                 SfxInPlaceClient* pIpClient =
                                     mpViewSh->GetViewShell()->GetIPClient();
                                 if (pIpClient!=NULL && pIpClient->IsObjectInPlaceActive())
-                                    nOptions |= SDRINSERT_DONTMARK;
+                                    nOptions |= SdrInsertFlags::DONTMARK;
                             }
 
                             InsertObjectAtView( pOleObj, *GetSdrPageView(), nOptions );