Kaydet (Commit) 2a6bf436 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

convert SW_PASTESDR to scoped enum

Change-Id: I7c33bb425ea1f32cc810205e025290a957ea68aa
üst 5a2e0998
...@@ -160,9 +160,13 @@ struct SwGetCurColNumPara ...@@ -160,9 +160,13 @@ struct SwGetCurColNumPara
SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {} SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
}; };
#define SW_PASTESDR_INSERT 1 enum class SwPasteSdr
#define SW_PASTESDR_REPLACE 2 {
#define SW_PASTESDR_SETATTR 3 NONE = 0,
Insert = 1,
Replace = 2,
SetAttr = 3
};
#define SW_ADD_SELECT 1 #define SW_ADD_SELECT 1
#define SW_ENTER_GROUP 2 #define SW_ENTER_GROUP 2
...@@ -547,7 +551,7 @@ public: ...@@ -547,7 +551,7 @@ public:
Return value indicates if it was converted. */ Return value indicates if it was converted. */
bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const; 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( const Graphic &rGrf, const OUString& rURL );
bool Paste( SotDataObject& rObj, const Point& rPt ); bool Paste( SotDataObject& rObj, const Point& rPt );
......
...@@ -1327,7 +1327,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SdrModel* _pModel ) ...@@ -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 ); SET_CURR_SHELL( this );
StartAllAction(); StartAllAction();
...@@ -1361,12 +1361,12 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) ...@@ -1361,12 +1361,12 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
SdrObject* pClpObj = pModel->GetPage(0)->GetObj(0); SdrObject* pClpObj = pModel->GetPage(0)->GetObj(0);
SdrObject* pOldObj = pView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj(); SdrObject* pOldObj = pView->GetMarkedObjectList().GetMark( 0 )->GetMarkedSdrObj();
if( SW_PASTESDR_SETATTR == nAction && pOldObj->ISA(SwVirtFlyDrawObj) ) if( SwPasteSdr::SetAttr == nAction && pOldObj->ISA(SwVirtFlyDrawObj) )
nAction = SW_PASTESDR_REPLACE; nAction = SwPasteSdr::Replace;
switch( nAction ) switch( nAction )
{ {
case SW_PASTESDR_REPLACE: case SwPasteSdr::Replace:
{ {
const SwFrameFormat* pFormat(0); const SwFrameFormat* pFormat(0);
const SwFrm* pAnchor(0); const SwFrm* pAnchor(0);
...@@ -1382,7 +1382,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) ...@@ -1382,7 +1382,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
{ {
// if there is a textframe in the header/footer: // if there is a textframe in the header/footer:
// do not replace but insert // do not replace but insert
nAction = SW_PASTESDR_INSERT; nAction = SwPasteSdr::Insert;
break; break;
} }
} }
...@@ -1451,7 +1451,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) ...@@ -1451,7 +1451,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
} }
break; break;
case SW_PASTESDR_SETATTR: case SwPasteSdr::SetAttr:
{ {
SfxItemSet aSet( GetAttrPool() ); SfxItemSet aSet( GetAttrPool() );
const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pClpObj); const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pClpObj);
...@@ -1496,14 +1496,14 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) ...@@ -1496,14 +1496,14 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
break; break;
default: default:
nAction = SW_PASTESDR_INSERT; nAction = SwPasteSdr::Insert;
break; break;
} }
} }
else else
nAction = SW_PASTESDR_INSERT; nAction = SwPasteSdr::Insert;
if( SW_PASTESDR_INSERT == nAction ) if( SwPasteSdr::Insert == nAction )
{ {
::sw::DrawUndoGuard drawUndoGuard(GetDoc()->GetIDocumentUndoRedo()); ::sw::DrawUndoGuard drawUndoGuard(GetDoc()->GetIDocumentUndoRedo());
......
...@@ -37,6 +37,7 @@ class SwWrtShell; ...@@ -37,6 +37,7 @@ class SwWrtShell;
class SvxClipboardFormatItem; class SvxClipboardFormatItem;
class SwFrameShell; class SwFrameShell;
class SwView_Impl; class SwView_Impl;
enum class SwPasteSdr;
typedef sal_uInt16 TransferBufferType; typedef sal_uInt16 TransferBufferType;
namespace nsTransferBufferType namespace nsTransferBufferType
...@@ -93,17 +94,17 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper ...@@ -93,17 +94,17 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh, static bool _PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg ); SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg );
static bool _PasteTargetURL( TransferableDataHelper& rData, SwWrtShell& rSh, 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, static bool _PasteDDE( TransferableDataHelper& rData, SwWrtShell& rWrtShell,
bool bReReadGrf, bool bMsg ); bool bReReadGrf, bool bMsg );
static bool _PasteSdrFormat( TransferableDataHelper& rData, static bool _PasteSdrFormat( TransferableDataHelper& rData,
SwWrtShell& rSh, sal_uInt16 nAction, SwWrtShell& rSh, SwPasteSdr nAction,
const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste); const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste);
static bool _PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh, 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); sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste);
static bool _PasteImageMap( TransferableDataHelper& rData, static bool _PasteImageMap( TransferableDataHelper& rData,
...@@ -113,7 +114,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper ...@@ -113,7 +114,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
SwWrtShell& rSh, SotClipboardFormatId nFormat ); SwWrtShell& rSh, SotClipboardFormatId nFormat );
static bool _PasteFileName( TransferableDataHelper& rData, 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 ); const Point* pPt, sal_uInt8 nActionFlags, bool bMsg, bool * graphicInserted );
static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh, static bool _PasteDBData( TransferableDataHelper& rData, SwWrtShell& rSh,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment