remove unneeded code for 3D charts in controller

Change-Id: I5c1f624cc05a90878f717abc8ffb0b2220ce94d5

3 files changed, 1 insertions, 95 deletions

diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index ef1d606fd1a6..1045ec21f9af 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -105,7 +105,6 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const &
     m_bWaitingForDoubleClick(false),
     m_bWaitingForMouseUp(false),
     m_bConnectingToView(false),
-    m_bGL3DChart(false),
     m_xUndoManager( 0 ),
     m_aDispatchContainer( m_xCC, this ),
     m_eDrawMode( CHARTDRAW_SELECT )
@@ -480,8 +479,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
                 }
 
                 m_bConnectingToView = false;
-
-                queryGL3DChart();
             }
         }
     }
@@ -577,8 +574,6 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
     uno::Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW );
     m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
 
-    queryGL3DChart();
-
     return sal_True;
 }
 
@@ -1389,51 +1384,6 @@ DrawViewWrapper* ChartController::GetDrawViewWrapper()
     return m_pDrawViewWrapper;
 }
 
-void ChartController::queryGL3DChart()
-{
-    m_bGL3DChart = false;
-
-    uno::Reference<frame::XModel> xModel;
-    {   // it's possible that model was cleared by a different thread!
-        osl::MutexGuard g(m_aModelMutex);
-        if (!m_aModel.is())
-            return;
-        xModel = m_aModel->getModel();
-    }
-
-    uno::Reference<XChartDocument> xChartDoc(xModel, uno::UNO_QUERY);
-    if (!xChartDoc.is())
-        return;
-
-    uno::Reference<chart2::XDiagram> xDiagram = xChartDoc->getFirstDiagram();
-    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*/ )
-{
-}
-
-void ChartController::executeGL3D_MouseButtonDown( const MouseEvent& /*rMEvt*/ )
-{
-}
-
-void ChartController::executeGL3D_MouseMove( const MouseEvent& /*rMEvt*/ )
-{
-}
-
 uno::Reference< XAccessible > ChartController::CreateAccessible()
 {
     uno::Reference< XAccessible > xResult = new AccessibleChartView( m_xCC, GetDrawViewWrapper() );
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 41bc76398dc8..6d673fa229e7 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -432,16 +432,6 @@ private:
     DrawModelWrapper* GetDrawModelWrapper();
     DrawViewWrapper* GetDrawViewWrapper();
 
-    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 );
-
 private:
     class TheModelRef;
     friend class ChartController::TheModelRef;
@@ -524,8 +514,6 @@ private:
 
     bool volatile       m_bConnectingToView;
 
-    bool m_bGL3DChart;
-
     ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >    m_xUndoManager;
     ::std::auto_ptr< UndoGuard >                                                    m_pTextActionUndoGuard;
     /// needed for dispatching URLs in FeatureStateEvents
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index a05c685f71c8..905bcaafb5ce 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -562,12 +562,6 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl)
 
 void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
 {
-    if (m_bGL3DChart)
-    {
-        executeGL3D_MouseButtonDown(rMEvt);
-        return;
-    }
-
     SolarMutexGuard aGuard;
 
     m_bWaitingForMouseUp = true;
@@ -714,12 +708,6 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
 
 void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
 {
-    if (m_bGL3DChart)
-    {
-        executeGL3D_MouseMove(rMEvt);
-        return;
-    }
-
     SolarMutexGuard aGuard;
 
     DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper;
@@ -740,23 +728,12 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
     impl_SetMousePointer( rMEvt );
 }
 
-void ChartController::execute_Tracking( const TrackingEvent& rTEvt )
+void ChartController::execute_Tracking( const TrackingEvent& )
 {
-    if (m_bGL3DChart)
-    {
-        executeGL3D_Tracking(rTEvt);
-        return;
-    }
 }
 
 void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
 {
-    if (m_bGL3DChart)
-    {
-        executeGL3D_MouseButtonUp(rMEvt);
-        return;
-    }
-
     ControllerLockGuardUNO aCLGuard( getModel() );
     bool bMouseUpWithoutMouseDown = !m_bWaitingForMouseUp;
     m_bWaitingForMouseUp = false;
@@ -987,12 +964,6 @@ void ChartController::execute_LoseFocus()
 
 void ChartController::execute_Command( const CommandEvent& rCEvt )
 {
-    if (m_bGL3DChart)
-    {
-        executeGL3D_Command(rCEvt);
-        return;
-    }
-
     bool bIsAction = false;
     {
         SolarMutexGuard aGuard;
@@ -1308,9 +1279,6 @@ 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;