diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-24 15:55:53 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:40 +0200 |
commit | 0a9f331de48e63d7188f7e253770debd5e3c180e (patch) | |
tree | b3d9c778eff2c49ac8a716fe4c7399bf97f970f2 /svx | |
parent | 2a6806a81b3fd9218af18c685b2ede36a86956f6 (diff) |
convert SDRMOUSE constants to scoped enum
Change-Id: Ia5389095683a1c012a988ed71bf769a1f25d80fb
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/graphctl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmview.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 12 | ||||
-rw-r--r-- | svx/source/table/tablecontroller.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 997c3ee38e13..98561d20faf0 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -617,7 +617,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) if ( nPolyEdit ) { SdrViewEvent aVEvt; - SdrHitKind eHit = pView->PickAnything( rMEvt, SDRMOUSEBUTTONDOWN, aVEvt ); + SdrHitKind eHit = pView->PickAnything( rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt ); if ( nPolyEdit == SID_BEZIER_INSERT && eHit == SDRHIT_MARKEDOBJECT ) pView->BegInsObjPoint( aLogPt, rMEvt.IsMod1()); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b4900cee83a4..9fd3a38a7bea 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -548,7 +548,7 @@ bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) if ( pFormShell && pFormShell->GetImpl() ) { SdrViewEvent aViewEvent; - PickAnything( _rMEvt, SDRMOUSEBUTTONDOWN, aViewEvent ); + PickAnything( _rMEvt, SdrMouseEventKind::BUTTONDOWN, aViewEvent ); pFormShell->GetImpl()->handleMouseButtonDown( aViewEvent ); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 0f8b42428bd3..14fdff48c207 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -225,7 +225,7 @@ bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) bool bRet = SdrCreateView::MouseButtonDown(rMEvt,pWin); if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) { SdrViewEvent aVEvt; - PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt); + PickAnything(rMEvt,SdrMouseEventKind::BUTTONDOWN,aVEvt); bRet = DoMouseEvent(aVEvt); } return bRet; @@ -239,7 +239,7 @@ bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) bool bRet = !bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin); if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) { SdrViewEvent aVEvt; - PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt); + PickAnything(rMEvt,SdrMouseEventKind::BUTTONUP,aVEvt); bRet = DoMouseEvent(aVEvt); } return bRet; @@ -252,7 +252,7 @@ bool SdrView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) bool bRet = SdrCreateView::MouseMove(rMEvt,pWin); if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) { SdrViewEvent aVEvt; - PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt); + PickAnything(rMEvt,SdrMouseEventKind::MOVE,aVEvt); if (DoMouseEvent(aVEvt)) bRet=true; } @@ -276,10 +276,10 @@ SfxStyleSheet* SdrView::GetStyleSheet() const return SdrCreateView::GetStyleSheet(); } -SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const +SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, SdrMouseEventKind nEventKind, SdrViewEvent& rVEvt) const { - rVEvt.bMouseDown=nEventKind==SDRMOUSEBUTTONDOWN; - rVEvt.bMouseUp=nEventKind==SDRMOUSEBUTTONUP; + rVEvt.bMouseDown=nEventKind==SdrMouseEventKind::BUTTONDOWN; + rVEvt.bMouseUp=nEventKind==SdrMouseEventKind::BUTTONUP; rVEvt.nMouseClicks=rMEvt.GetClicks(); rVEvt.nMouseMode=rMEvt.GetMode(); rVEvt.nMouseCode=rMEvt.GetButtons() | rMEvt.GetModifier(); diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 9848f65e8692..1adcc3131e4a 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -264,7 +264,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* return false; SdrViewEvent aVEvt; - if( !rMEvt.IsRight() && mpView->PickAnything(rMEvt,SDRMOUSEBUTTONDOWN, aVEvt) == SDRHIT_HANDLE ) + if( !rMEvt.IsRight() && mpView->PickAnything(rMEvt,SdrMouseEventKind::BUTTONDOWN, aVEvt) == SDRHIT_HANDLE ) return false; TableHitKind eHit = static_cast< SdrTableObj* >(mxTableObj.get())->CheckTableHit( pWindow->PixelToLogic(rMEvt.GetPosPixel()), maMouseDownPos.mnCol, maMouseDownPos.mnRow, 0 ); @@ -1894,7 +1894,7 @@ void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, co ::MouseEvent aMEvt( *pMouseEvent ); SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(aMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_TEXTEDIT) { |