diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-11-06 20:48:07 +0300 |
|---|---|---|
| committer | Muhammet Kara <muhammet.kara@collabora.com> | 2019-11-06 20:26:04 +0100 |
| commit | a4fdc96db05ee1e6db338ed13c90e15297edbe7d (patch) | |
| tree | 9bde8ff2abd02d791464cd7442aae29d345d4368 /chart2 | |
| parent | Overload fillSubTypeList() for ValueSet param (diff) | |
| download | core-a4fdc96db05ee1e6db338ed13c90e15297edbe7d.tar.gz core-a4fdc96db05ee1e6db338ed13c90e15297edbe7d.zip | |
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@gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/sidebar/ChartTypePanel.cxx | 49 |
1 files changed, 2 insertions, 47 deletions
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 ); |