diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-02 09:16:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-02 14:20:57 +0200 |
| commit | 947150821e985c255f6c802322e696eff4257a5d (patch) | |
| tree | a15b4716a91e9f5306fb02cea3c661cb91852619 /svx/source/dialog | |
| parent | d50eea97b3d2e1e1e47f7cdad4cb0c24fb0ed26d (diff) | |
extend popup handler to cover all CommandEvents
Change-Id: I26360ce5c696d0e571385d83a15876eb2286e12f
Reviewed-on: https://gerrit.libreoffice.org/80021
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/imapwnd.cxx | 5 | ||||
| -rw-r--r-- | svx/source/dialog/imapwnd.hxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 55ebd74a2d32..32862c2e5be2 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -482,7 +482,7 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) return pIMapObj; } -bool IMapWindow::ContextMenu(const CommandEvent& rCEvt) +bool IMapWindow::Command(const CommandEvent& rCEvt) { vcl::Region aRegion; @@ -525,8 +525,7 @@ bool IMapWindow::ContextMenu(const CommandEvent& rCEvt) return true; } - else - return CustomWidgetController::ContextMenu(rCEvt); + return CustomWidgetController::Command(rCEvt); } IMapDropTargetHelper::IMapDropTargetHelper(IMapWindow& rImapWindow) diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 464a6e6d3894..62242c9ffd1b 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -95,7 +95,7 @@ class IMapWindow final : public GraphCtrl // GraphCtrl virtual bool MouseButtonUp(const MouseEvent& rMEvt) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual bool ContextMenu(const CommandEvent& rCEvt) override; + virtual bool Command(const CommandEvent& rCEvt) override; virtual OUString RequestHelp(tools::Rectangle& rHelpArea) override; virtual void SdrObjCreated( const SdrObject& rObj ) override; virtual void SdrObjChanged( const SdrObject& rObj ) override; |