[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.cxx |   49 --------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

New commits:
commit a4fdc96db05ee1e6db338ed13c90e15297edbe7d
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Wed Nov 6 20:48:07 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Wed Nov 6 20:26:04 2019 +0100

    Use fillSubTypeList() instead of hard-coded images
    
    To fill the chart sub-type valueset on the chart
    type panel of chartdeck sidebar.
    
    Change-Id: If0098aa5ff4b344a5bd31d7425593d0e52eb08d8
    Reviewed-on: https://gerrit.libreoffice.org/82167
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index edc7beb71425..f1ed61df9ebc 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -439,54 +439,9 @@ void ChartTypePanel::fillAllControls(const ChartTypeParameter& rParameter,
     m_nChangingCalls++;
     if (m_pCurrentMainType && bAlsoResetSubTypeList)
     {
-        // FIXME: This is just to test. This if-block should just call m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
-        // after adding a new method to ColumnChartDialogController and its children
-        //m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
-        //m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
-        m_pSubTypeList->Clear();
-
-        if (rParameter.b3DLook)
-        {
-            switch (rParameter.nGeometry3D)
-            {
-                case css::chart2::DataPointGeometry3D::CYLINDER:
-                    m_pSubTypeList->InsertItem(1, Image(StockImage::Yes, BMP_SAEULE_3D_1));
-                    m_pSubTypeList->InsertItem(2, Image(StockImage::Yes, BMP_SAEULE_3D_2));
-                    m_pSubTypeList->InsertItem(3, Image(StockImage::Yes, BMP_SAEULE_3D_3));
-                    m_pSubTypeList->InsertItem(4, Image(StockImage::Yes, BMP_SAEULE_3D_4));
-                    break;
-                case css::chart2::DataPointGeometry3D::CONE:
-                    m_pSubTypeList->InsertItem(1, Image(StockImage::Yes, BMP_KEGEL_3D_1));
-                    m_pSubTypeList->InsertItem(2, Image(StockImage::Yes, BMP_KEGEL_3D_2));
-                    m_pSubTypeList->InsertItem(3, Image(StockImage::Yes, BMP_KEGEL_3D_3));
-                    m_pSubTypeList->InsertItem(4, Image(StockImage::Yes, BMP_KEGEL_3D_4));
-                    break;
-                case css::chart2::DataPointGeometry3D::PYRAMID:
-                    m_pSubTypeList->InsertItem(1, Image(StockImage::Yes, BMP_PYRAMID_3D_1));
-                    m_pSubTypeList->InsertItem(2, Image(StockImage::Yes, BMP_PYRAMID_3D_2));
-                    m_pSubTypeList->InsertItem(3, Image(StockImage::Yes, BMP_PYRAMID_3D_3));
-                    m_pSubTypeList->InsertItem(4, Image(StockImage::Yes, BMP_PYRAMID_3D_4));
-                    break;
-                default: //DataPointGeometry3D::CUBOID:
-                    m_pSubTypeList->InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_3D_1));
-                    m_pSubTypeList->InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_3D_2));
-                    m_pSubTypeList->InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_3D_3));
-                    m_pSubTypeList->InsertItem(4, Image(StockImage::Yes, BMP_COLUMNS_3D));
-                    break;
-            }
-        }
-        else
-        {
-            m_pSubTypeList->InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_2D_1));
-            m_pSubTypeList->InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_2D_2));
-            m_pSubTypeList->InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_2D_3));
-        }
-
-        m_pSubTypeList->SetItemText(1, SchResId(STR_NORMAL));
-        m_pSubTypeList->SetItemText(2, SchResId(STR_STACKED));
-        m_pSubTypeList->SetItemText(3, SchResId(STR_PERCENT));
-        m_pSubTypeList->SetItemText(4, SchResId(STR_DEEP));
+        m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
     }
+
     m_pSubTypeList->SelectItem(static_cast<sal_uInt16>(rParameter.nSubTypeIndex));
     m_pDim3DLookResourceGroup->fillControls(rParameter);
     /*m_pStackingResourceGroup->fillControls( rParameter );