tdf#124295 - Always select a 3D scheme in the chart wizard

Change-Id: Ic0a39b4cb6f7af6fbdd99fc93677a0c2d966234d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115671
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>

4 files changed, 39 insertions, 26 deletions

diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
index 199606abef69..9ab5dff70f20 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
@@ -48,24 +48,31 @@ void Dim3DLookResourceGroup::fillControls(const ChartTypeParameter& rParameter)
     m_xCB_3DLook->set_active(rParameter.b3DLook);
     m_xLB_Scheme->set_sensitive(rParameter.b3DLook);
 
-    if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple)
-        m_xLB_Scheme->set_active(POS_3DSCHEME_SIMPLE);
-    else if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic)
-        m_xLB_Scheme->set_active(POS_3DSCHEME_REALISTIC);
-    else
-        m_xLB_Scheme->set_active(-1);
+    // tdf#124295 - select always a 3D scheme
+    switch (rParameter.eThreeDLookScheme)
+    {
+        case ThreeDLookScheme::ThreeDLookScheme_Simple:
+            m_xLB_Scheme->set_active(POS_3DSCHEME_SIMPLE);
+            break;
+        case ThreeDLookScheme::ThreeDLookScheme_Realistic:
+        case ThreeDLookScheme::ThreeDLookScheme_Unknown:
+            m_xLB_Scheme->set_active(POS_3DSCHEME_REALISTIC);
+            break;
+    }
 }
 
 void Dim3DLookResourceGroup::fillParameter(ChartTypeParameter& rParameter)
 {
     rParameter.b3DLook = m_xCB_3DLook->get_active();
-    const int nPos = m_xLB_Scheme->get_active();
-    if (nPos == POS_3DSCHEME_SIMPLE)
-        rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
-    else if (nPos == POS_3DSCHEME_REALISTIC)
-        rParameter.eThreeDLookScheme = ThreeDLookScheme_Realistic;
-    else
-        rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
+    // tdf#124295 - select always a 3D scheme
+    switch (m_xLB_Scheme->get_active())
+    {
+        case POS_3DSCHEME_SIMPLE:
+            rParameter.eThreeDLookScheme = ThreeDLookScheme::ThreeDLookScheme_Simple;
+            break;
+        default:
+            rParameter.eThreeDLookScheme = ThreeDLookScheme::ThreeDLookScheme_Realistic;
+    }
 }
 
 IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, weld::ToggleButton&, void)
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 748df3e1b40e..b0fda08c72f6 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -53,7 +53,7 @@ ChartTypeParameter::ChartTypeParameter()
                     , nCurveResolution(20)
                     , nSplineOrder(3)
                     , nGeometry3D(DataPointGeometry3D::CUBOID)
-                    , eThreeDLookScheme(ThreeDLookScheme_Realistic)
+                    , eThreeDLookScheme(ThreeDLookScheme::ThreeDLookScheme_Realistic)
                     , bSortByXValues(false)
                     , mbRoundedEdge(false)
 {
@@ -73,7 +73,7 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit
                     , nCurveResolution(20)
                     , nSplineOrder(3)
                     , nGeometry3D(DataPointGeometry3D::CUBOID)
-                    , eThreeDLookScheme(ThreeDLookScheme_Realistic)
+                    , eThreeDLookScheme(ThreeDLookScheme::ThreeDLookScheme_Realistic)
                     , bSortByXValues(false)
                     , mbRoundedEdge(false)
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index c24cf6fab0d9..2ca07dd15676 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -44,7 +44,7 @@ struct lcl_ModelProperties
         : m_aShadeMode(drawing::ShadeMode_FLAT)
         , m_nRoundedEdges(-1)
         , m_nObjectLines(-1)
-        , m_eScheme(::chart::ThreeDLookScheme_Unknown)
+        , m_eScheme(::chart::ThreeDLookScheme::ThreeDLookScheme_Unknown)
     {}
 };
 
@@ -248,13 +248,13 @@ void ThreeD_SceneAppearance_TabPage::updateScheme()
         m_xLB_Scheme->remove(POS_3DSCHEME_CUSTOM);
     switch( aProps.m_eScheme )
     {
-        case ThreeDLookScheme_Simple:
+        case ThreeDLookScheme::ThreeDLookScheme_Simple:
             m_xLB_Scheme->set_active( POS_3DSCHEME_SIMPLE );
             break;
-        case ThreeDLookScheme_Realistic:
+        case ThreeDLookScheme::ThreeDLookScheme_Realistic:
             m_xLB_Scheme->set_active( POS_3DSCHEME_REALISTIC );
             break;
-        case ThreeDLookScheme_Unknown:
+        case ThreeDLookScheme::ThreeDLookScheme_Unknown:
             {
                 m_xLB_Scheme->insert_text(POS_3DSCHEME_CUSTOM, m_aCustom);
                 m_xLB_Scheme->set_active(POS_3DSCHEME_CUSTOM);
@@ -275,9 +275,9 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, weld::ComboBox&
         uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) );
 
         if( m_xLB_Scheme->get_active() == POS_3DSCHEME_REALISTIC )
-            ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic );
+            ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme::ThreeDLookScheme_Realistic );
         else if( m_xLB_Scheme->get_active() == POS_3DSCHEME_SIMPLE )
-            ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple );
+            ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme::ThreeDLookScheme_Simple );
         else
         {
             OSL_FAIL( "Invalid Entry selected" );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index e209f508e3cc..19084e9e5180 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -178,7 +178,11 @@ void ChartTypeTabPage::stateChanged()
 
     //detect the new ThreeDLookScheme
     uno::Reference<XDiagram> xDiagram = ChartModelHelper::findDiagram(m_xChartModel);
-    aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme(xDiagram);
+    // tdf#124295 - select always a 3D scheme
+    if (ThreeDLookScheme aThreeDLookScheme = ThreeDHelper::detectScheme(xDiagram);
+        aThreeDLookScheme != ThreeDLookScheme::ThreeDLookScheme_Unknown)
+        aParameter.eThreeDLookScheme = aThreeDLookScheme;
+
     try
     {
         uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
@@ -240,8 +244,9 @@ void ChartTypeTabPage::selectMainType()
     commitToModel( aParameter );
     //detect the new ThreeDLookScheme
     aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( ChartModelHelper::findDiagram( m_xChartModel ) );
-    if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic )
-        aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic;
+    if (!aParameter.b3DLook
+        && aParameter.eThreeDLookScheme != ThreeDLookScheme::ThreeDLookScheme_Realistic)
+        aParameter.eThreeDLookScheme = ThreeDLookScheme::ThreeDLookScheme_Realistic;
 
     uno::Reference<XDiagram> xDiagram = ChartModelHelper::findDiagram(m_xChartModel);
     try
@@ -320,8 +325,9 @@ void ChartTypeTabPage::initializePage()
 
             //set ThreeDLookScheme
             aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( xDiagram );
-            if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic )
-                aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic;
+            if (!aParameter.b3DLook
+                && aParameter.eThreeDLookScheme != ThreeDLookScheme::ThreeDLookScheme_Realistic)
+                aParameter.eThreeDLookScheme = ThreeDLookScheme::ThreeDLookScheme_Realistic;
 
             try
             {