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 /sd | |
parent | 2a6806a81b3fd9218af18c685b2ede36a86956f6 (diff) |
convert SDRMOUSE constants to scoped enum
Change-Id: Ia5389095683a1c012a988ed71bf769a1f25d80fb
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/func/fuconbez.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fudraw.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuediglu.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fuformatpaintbrush.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fusel.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/func/futext.cxx | 16 |
6 files changed, 18 insertions, 18 deletions
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 974b49e9d323..f8dbe856a728 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -89,7 +89,7 @@ bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) bool bReturn = FuConstruct::MouseButtonDown(rMEvt); SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_HANDLE || rMEvt.IsMod1()) { @@ -144,7 +144,7 @@ bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) bool bCreated = false; SdrViewEvent aVEvt; - mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); + mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONUP, aVEvt); const size_t nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount(); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index e1a6ae50d74d..013a5117a55a 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -546,7 +546,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (pMEvt) { - eHit = mpView->PickAnything(*pMEvt, SDRMOUSEMOVE, aVEvt); + eHit = mpView->PickAnything(*pMEvt, SdrMouseEventKind::MOVE, aVEvt); } if ((eDragMode == SDRDRAG_ROTATE) && (eHit == SDRHIT_MARKEDOBJECT)) @@ -767,7 +767,7 @@ bool FuDraw::RequestHelp(const HelpEvent& rHEvt) MouseEvent aMEvt(mpWindow->GetPointerPosPixel(), 1, MouseEventModifiers::NONE, MOUSE_LEFT); - SdrHitKind eHit = mpView->PickAnything(aMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); SdrObject* pObj = aVEvt.pObj; diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index fd00f1568517..8d0169eb6ee5 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -99,7 +99,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->CaptureMouse(); SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_HANDLE) { @@ -240,7 +240,7 @@ bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) !rMEvt.IsShift() && !rMEvt.IsMod2()) { SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_NONE) { diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 0d6cfc76e117..5177664529b2 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -96,7 +96,7 @@ bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) if(mpView&&mpWindow) { SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if( (eHit == SDRHIT_TEXTEDIT) || (eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) )) { diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index f880f74aa237..9c965f7622a5 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -201,7 +201,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) bool bTextEdit = false; SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) ) { @@ -438,7 +438,7 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) **********************************************************************/ mpWindow->CaptureMouse(); SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_HANDLE && aVEvt.pHdl->GetKind() == HDL_BWGT) { @@ -882,7 +882,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) !rMEvt.IsShift() && !rMEvt.IsMod2()) { SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_NONE) { diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 24801ef7827a..ac6fb7180214 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -196,7 +196,7 @@ void FuText::DoExecute( SfxRequest& ) // Try to select an object SdrPageView* pPV = mpView->GetSdrPageView(); SdrViewEvent aVEvt; - mpView->PickAnything(aMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); mpView->MarkObj(aVEvt.pRootObj, pPV); mxTextObj.reset( dynamic_cast< SdrTextObj* >( aVEvt.pObj ) ); @@ -255,7 +255,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) mpView->SetMarkHdlWhenTextEdit(true); SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_TEXTEDIT) { @@ -280,7 +280,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) object. As a simple fix, we determine eHit after SdrEndTextEdit again, this returns then SDRHIT_NONE. */ mxTextObj.reset( NULL ); - eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); } mpView->SetCurrentObj(OBJ_TEXT); @@ -377,7 +377,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) // force new handle identification, the pointer will be dead here // since SdrEndTextEdit has resetted (deleted) the handles. aVEvt.pHdl = 0; - mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); } } @@ -399,7 +399,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if ( ! rMEvt.IsRight()) { // we need to pick again since SdrEndTextEdit can rebuild the handles list - eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if( (eHit == SDRHIT_HANDLE) || (eHit == SDRHIT_MARKEDOBJECT) ) { sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); @@ -743,7 +743,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { SdrPageView* pPV2 = mpView->GetSdrPageView(); SdrViewEvent aVEvt; - mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); mpView->MarkObj(aVEvt.pRootObj, pPV2); } @@ -1067,7 +1067,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) nSdrObjKind = mxTextObj->GetObjIdentifier(); SdrViewEvent aVEvt; - SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + SdrHitKind eHit = mpView->PickAnything(rMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); if (eHit == SDRHIT_TEXTEDIT) { @@ -1228,7 +1228,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) // Try to select an object SdrPageView* pPV = mpView->GetSdrPageView(); SdrViewEvent aVEvt; - mpView->PickAnything(aMEvt, SDRMOUSEBUTTONDOWN, aVEvt); + mpView->PickAnything(aMEvt, SdrMouseEventKind::BUTTONDOWN, aVEvt); mpView->MarkObj(aVEvt.pRootObj, pPV); if (aVEvt.pObj && aVEvt.pObj->ISA(SdrTextObj)) |