diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-06-01 09:21:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-02 07:29:05 +0000 |
| commit | ef3585340eb440fd9269de8a5f0f729642f67514 (patch) | |
| tree | 38077153c1fa5355a0072595efca1bf654d6f874 | |
| parent | 3e4fad756a451eca546eb4b2cf481172c523c71a (diff) | |
remove ENABLE_GL3D_BARCHART define
enabled since commit dfb2ab0cee2ba04ce8816580447e7db8160ffac4
Change-Id: Ib260ff1ce4089ecf4778114d249d59af67c94c2c
Reviewed-on: https://gerrit.libreoffice.org/25759
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | chart2/source/controller/dialogs/tp_ChartType.cxx | 3 | ||||
| -rw-r--r-- | chart2/source/inc/macros.hxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index b5682d5ea7e8..5b75da834f77 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 2319afe019f8..daf66c45b9a2 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: */ |