diff options
| author | Pranav Kant <pranavk@collabora.com> | 2016-03-31 14:47:27 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-04-08 09:43:50 +0200 |
| commit | 610db8d5d0500aed2ca6d4da822cf70746b44d49 (patch) | |
| tree | dedfb47f30a9ee62d3491a09df87a954733cdb3e /sc | |
| parent | 396ed6ff96c02fccf6b26e983d628a5afce7d656 (diff) | |
lok context menu: Expose context menu
Change-Id: I0968689630e10f838c075e86357eb36a9a220d0d
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index a8862538e5d2..d4baed73d77f 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -295,7 +295,6 @@ protected: virtual void LoseFocus() override; virtual void RequestHelp( const HelpEvent& rEvt ) override; - virtual void Command( const CommandEvent& rCEvt ) override; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; @@ -313,6 +312,7 @@ public: rtl::Reference<sdr::overlay::OverlayManager> getOverlayManager(); void flushOverlayManager(); + virtual void Command( const CommandEvent& rCEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index ead7061e9108..81af766093c6 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -597,13 +597,21 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount, int nButt Fraction(mnTilePixelHeight * TWIPS_PER_PIXEL, mnTileTwipHeight), true); // Calc operates in pixels... - MouseEvent aEvent(Point(nX * pViewData->GetPPTX(), nY * pViewData->GetPPTY()), nCount, + Point aPos(nX * pViewData->GetPPTX(), nY * pViewData->GetPPTY()); + MouseEvent aEvent(aPos, nCount, MouseEventModifiers::SIMPLECLICK, nButtons, nModifier); switch (nType) { case LOK_MOUSEEVENT_MOUSEBUTTONDOWN: pGridWindow->MouseButtonDown(aEvent); + + // Invoke the context menu + if (nButtons & MOUSE_RIGHT) + { + const CommandEvent aCEvt(aPos, CommandEventId::ContextMenu, true, nullptr); + pGridWindow->Command(aCEvt); + } break; case LOK_MOUSEEVENT_MOUSEBUTTONUP: pGridWindow->MouseButtonUp(aEvent); |