Skip to content

C
core
Kaydet (Commit) d29e1960 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert EE_ACTION constants to scoped enum 

Change-Id: Iaa51c235a2118e0d808400eba622fbe021571b38
üst 19ae187b
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
editeng/source/editeng/impedit.cxx
Dosyayı görüntüle @ d29e1960
...@@ -1400,8 +1400,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat ...@@ -1400,8 +1400,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat
aSel = pEditEngine->DeleteSelection(aSel); aSel = pEditEngine->DeleteSelection(aSel);
} }
PasteOrDropInfos aPasteOrDropInfos; PasteOrDropInfos aPasteOrDropInfos(PasteOrDropInfosAction::PASTE);
aPasteOrDropInfos.nAction = EE_ACTION_PASTE;
aPasteOrDropInfos.nStartPara = pEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() ); aPasteOrDropInfos.nStartPara = pEditEngine->GetEditDoc().GetPos( aSel.Min().GetNode() );
pEditEngine->HandleBeginPasteOrDrop(aPasteOrDropInfos); pEditEngine->HandleBeginPasteOrDrop(aPasteOrDropInfos);
...@@ -1839,8 +1838,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro ...@@ -1839,8 +1838,7 @@ void ImpEditView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDro
DrawSelection(); DrawSelection();
EditPaM aPaM( pDragAndDropInfo->aDropDest ); EditPaM aPaM( pDragAndDropInfo->aDropDest );
PasteOrDropInfos aPasteOrDropInfos; PasteOrDropInfos aPasteOrDropInfos(PasteOrDropInfosAction::DROP);
aPasteOrDropInfos.nAction = EE_ACTION_DROP;
aPasteOrDropInfos.nStartPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() ); aPasteOrDropInfos.nStartPara = pEditEngine->GetEditDoc().GetPos( aPaM.GetNode() );
pEditEngine->HandleBeginPasteOrDrop(aPasteOrDropInfos); pEditEngine->HandleBeginPasteOrDrop(aPasteOrDropInfos);
......
include/editeng/editdata.hxx
Dosyayı görüntüle @ d29e1960
...@@ -281,16 +281,15 @@ struct MoveParagraphsInfo ...@@ -281,16 +281,15 @@ struct MoveParagraphsInfo
{ nStartPara = nS; nEndPara = nE; nDestPara = nD; } { nStartPara = nS; nEndPara = nE; nDestPara = nD; }
}; };
#define EE_ACTION_PASTE 1 enum class PasteOrDropInfosAction { PASTE=1, DROP=2 };
#define EE_ACTION_DROP 2
struct PasteOrDropInfos struct PasteOrDropInfos
{ {
sal_uInt16 nAction; PasteOrDropInfosAction nAction;
sal_Int32 nStartPara; sal_Int32 nStartPara;
sal_Int32 nEndPara; sal_Int32 nEndPara;
PasteOrDropInfos() : nAction(0), nStartPara(-1), nEndPara(-1) {} PasteOrDropInfos(PasteOrDropInfosAction _nAction) : nAction(_nAction), nStartPara(-1), nEndPara(-1) {}
}; };
enum EENotifyType enum EENotifyType
......
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