diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-02-27 12:00:25 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-26 07:46:08 +0200 |
| commit | 2cb11dc380c27215d244126960fdf62dc36e6f44 (patch) | |
| tree | c03d8553ac71a5b4ac8fcff99419a9bb1d87b592 /chart2 | |
| parent | e3072a1395d799410cf65e54bba2eac7a4fe4748 (diff) | |
lo chart2: The LokChartHelper must post the mouse events too.
Calling directly causes freezes in Execute() when instantiating
dialogs.
Change-Id: I3aa09b99e5a13027892aeba02860e87e29b172da
Reviewed-on: https://gerrit.libreoffice.org/50419
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/50483
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 584fc20be3bb6f90d17ef8a131575af9871cb1c4)
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/inc/ChartWindow.hxx | 5 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.cxx | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/chart2/source/controller/inc/ChartWindow.hxx b/chart2/source/controller/inc/ChartWindow.hxx index db9044970247..e4020c64e114 100644 --- a/chart2/source/controller/inc/ChartWindow.hxx +++ b/chart2/source/controller/inc/ChartWindow.hxx @@ -54,6 +54,11 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; + /// For LibreOfficeKit, we need to route these to the mouse events. + virtual void LogicMouseButtonDown(const MouseEvent&) override; + virtual void LogicMouseButtonUp(const MouseEvent&) override; + virtual void LogicMouseMove(const MouseEvent&) override; + void ForceInvalidate(); virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override; virtual void Invalidate( const tools::Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 8949e8dbc58a..ab1ab12e14aa 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -265,6 +265,21 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt ) vcl::Window::RequestHelp( rHEvt ); } +void ChartWindow::LogicMouseButtonDown(const MouseEvent& rEvent) +{ + MouseButtonDown(rEvent); +} + +void ChartWindow::LogicMouseButtonUp(const MouseEvent& rEvent) +{ + MouseButtonUp(rEvent); +} + +void ChartWindow::LogicMouseMove(const MouseEvent& rEvent) +{ + MouseMove(rEvent); +} + void ChartWindow::adjustHighContrastMode() { static const DrawModeFlags nContrastMode = |