Several more Window events to intercept for the GL3D chart.

But not painting or resizing events. Those are generic enough that no
branching is needed.

Change-Id: I0fb186da61c583c5326d2608b2153aced3fab77b

3 files changed, 32 insertions, 1 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 8786b3fe66d1..9c8c49087094 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1410,6 +1410,19 @@ void ChartController::queryGL3DChart()
     m_bGL3DChart = GL3DHelper::isGL3DDiagram(xDiagram);
 }
 
+void ChartController::executeGL3D_Tracking( const TrackingEvent& /*rTEvt*/ )
+{
+}
+
+void ChartController::executeGL3D_Command( const CommandEvent& /*rCEvt*/ )
+{
+}
+
+bool ChartController::executeGL3D_KeyInput( const KeyEvent& /*rKEvt*/ )
+{
+    return false;
+}
+
 void ChartController::executeGL3D_MouseButtonUp( const MouseEvent& /*rMEvt*/ )
 {
 }
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index e62904a49bb6..0698d56b682a 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -433,6 +433,10 @@ private:
 
     void queryGL3DChart();
 
+    void executeGL3D_Tracking( const TrackingEvent& rTEvt );
+    void executeGL3D_Command( const CommandEvent& rCEvt );
+    bool executeGL3D_KeyInput( const KeyEvent& rKEvt );
+
     void executeGL3D_MouseButtonUp( const MouseEvent& rMEvt );
     void executeGL3D_MouseButtonDown( const MouseEvent& rMEvt );
     void executeGL3D_MouseMove( const MouseEvent& rMEvt );
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index e420b3b08602..66ea74f1ef6a 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -746,8 +746,13 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
     impl_SetMousePointer( rMEvt );
 }
 
-void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ )
+void ChartController::execute_Tracking( const TrackingEvent& rTEvt )
 {
+    if (m_bGL3DChart)
+    {
+        executeGL3D_Tracking(rTEvt);
+        return;
+    }
 }
 
 void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
@@ -988,6 +993,12 @@ void ChartController::execute_LoseFocus()
 
 void ChartController::execute_Command( const CommandEvent& rCEvt )
 {
+    if (m_bGL3DChart)
+    {
+        executeGL3D_Command(rCEvt);
+        return;
+    }
+
     bool bIsAction = false;
     {
         SolarMutexGuard aGuard;
@@ -1303,6 +1314,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
 
 bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
 {
+    if (m_bGL3DChart)
+        return executeGL3D_KeyInput(rKEvt);
+
     bool bReturn=false;
 
     DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;