[Libreoffice-commits] core.git: chart2/source

[Jochen Nitschke]

 chart2/source/controller/dialogs/tp_ChartType.cxx |    3 +--
 chart2/source/inc/macros.hxx                      |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ef3585340eb440fd9269de8a5f0f729642f67514
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Jun 1 09:21:47 2016 +0200

    remove ENABLE_GL3D_BARCHART define
    
    enabled since commit dfb2ab0cee2ba04ce8816580447e7db8160ffac4
    
    Change-Id: Ib260ff1ce4089ecf4778114d249d59af67c94c2c
    Reviewed-on: https://gerrit.libreoffice.org/25759
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index b5682d5..5b75da8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -754,11 +754,10 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
         m_aChartTypeDialogControllerList.push_back(new StockChartDialogController() );
     }
     m_aChartTypeDialogControllerList.push_back(new CombiColumnLineChartDialogController() );
-#if ENABLE_GL3D_BARCHART
+
     SvtMiscOptions aOpts;
     if ( aOpts.IsExperimentalMode() )
         m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController());
-#endif
 
     ::std::vector< ChartTypeDialogController* >::const_iterator       aIter = m_aChartTypeDialogControllerList.begin();
     const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd  = m_aChartTypeDialogControllerList.end();
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 2319afe..daf66c4 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -30,8 +30,6 @@
     typeid( ex ).name() << ", Message: " << \
     ex.Message )
 
-#define ENABLE_GL3D_BARCHART 1
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */