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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/uibase/inc/unotools.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/unotools.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 51931ec1ce5f..876186876547 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -71,7 +71,7 @@ public: const OUString* pURL = nullptr); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; - virtual bool ContextMenu(const CommandEvent& rCEvt) override; + virtual bool Command(const CommandEvent& rCEvt) override; virtual ~SwOneExampleFrame() override; css::uno::Reference< css::frame::XModel > & GetModel() {return m_xModel;} diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index e4069815e527..e080fea31104 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -125,7 +125,7 @@ void SwOneExampleFrame::SetDrawingArea(weld::DrawingArea* pDrawingArea) CreateControl(); } -bool SwOneExampleFrame::ContextMenu(const CommandEvent& rCEvt) +bool SwOneExampleFrame::Command(const CommandEvent& rCEvt) { switch (rCEvt.GetCommand()) { @@ -139,7 +139,7 @@ bool SwOneExampleFrame::ContextMenu(const CommandEvent& rCEvt) default:; break; } - return false; + return CustomWidgetController::Command(rCEvt); } void SwOneExampleFrame::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) |