remove the GL based 3D charts

Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9
Reviewed-on: https://gerrit.libreoffice.org/57533
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

7 files changed, 0 insertions, 78 deletions

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 880cebccedbf..dcf21fc02130 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -46,7 +46,6 @@
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
-#include <com/sun/star/chart2/X3DChartWindowProvider.hpp>
 
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -68,7 +67,6 @@ namespace com { namespace sun { namespace star { namespace frame { class XModel;
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 class SvNumberFormatter;
-class OpenGLWindow;
 
 namespace chart
 {
@@ -100,7 +98,6 @@ typedef cppu::WeakImplHelper<
         ,css::document::XDocumentPropertiesSupplier
         ,css::chart2::data::XDataSource
         ,css::document::XUndoManagerSupplier
-        ,css::chart2::X3DChartWindowProvider
         ,css::util::XUpdatable
         ,css::qa::XDumper
         >
@@ -371,8 +368,6 @@ public:
 
     virtual void SAL_CALL createDefaultChart() override;
 
-    virtual sal_Bool SAL_CALL isOpenGLChart() override;
-
     // ____ XDataReceiver (public API) ____
     virtual void SAL_CALL
         attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) override;
@@ -450,9 +445,6 @@ public:
     // ____ XDataSource ____ allows access to the currently used data and data ranges
     virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
 
-    // X3DChartWindowProvider
-    virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) override;
-
     // XUpdatable
     virtual void SAL_CALL update() override;
 
@@ -475,16 +467,9 @@ public:
 
     void removeDataProviders();
 
-#if HAVE_FEATURE_OPENGL
-    OpenGLWindow* getOpenGLWindow() { return mpOpenGLWindow;}
-#endif
-
 private:
     sal_Int32 mnStart;
     sal_Int32 mnEnd;
-#if HAVE_FEATURE_OPENGL
-    VclPtr<OpenGLWindow> mpOpenGLWindow;
-#endif
 };
 
 }  // namespace chart
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 0736062c201e..9d71af8c8eab 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -54,8 +54,6 @@ namespace chart {
 class VCoordinateSystem;
 class DrawModelWrapper;
 class VDataSeries;
-class GL3DPlotterBase;
-class GL2DRenderer;
 struct CreateShapeParam2D;
 
 struct TimeBasedInfo
@@ -96,7 +94,6 @@ class ChartView : public ::cppu::WeakImplHelper<
         , public ExplicitValueProvider
         , private SfxListener
 {
-    friend class GL2DRenderer;
 private:
     void init();
 
@@ -182,14 +179,11 @@ public:
     virtual OUString SAL_CALL dump() override;
 
     void setViewDirty();
-    void updateOpenGLWindow();
 
 private: //methods
     void createShapes();
     void createShapes2D( const css::awt::Size& rPageSize );
     bool createAxisTitleShapes2D( CreateShapeParam2D& rParam, const css::awt::Size& rPageSize );
-    void createShapes3D();
-    bool isReal3DChart();
     void getMetaFile( const css::uno::Reference< css::io::XOutputStream >& xOutStream
                       , bool bUseHighContrast );
     SdrPage* getSdrPage();
@@ -201,8 +195,6 @@ private: //methods
 
     void impl_updateView( bool bCheckLockedCtrler = true );
 
-    void render();
-
     css::awt::Rectangle impl_createDiagramAndContent( const CreateShapeParam2D& rParam, const css::awt::Size& rPageSize );
 
     DECL_LINK( UpdateTimeBased, Timer*, void );
@@ -255,10 +247,8 @@ private: //member
 
     css::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
 
-    std::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter;
     TimeBasedInfo maTimeBased;
     osl::Mutex maTimeMutex;
-    std::unique_ptr<GL2DRenderer> mp2DRenderer;
 };
 
 }
diff --git a/chart2/inc/bitmaps.hlst b/chart2/inc/bitmaps.hlst
index 4e8a3109a5c4..3274c7fa7c9e 100644
--- a/chart2/inc/bitmaps.hlst
+++ b/chart2/inc/bitmaps.hlst
@@ -20,9 +20,7 @@
 #define BMP_TYPE_STOCK                  "chart2/res/typestock_16.png"
 #define BMP_TYPE_COLUMN_LINE            "chart2/res/typecolumnline_16.png"
 #define BMP_TYPE_BUBBLE                 "chart2/res/typebubble_16.png"
-#define BMP_TYPE_GL3D_BAR               "chart2/res/typegl3dbar_16.png"
 #define BMP_BUBBLE_1                    "chart2/res/bubble_52x60.png"
-#define BMP_GL3D_BAR_ROUNDRECT          "chart2/res/gl3dbar_roundrect.png"
 #define BMP_AREAS_2D                    "chart2/res/areas_52x60.png"
 #define BMP_AREAS_2D_1                  "chart2/res/areaspiled_52x60.png"
 #define BMP_AREAS_2D_3                  "chart2/res/areasfull_52x60.png"
diff --git a/chart2/inc/pch/precompiled_chartopengl.cxx b/chart2/inc/pch/precompiled_chartopengl.cxx
deleted file mode 100644
index 985b84c0a382..000000000000
--- a/chart2/inc/pch/precompiled_chartopengl.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "precompiled_chartopengl.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/inc/pch/precompiled_chartopengl.hxx b/chart2/inc/pch/precompiled_chartopengl.hxx
deleted file mode 100644
index e34013354c75..000000000000
--- a/chart2/inc/pch/precompiled_chartopengl.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/*
- This file has been autogenerated by update_pch.sh. It is possible to edit it
- manually (such as when an include file has been moved/renamed/removed). All such
- manual changes will be rewritten by the next run of update_pch.sh (which presumably
- also fixes all possible problems, so it's usually better to use it).
-
- Generated on 2017-09-20 22:51:46 using:
- ./bin/update_pch chart2 chartopengl --cutoff=12 --exclude:system --exclude:module --exclude:local
-
- If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./chart2/inc/pch/precompiled_chartopengl.hxx "make chart2.build" --find-conflicts
-*/
-
-#include <ostream>
-#include <osl/interlck.h>
-#include <osl/mutex.hxx>
-#include <osl/thread.hxx>
-#include <rtl/instance.hxx>
-#include <rtl/math.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/stringutils.hxx>
-#include <rtl/textenc.h>
-#include <rtl/ustring.h>
-#include <sal/config.h>
-#include <sal/log.hxx>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/inc/strings.hrc b/chart2/inc/strings.hrc
index e4a1844d1f18..e2eb6085f8f0 100644
--- a/chart2/inc/strings.hrc
+++ b/chart2/inc/strings.hrc
@@ -184,8 +184,6 @@
 #define STR_FILLED                                  NC_("STR_FILLED", "Filled")
 #define STR_TYPE_BUBBLE                             NC_("STR_TYPE_BUBBLE", "Bubble")
 #define STR_BUBBLE_1                                NC_("STR_BUBBLE_1", "Bubble Chart")
-#define STR_TYPE_GL3D_BAR                           NC_("STR_TYPE_GL3D_BAR", "GL3D Bar")
-#define STR_GL3D_BAR                                NC_("STR_GL3D_BAR", "GL3D Bar Chart")
 
 #define STR_INVALID_NUMBER                          NC_("STR_INVALID_NUMBER", "Numbers are required. Check your input.")
 #define STR_STEP_GT_ZERO                            NC_("STR_STEP_GT_ZERO", "The major interval requires a positive number. Check your input.")
diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx
index 44c3bf67d3cb..ba8011431809 100644
--- a/chart2/inc/unonames.hxx
+++ b/chart2/inc/unonames.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_CHART2_INC_UNONAMES_HXX
 
 #define CHART_UNONAME_SORT_BY_XVALUES       "SortByXValues"
-#define CHART_UNONAME_ROUNDED_EDGE          "RoundedEdge"
 #define CHART_UNONAME_SPLINE_TYPE           "SplineType"
 #define CHART_UNONAME_SPLINE_ORDER          "SplineOrder"
 #define CHART_UNONAME_SPLINE_RESOLUTION     "SplineResolution"