convert SW_PASTESDR to scoped enum

Change-Id: I7c33bb425ea1f32cc810205e025290a957ea68aa

sw/inc/fesh.hxx

@@ -160,9 +160,13 @@ struct SwGetCurColNumPara
     SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
 };
 
-#define SW_PASTESDR_INSERT      1
-#define SW_PASTESDR_REPLACE     2
-#define SW_PASTESDR_SETATTR     3
+enum class SwPasteSdr
+{
+    NONE        = 0,
+    Insert      = 1,
+    Replace     = 2,
+    SetAttr     = 3
+};
 
 #define SW_ADD_SELECT   1
 #define SW_ENTER_GROUP  2
@@ -547,7 +551,7 @@ public:
      Return value indicates if it was converted. */
     bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const;
 
-    void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
+    void Paste( SvStream& rStm, SwPasteSdr nAction, const Point* pPt = 0 );
     bool Paste( const Graphic &rGrf, const OUString& rURL );
     bool Paste( SotDataObject& rObj, const Point& rPt );
 

sw/source/core/frmedt/fecopy.cxx

@@ -1327,7 +1327,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel )
     }
 }
 
-void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
+void SwFEShell::Paste( SvStream& rStrm, SwPasteSdr nAction, const Point* pPt )
 {
     SET_CURR_SHELL( this );
     StartAllAction();
@@ -1361,12 +1361,12 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
         SdrObject* pClpObj = pModel->GetPage(0)->GetObj(0);
         SdrObject* pOldObj = pView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj();
 
-        if( SW_PASTESDR_SETATTR == nAction && pOldObj->ISA(SwVirtFlyDrawObj) )
-            nAction = SW_PASTESDR_REPLACE;
+        if( SwPasteSdr::SetAttr == nAction && pOldObj->ISA(SwVirtFlyDrawObj) )
+            nAction = SwPasteSdr::Replace;
 
         switch( nAction )
         {
-        case SW_PASTESDR_REPLACE:
+        case SwPasteSdr::Replace:
             {
                 const SwFrameFormat* pFormat(0);
                 const SwFrm* pAnchor(0);
@@ -1382,7 +1382,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
                     {
                         // if there is a textframe in the header/footer:
                         // do not replace but insert
-                        nAction = SW_PASTESDR_INSERT;
+                        nAction = SwPasteSdr::Insert;
                         break;
                     }
                 }
@@ -1451,7 +1451,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
             }
             break;
 
-        case SW_PASTESDR_SETATTR:
+        case SwPasteSdr::SetAttr:
             {
                 SfxItemSet aSet( GetAttrPool() );
                 const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pClpObj);
@@ -1496,14 +1496,14 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
             break;
 
         default:
-            nAction = SW_PASTESDR_INSERT;
+            nAction = SwPasteSdr::Insert;
             break;
         }
     }
     else
-        nAction = SW_PASTESDR_INSERT;
+        nAction = SwPasteSdr::Insert;
 
-    if( SW_PASTESDR_INSERT == nAction )
+    if( SwPasteSdr::Insert == nAction )
     {
         ::sw::DrawUndoGuard drawUndoGuard(GetDoc()->GetIDocumentUndoRedo());
 

sw/source/uibase/inc/swdtflvr.hxx

@@ -37,6 +37,7 @@ class SwWrtShell;
 class SvxClipboardFormatItem;
 class SwFrameShell;
 class SwView_Impl;
+enum class SwPasteSdr;
 
 typedef sal_uInt16 TransferBufferType;
 namespace nsTransferBufferType
@@ -93,17 +94,17 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
     static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
                             SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg );
     static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh,
-                        sal_uInt16 nAction, const Point* pPt, bool bInsertGRF );
+                        SwPasteSdr nAction, const Point* pPt, bool bInsertGRF );
 
     static bool _PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell,
                             bool bReReadGrf, bool bMsg );
 
     static bool _PasteSdrFormat(  TransferableDataHelper& rData,
-                                    SwWrtShell& rSh, sal_uInt16 nAction,
+                                    SwWrtShell& rSh, SwPasteSdr nAction,
                                     const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste);
 
     static bool _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
-                                SotClipboardFormatId nFormat, sal_uInt16 nAction, const Point* pPt,
+                                SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt,
                                 sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste);
 
     static bool _PasteImageMap( TransferableDataHelper& rData,
@@ -113,7 +114,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
                                         SwWrtShell& rSh, SotClipboardFormatId nFormat );
 
     static bool _PasteFileName( TransferableDataHelper& rData,
-                            SwWrtShell& rSh, SotClipboardFormatId nFormat, sal_uInt16 nAction,
+                            SwWrtShell& rSh, SotClipboardFormatId nFormat, SwPasteSdr nAction,
                             const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted );
 
     static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh,