Add more resource groups to ChartTypePanel

Change-Id: I64c1d8b418f9abb537b4f23c3b31aa0e48bd3faa
Reviewed-on: https://gerrit.libreoffice.org/82119
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>

2 files changed, 461 insertions, 22 deletions

diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index f1ed61df9ebc..006e9818a8f3 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -23,6 +23,7 @@
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
+#include <ChartResourceGroupDlgs.hxx>
 #include <ChartTypeDialogController.hxx>
 #include <ChartTypeHelper.hxx>
 #include <DiagramHelper.hxx>
@@ -34,6 +35,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 
+#include <com/sun/star/chart2/CurveStyle.hpp>
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -138,6 +140,423 @@ IMPL_LINK_NOARG(Dim3DLookResourceGroup_unwelded, SelectSchemeHdl, ListBox&, void
         m_pChangeListener->stateChanged(this);
 }
 
+class StackingResourceGroup_unwelded : public ChangingResource
+{
+public:
+    explicit StackingResourceGroup_unwelded(VclBuilderContainer* pWindow);
+
+    void showControls(bool bShow, bool bShowDeepStacking);
+
+    void fillControls(const ChartTypeParameter& rParameter);
+    void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+    DECL_LINK(StackingChangeHdl, RadioButton&, void);
+    DECL_LINK(StackingEnableHdl, CheckBox&, void);
+
+private:
+    VclPtr<CheckBox> m_pCB_Stacked;
+    VclPtr<RadioButton> m_pRB_Stack_Y;
+    VclPtr<RadioButton> m_pRB_Stack_Y_Percent;
+    VclPtr<RadioButton> m_pRB_Stack_Z;
+};
+
+StackingResourceGroup_unwelded::StackingResourceGroup_unwelded(VclBuilderContainer* pWindow)
+    : ChangingResource()
+{
+    pWindow->get(m_pCB_Stacked, "stack");
+    pWindow->get(m_pRB_Stack_Y, "ontop");
+    pWindow->get(m_pRB_Stack_Y_Percent, "percent");
+    pWindow->get(m_pRB_Stack_Z, "deep");
+
+    m_pCB_Stacked->SetToggleHdl(LINK(this, StackingResourceGroup_unwelded, StackingEnableHdl));
+    m_pRB_Stack_Y->SetToggleHdl(LINK(this, StackingResourceGroup_unwelded, StackingChangeHdl));
+    m_pRB_Stack_Y_Percent->SetToggleHdl(
+        LINK(this, StackingResourceGroup_unwelded, StackingChangeHdl));
+    m_pRB_Stack_Z->SetToggleHdl(LINK(this, StackingResourceGroup_unwelded, StackingChangeHdl));
+}
+
+void StackingResourceGroup_unwelded::showControls(bool bShow, bool bShowDeepStacking)
+{
+    m_pCB_Stacked->Show(bShow);
+    m_pRB_Stack_Y->Show(bShow);
+    m_pRB_Stack_Y_Percent->Show(bShow);
+    m_pRB_Stack_Z->Show(bShow && bShowDeepStacking);
+}
+
+void StackingResourceGroup_unwelded::fillControls(const ChartTypeParameter& rParameter)
+{
+    m_pCB_Stacked->Check(
+        rParameter.eStackMode != GlobalStackMode_NONE
+        && rParameter.eStackMode
+               != GlobalStackMode_STACK_Z); //todo remove this condition if z stacking radio button is really used
+    switch (rParameter.eStackMode)
+    {
+        case GlobalStackMode_STACK_Y:
+            m_pRB_Stack_Y->Check();
+            break;
+        case GlobalStackMode_STACK_Y_PERCENT:
+            m_pRB_Stack_Y_Percent->Check();
+            break;
+        case GlobalStackMode_STACK_Z:
+            //todo uncomment this condition if z stacking radio button is really used
+            /*
+            if( rParameter.b3DLook )
+                m_pRB_Stack_Z->Check();
+            else
+            */
+            m_pRB_Stack_Y->Check();
+            break;
+        default:
+            m_pRB_Stack_Y->Check();
+            break;
+    }
+    //dis/enabling
+    m_pCB_Stacked->Enable(!rParameter.bXAxisWithValues);
+    m_pRB_Stack_Y->Enable(m_pCB_Stacked->IsChecked() && !rParameter.bXAxisWithValues);
+    m_pRB_Stack_Y_Percent->Enable(m_pCB_Stacked->IsChecked() && !rParameter.bXAxisWithValues);
+    m_pRB_Stack_Z->Enable(m_pCB_Stacked->IsChecked() && rParameter.b3DLook);
+}
+
+void StackingResourceGroup_unwelded::fillParameter(ChartTypeParameter& rParameter)
+{
+    if (!m_pCB_Stacked->IsChecked())
+        rParameter.eStackMode = GlobalStackMode_NONE;
+    else if (m_pRB_Stack_Y->IsChecked())
+        rParameter.eStackMode = GlobalStackMode_STACK_Y;
+    else if (m_pRB_Stack_Y_Percent->IsChecked())
+        rParameter.eStackMode = GlobalStackMode_STACK_Y_PERCENT;
+    else if (m_pRB_Stack_Z->IsChecked())
+        rParameter.eStackMode = GlobalStackMode_STACK_Z;
+}
+
+IMPL_LINK(StackingResourceGroup_unwelded, StackingChangeHdl, RadioButton&, rRadio, void)
+{
+    //for each radio click there are coming two change events
+    //first uncheck of previous button -> ignore that call
+    //the second call gives the check of the new button
+    if (m_pChangeListener && rRadio.IsChecked())
+        m_pChangeListener->stateChanged(this);
+}
+
+IMPL_LINK_NOARG(StackingResourceGroup_unwelded, StackingEnableHdl, CheckBox&, void)
+{
+    if (m_pChangeListener)
+        m_pChangeListener->stateChanged(this);
+}
+
+#define POS_LINETYPE_STRAIGHT 0
+#define POS_LINETYPE_SMOOTH 1
+#define POS_LINETYPE_STEPPED 2
+
+class SplineResourceGroup_unwelded : public ChangingResource
+{
+public:
+    explicit SplineResourceGroup_unwelded(VclBuilderContainer* pWindow);
+
+    void showControls(bool bShow);
+
+    void fillControls(const ChartTypeParameter& rParameter);
+    void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+    DECL_LINK(LineTypeChangeHdl, ListBox&, void);
+    DECL_LINK(SplineDetailsDialogHdl, Button*, void);
+    DECL_LINK(SteppedDetailsDialogHdl, Button*, void);
+    SplinePropertiesDialog& getSplinePropertiesDialog();
+    SteppedPropertiesDialog& getSteppedPropertiesDialog();
+
+private:
+    VclPtr<FixedText> m_pFT_LineType;
+    VclPtr<ListBox> m_pLB_LineType;
+    VclPtr<PushButton> m_pPB_DetailsDialog;
+    std::unique_ptr<SplinePropertiesDialog> m_xSplinePropertiesDialog;
+    std::unique_ptr<SteppedPropertiesDialog> m_xSteppedPropertiesDialog;
+};
+
+SplineResourceGroup_unwelded::SplineResourceGroup_unwelded(VclBuilderContainer* pWindow)
+    : ChangingResource()
+{
+    pWindow->get(m_pFT_LineType, "linetypeft");
+    pWindow->get(m_pLB_LineType, "linetype");
+    pWindow->get(m_pPB_DetailsDialog, "properties");
+
+    m_pLB_LineType->SetSelectHdl(LINK(this, SplineResourceGroup_unwelded, LineTypeChangeHdl));
+}
+
+SplinePropertiesDialog& SplineResourceGroup_unwelded::getSplinePropertiesDialog()
+{
+    if (!m_xSplinePropertiesDialog.get())
+    {
+        Dialog* pDialog = m_pPB_DetailsDialog->GetParentDialog();
+        m_xSplinePropertiesDialog.reset(
+            new SplinePropertiesDialog(pDialog ? pDialog->GetFrameWeld() : nullptr));
+    }
+    return *m_xSplinePropertiesDialog;
+}
+
+SteppedPropertiesDialog& SplineResourceGroup_unwelded::getSteppedPropertiesDialog()
+{
+    if (!m_xSteppedPropertiesDialog)
+    {
+        m_xSteppedPropertiesDialog.reset(
+            new SteppedPropertiesDialog(m_pPB_DetailsDialog->GetFrameWeld()));
+    }
+    return *m_xSteppedPropertiesDialog;
+}
+
+void SplineResourceGroup_unwelded::showControls(bool bShow)
+{
+    m_pFT_LineType->Show(bShow);
+    m_pLB_LineType->Show(bShow);
+    m_pPB_DetailsDialog->Show(bShow);
+}
+
+void SplineResourceGroup_unwelded::fillControls(const ChartTypeParameter& rParameter)
+{
+    switch (rParameter.eCurveStyle)
+    {
+        case chart2::CurveStyle_LINES:
+            m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STRAIGHT);
+            m_pPB_DetailsDialog->Enable(false);
+            break;
+        case chart2::CurveStyle_CUBIC_SPLINES:
+        case chart2::CurveStyle_B_SPLINES:
+            m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH);
+            m_pPB_DetailsDialog->Enable();
+            m_pPB_DetailsDialog->SetClickHdl(
+                LINK(this, SplineResourceGroup_unwelded, SplineDetailsDialogHdl));
+            m_pPB_DetailsDialog->SetQuickHelpText(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
+            getSplinePropertiesDialog().fillControls(rParameter);
+            break;
+        case chart2::CurveStyle_STEP_START:
+        case chart2::CurveStyle_STEP_END:
+        case chart2::CurveStyle_STEP_CENTER_X:
+        case chart2::CurveStyle_STEP_CENTER_Y:
+            m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED);
+            m_pPB_DetailsDialog->Enable();
+            m_pPB_DetailsDialog->SetClickHdl(
+                LINK(this, SplineResourceGroup_unwelded, SteppedDetailsDialogHdl));
+            m_pPB_DetailsDialog->SetQuickHelpText(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
+            getSteppedPropertiesDialog().fillControls(rParameter);
+            break;
+        default:
+            m_pLB_LineType->SetNoSelection();
+            m_pPB_DetailsDialog->Enable(false);
+    }
+}
+void SplineResourceGroup_unwelded::fillParameter(ChartTypeParameter& rParameter)
+{
+    switch (m_pLB_LineType->GetSelectedEntryPos())
+    {
+        case POS_LINETYPE_SMOOTH:
+            getSplinePropertiesDialog().fillParameter(rParameter, true);
+            break;
+        case POS_LINETYPE_STEPPED:
+            getSteppedPropertiesDialog().fillParameter(rParameter, true);
+            break;
+        default: // includes POS_LINETYPE_STRAIGHT
+            rParameter.eCurveStyle = chart2::CurveStyle_LINES;
+            break;
+    }
+}
+IMPL_LINK_NOARG(SplineResourceGroup_unwelded, LineTypeChangeHdl, ListBox&, void)
+{
+    if (m_pChangeListener)
+        m_pChangeListener->stateChanged(this);
+}
+IMPL_LINK_NOARG(SplineResourceGroup_unwelded, SplineDetailsDialogHdl, Button*, void)
+{
+    ChartTypeParameter aOldParameter;
+    getSplinePropertiesDialog().fillParameter(aOldParameter, m_pLB_LineType->GetSelectedEntryPos()
+                                                                 == POS_LINETYPE_SMOOTH);
+
+    const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos();
+    m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH);
+    if (getSplinePropertiesDialog().run() == RET_OK)
+    {
+        if (m_pChangeListener)
+            m_pChangeListener->stateChanged(this);
+    }
+    else
+    {
+        //restore old state:
+        m_pLB_LineType->SelectEntryPos(iOldLineTypePos);
+        getSplinePropertiesDialog().fillControls(aOldParameter);
+    }
+}
+IMPL_LINK_NOARG(SplineResourceGroup_unwelded, SteppedDetailsDialogHdl, Button*, void)
+{
+    ChartTypeParameter aOldParameter;
+    getSteppedPropertiesDialog().fillParameter(aOldParameter, m_pLB_LineType->GetSelectedEntryPos()
+                                                                  == POS_LINETYPE_STEPPED);
+
+    const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos();
+    m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED);
+    if (getSteppedPropertiesDialog().run() == RET_OK)
+    {
+        if (m_pChangeListener)
+            m_pChangeListener->stateChanged(this);
+    }
+    else
+    {
+        //restore old state:
+        m_pLB_LineType->SelectEntryPos(iOldLineTypePos);
+        getSteppedPropertiesDialog().fillControls(aOldParameter);
+    }
+}
+
+class BarGeometryResources_unwelded
+{
+public:
+    explicit BarGeometryResources_unwelded(VclBuilderContainer* pParent);
+
+    void Show(bool bShow);
+    void Enable(bool bEnable);
+
+    sal_Int32 GetSelectedEntryCount() const;
+    sal_Int32 GetSelectedEntryPos() const;
+    void SelectEntryPos(sal_Int32 nPos);
+
+    void SetSelectHdl(const Link<ListBox&, void>& rLink);
+
+private:
+    VclPtr<FixedText> m_pFT_Geometry;
+    VclPtr<ListBox> m_pLB_Geometry;
+};
+
+BarGeometryResources_unwelded::BarGeometryResources_unwelded(VclBuilderContainer* pWindow)
+{
+    pWindow->get(m_pFT_Geometry, "shapeft");
+    pWindow->get(m_pLB_Geometry, "shape");
+}
+
+void BarGeometryResources_unwelded::SetSelectHdl(const Link<ListBox&, void>& rLink)
+{
+    m_pLB_Geometry->SetSelectHdl(rLink);
+}
+
+void BarGeometryResources_unwelded::Show(bool bShow)
+{
+    m_pFT_Geometry->Show(bShow);
+    m_pLB_Geometry->Show(bShow);
+}
+void BarGeometryResources_unwelded::Enable(bool bEnable)
+{
+    m_pFT_Geometry->Enable(bEnable);
+    m_pLB_Geometry->Enable(bEnable);
+}
+
+sal_Int32 BarGeometryResources_unwelded::GetSelectedEntryCount() const
+{
+    return m_pLB_Geometry->GetSelectedEntryCount();
+}
+
+sal_Int32 BarGeometryResources_unwelded::GetSelectedEntryPos() const
+{
+    return m_pLB_Geometry->GetSelectedEntryPos();
+}
+
+void BarGeometryResources_unwelded::SelectEntryPos(sal_Int32 nPos)
+{
+    if (nPos < m_pLB_Geometry->GetEntryCount())
+        m_pLB_Geometry->SelectEntryPos(nPos);
+}
+
+class GeometryResourceGroup_unwelded : public ChangingResource
+{
+public:
+    explicit GeometryResourceGroup_unwelded(VclBuilderContainer* pWindow);
+
+    void showControls(bool bShow);
+
+    void fillControls(const ChartTypeParameter& rParameter);
+    void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+    DECL_LINK(GeometryChangeHdl, ListBox&, void);
+
+private:
+    BarGeometryResources_unwelded m_aGeometryResources;
+};
+
+GeometryResourceGroup_unwelded::GeometryResourceGroup_unwelded(VclBuilderContainer* pWindow)
+    : ChangingResource()
+    , m_aGeometryResources(pWindow)
+{
+    m_aGeometryResources.SetSelectHdl(
+        LINK(this, GeometryResourceGroup_unwelded, GeometryChangeHdl));
+}
+
+void GeometryResourceGroup_unwelded::showControls(bool bShow) { m_aGeometryResources.Show(bShow); }
+
+void GeometryResourceGroup_unwelded::fillControls(const ChartTypeParameter& rParameter)
+{
+    sal_uInt16 nGeometry3D = static_cast<sal_uInt16>(rParameter.nGeometry3D);
+    m_aGeometryResources.SelectEntryPos(nGeometry3D);
+    m_aGeometryResources.Enable(rParameter.b3DLook);
+}
+
+void GeometryResourceGroup_unwelded::fillParameter(ChartTypeParameter& rParameter)
+{
+    rParameter.nGeometry3D = 1;
+    if (m_aGeometryResources.GetSelectedEntryCount())
+        rParameter.nGeometry3D = m_aGeometryResources.GetSelectedEntryPos();
+}
+
+IMPL_LINK_NOARG(GeometryResourceGroup_unwelded, GeometryChangeHdl, ListBox&, void)
+{
+    if (m_pChangeListener)
+        m_pChangeListener->stateChanged(this);
+}
+
+class SortByXValuesResourceGroup_unwelded : public ChangingResource
+{
+public:
+    explicit SortByXValuesResourceGroup_unwelded(VclBuilderContainer* pWindow);
+
+    void showControls(bool bShow);
+
+    void fillControls(const ChartTypeParameter& rParameter);
+    void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+    DECL_LINK(SortByXValuesCheckHdl, CheckBox&, void);
+
+private:
+    VclPtr<CheckBox> m_pCB_XValueSorting;
+};
+
+SortByXValuesResourceGroup_unwelded::SortByXValuesResourceGroup_unwelded(
+    VclBuilderContainer* pWindow)
+    : ChangingResource()
+{
+    pWindow->get(m_pCB_XValueSorting, "sort");
+    m_pCB_XValueSorting->SetToggleHdl(
+        LINK(this, SortByXValuesResourceGroup_unwelded, SortByXValuesCheckHdl));
+}
+
+void SortByXValuesResourceGroup_unwelded::showControls(bool bShow)
+{
+    m_pCB_XValueSorting->Show(bShow);
+}
+
+void SortByXValuesResourceGroup_unwelded::fillControls(const ChartTypeParameter& rParameter)
+{
+    m_pCB_XValueSorting->Check(rParameter.bSortByXValues);
+}
+
+void SortByXValuesResourceGroup_unwelded::fillParameter(ChartTypeParameter& rParameter)
+{
+    rParameter.bSortByXValues = m_pCB_XValueSorting->IsChecked();
+}
+
+IMPL_LINK_NOARG(SortByXValuesResourceGroup_unwelded, SortByXValuesCheckHdl, CheckBox&, void)
+{
+    if (m_pChangeListener)
+        m_pChangeListener->stateChanged(this);
+}
+
 namespace sidebar
 {
 namespace
@@ -169,6 +588,10 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
     , mxListener(new ChartSidebarModifyListener(this))
     , mbModelValid(true)
     , m_pDim3DLookResourceGroup(new Dim3DLookResourceGroup_unwelded(this))
+    , m_pStackingResourceGroup(new StackingResourceGroup_unwelded(this))
+    , m_pSplineResourceGroup(new SplineResourceGroup_unwelded(this))
+    , m_pGeometryResourceGroup(new GeometryResourceGroup_unwelded(this))
+    , m_pSortByXValuesResourceGroup(new SortByXValuesResourceGroup_unwelded(this))
     , m_xChartModel(mxModel, css::uno::UNO_QUERY_THROW)
     , m_aChartTypeDialogControllerList(0)
     , m_pCurrentMainType(nullptr)
@@ -233,6 +656,10 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
     }
 
     m_pDim3DLookResourceGroup->setChangeListener(this);
+    m_pStackingResourceGroup->setChangeListener(this);
+    m_pSplineResourceGroup->setChangeListener(this);
+    m_pGeometryResourceGroup->setChangeListener(this);
+    m_pSortByXValuesResourceGroup->setChangeListener(this);
 
     Initialize();
 }
@@ -251,6 +678,10 @@ void ChartTypePanel::dispose()
 
     //delete all resource helpers
     m_pDim3DLookResourceGroup.reset();
+    m_pStackingResourceGroup.reset();
+    m_pSplineResourceGroup.reset();
+    m_pGeometryResourceGroup.reset();
+    m_pSortByXValuesResourceGroup.reset();
 
     PanelLayout::dispose();
 }
@@ -327,10 +758,10 @@ void ChartTypePanel::Initialize()
     {
         m_pSubTypeList->Hide();
         m_pDim3DLookResourceGroup->showControls(false);
-        /*m_pStackingResourceGroup->showControls( false, false );
-            m_pSplineResourceGroup->showControls( false );
-            m_pGeometryResourceGroup->showControls( false );
-            m_pSortByXValuesResourceGroup->showControls( false );*/
+        m_pStackingResourceGroup->showControls(false, false);
+        m_pSplineResourceGroup->showControls(false);
+        m_pGeometryResourceGroup->showControls(false);
+        m_pSortByXValuesResourceGroup->showControls(false);
     }
 }
 
@@ -422,15 +853,21 @@ void ChartTypePanel::showAllControls(ChartTypeDialogController& rTypeController)
 
     bool bShow = rTypeController.shouldShow_3DLookControl();
     m_pDim3DLookResourceGroup->showControls(bShow);
-    /*bShow = rTypeController.shouldShow_StackingControl();
-    m_pStackingResourceGroup->showControls( bShow, rTypeController.shouldShow_DeepStackingControl() );
+
+    bShow = rTypeController.shouldShow_StackingControl();
+    m_pStackingResourceGroup->showControls(bShow, rTypeController.shouldShow_DeepStackingControl());
+
     bShow = rTypeController.shouldShow_SplineControl();
-    m_pSplineResourceGroup->showControls( bShow );
+    m_pSplineResourceGroup->showControls(bShow);
+
     bShow = rTypeController.shouldShow_GeometryControl();
-    m_pGeometryResourceGroup->showControls( bShow );
+    m_pGeometryResourceGroup->showControls(bShow);
+
     bShow = rTypeController.shouldShow_SortByXValuesResourceGroup();
-    m_pSortByXValuesResourceGroup->showControls( bShow );
-    rTypeController.showExtraControls(this);*/
+    m_pSortByXValuesResourceGroup->showControls(bShow);
+
+    // TODO: Extend ChartTypeDialogController::showExtraControls()
+    //rTypeController.showExtraControls(this);
 }
 
 void ChartTypePanel::fillAllControls(const ChartTypeParameter& rParameter,
@@ -443,11 +880,13 @@ void ChartTypePanel::fillAllControls(const ChartTypeParameter& rParameter,
     }
 
     m_pSubTypeList->SelectItem(static_cast<sal_uInt16>(rParameter.nSubTypeIndex));
+
     m_pDim3DLookResourceGroup->fillControls(rParameter);
-    /*m_pStackingResourceGroup->fillControls( rParameter );
-    m_pSplineResourceGroup->fillControls( rParameter );
-    m_pGeometryResourceGroup->fillControls( rParameter );
-    m_pSortByXValuesResourceGroup->fillControls( rParameter );*/
+    m_pStackingResourceGroup->fillControls(rParameter);
+    m_pSplineResourceGroup->fillControls(rParameter);
+    m_pGeometryResourceGroup->fillControls(rParameter);
+    m_pSortByXValuesResourceGroup->fillControls(rParameter);
+
     m_nChangingCalls--;
 }
 
