summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2018-02-27 12:00:25 +0100
committerMarco Cecchetti <mrcekets@gmail.com>2018-03-02 11:57:09 +0100
commit584fc20be3bb6f90d17ef8a131575af9871cb1c4 (patch)
tree1feeb14de7b88990225070dee62a8fd978173dc6 /chart2
parenta3646b25ac4c976b891d69759035345630c4f1a2 (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>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/inc/ChartWindow.hxx5
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx15
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 f0f6593d31fd..a0f7c31de47d 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 =