diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-02 09:16:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-18 17:36:43 +0100 |
| commit | 9a21a3295c57f5692c5cf9b14f7342138a38e3db (patch) | |
| tree | 164dc6a3f071b989e2e072b8839fe8568128747b /svx | |
| parent | 070bb33d301daeb8767d31847c0eeaa19165d761 (diff) | |
Related: tdf#128104 extend popup handler to cover all CommandEvents
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>
(cherry picked from commit 947150821e985c255f6c802322e696eff4257a5d)
Change-Id: I26360ce5c696d0e571385d83a15876eb2286e12f
Reviewed-on: https://gerrit.libreoffice.org/82741
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/imapwnd.cxx | 5 | ||||
| -rw-r--r-- | svx/source/dialog/imapwnd.hxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/SvxPresetListBox.cxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 38d089bf4cc3..ef10b72d0e3c 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -487,7 +487,7 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) return pIMapObj; } -bool IMapWindow::ContextMenu(const CommandEvent& rCEvt) +bool IMapWindow::Command(const CommandEvent& rCEvt) { vcl::Region aRegion; @@ -530,8 +530,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 c790c3d5c66b..ae25fa906108 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; diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index 87c554c1bd75..effc9fce5fd5 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -43,8 +43,10 @@ void SvxPresetListBox::Resize() SvtValueSet::Resize(); } -bool SvxPresetListBox::ContextMenu(const CommandEvent& rEvent) +bool SvxPresetListBox::Command(const CommandEvent& rEvent) { + if (rEvent.GetCommand() != CommandEventId::ContextMenu) + return CustomWidgetController::Command(rEvent); const sal_uInt16 nIndex = GetSelectedItemId(); if(nIndex > 0) { |