diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-02-27 12:00:25 +0100 |
|---|---|---|
| committer | Marco Cecchetti <mrcekets@gmail.com> | 2018-02-27 12:43:04 +0100 |
| commit | 3ae573be36d76f371308dde0274d217a02f1d965 (patch) | |
| tree | fb4acd47c5388ff1a81f6a56fd7fee072c89c598 /chart2 | |
| parent | 1a368c539138fd36690798d0e2f2285a1551fc61 (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>
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 7883794a02bf..309916d35608 100644 --- a/chart2/source/controller/inc/ChartWindow.hxx +++ b/chart2/source/controller/inc/ChartWindow.hxx @@ -58,6 +58,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&); + virtual void LogicMouseButtonUp(const MouseEvent&); + virtual void LogicMouseMove(const MouseEvent&); + void ForceInvalidate(); virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) override; virtual void Invalidate( const Rectangle& rRect, InvalidateFlags nFlags = InvalidateFlags::NONE ) override; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 58d6c291cb74..7da14ae80288 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -271,6 +271,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 = |