@@ -456,10 +895,10 @@ ChartTypeParameter ChartTypePanel::getCurrentParamter() const
     ChartTypeParameter aParameter;
     aParameter.nSubTypeIndex = static_cast<sal_Int32>(m_pSubTypeList->GetSelectedItemId());
     m_pDim3DLookResourceGroup->fillParameter(aParameter);
-    //m_pStackingResourceGroup->fillParameter( aParameter );
-    //m_pSplineResourceGroup->fillParameter( aParameter );
-    //m_pGeometryResourceGroup->fillParameter( aParameter );
-    //m_pSortByXValuesResourceGroup->fillParameter( aParameter );
+    m_pStackingResourceGroup->fillParameter(aParameter);
+    m_pSplineResourceGroup->fillParameter(aParameter);
+    m_pGeometryResourceGroup->fillParameter(aParameter);
+    m_pSortByXValuesResourceGroup->fillParameter(aParameter);
     return aParameter;
 }
 
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index f821df0846dc..007c6fd40f0d 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -116,10 +116,10 @@ private:
     void Initialize();
 
     std::unique_ptr<Dim3DLookResourceGroup_unwelded> m_pDim3DLookResourceGroup;
-    /*std::unique_ptr<StackingResourceGroup>      m_pStackingResourceGroup;
-    std::unique_ptr<SplineResourceGroup>        m_pSplineResourceGroup;
-    std::unique_ptr<GeometryResourceGroup>      m_pGeometryResourceGroup;
-    std::unique_ptr<SortByXValuesResourceGroup> m_pSortByXValuesResourceGroup;*/
+    std::unique_ptr<StackingResourceGroup_unwelded> m_pStackingResourceGroup;
+    std::unique_ptr<SplineResourceGroup_unwelded> m_pSplineResourceGroup;
+    std::unique_ptr<GeometryResourceGroup_unwelded> m_pGeometryResourceGroup;
+    std::unique_ptr<SortByXValuesResourceGroup_unwelded> m_pSortByXValuesResourceGroup;
 
     css::uno::Reference<css::chart2::XChartDocument> m_xChartModel;