[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - chart2/source

[Andras Timar]

 chart2/source/controller/dialogs/tp_ChartType.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 66220d9e1b1a2980f80ebc51b80a3f2e2eb12e85
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Jun 2 09:01:58 2015 +0200

    GL3D Bar chart -> experimental
    
    Change-Id: I2d5948651e5c31a6ce3cadcc9ff09683a60d49bd
    Reviewed-on: https://gerrit.libreoffice.org/16022
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 20bb2e707481135440b2c905fb234c5ba54d5041)
    Reviewed-on: https://gerrit.libreoffice.org/16026
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 5a13c68..75e872c 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -29,6 +29,7 @@
 #include <unonames.hxx>
 
 #include <svtools/controldims.hrc>
+#include <svtools/miscopt.hxx>
 
 #include <vcl/layout.hxx>
 #include <vcl/msgbox.hxx>
@@ -765,7 +766,9 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
     }
     m_aChartTypeDialogControllerList.push_back(new CombiColumnLineChartDialogController() );
 #if ENABLE_GL3D_BARCHART
-    m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController());
+    SvtMiscOptions aOpts;
+    if ( aOpts.IsExperimentalMode() )
+        m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController());
 #endif
 
     ::std::vector< ChartTypeDialogController* >::const_iterator       aIter = m_aChartTypeDialogControllerList.begin();