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

[Muhammet Kara (via logerrit)]

 chart2/source/controller/sidebar/ChartTypePanel.cxx |   18 ++++++++++--------
 chart2/source/controller/sidebar/ChartTypePanel.hxx |    2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit f7ed40b0fba269b1e4f8e45e7d0965716c2c9fef
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Fri Nov 15 18:59:26 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Wed May 27 00:12:50 2020 +0200

    Add SplineResourceGroup to ChartTypePanel
    
    Change-Id: I229eb1cc4963c04968ed9ac32b65847dbfd602c3
    Reviewed-on: https://gerrit.libreoffice.org/82807
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94895
    Tested-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 1e2a2c903269..d70a21bacad7 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 <ChartResourceGroups.hxx>
 #include <ChartTypeDialogController.hxx>
 #include <ChartTypeHelper.hxx>
@@ -70,7 +71,8 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
     , mbModelValid(true)
     , m_pDim3DLookResourceGroup(new Dim3DLookResourceGroup(m_xBuilder.get()))
     , m_pStackingResourceGroup(new StackingResourceGroup(m_xBuilder.get()))
-    //, m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pController->getDialog()) )
+    , m_pSplineResourceGroup(
+          new SplineResourceGroup(m_xBuilder.get(), pController->GetChartFrame()))
     , m_pGeometryResourceGroup(new GeometryResourceGroup(m_xBuilder.get()))
     , m_pSortByXValuesResourceGroup(new SortByXValuesResourceGroup(m_xBuilder.get()))
     , m_xChartModel(mxModel, css::uno::UNO_QUERY_THROW)
@@ -135,7 +137,7 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
 
     m_pDim3DLookResourceGroup->setChangeListener(this);
     m_pStackingResourceGroup->setChangeListener(this);
-    //m_pSplineResourceGroup->setChangeListener( this );
+    m_pSplineResourceGroup->setChangeListener(this);
     m_pGeometryResourceGroup->setChangeListener(this);
     m_pSortByXValuesResourceGroup->setChangeListener(this);
 
@@ -156,7 +158,7 @@ void ChartTypePanel::dispose()
     //delete all resource helpers
     m_pDim3DLookResourceGroup.reset();
     m_pStackingResourceGroup.reset();
-    //m_pSplineResourceGroup.reset();
+    m_pSplineResourceGroup.reset();
     m_pGeometryResourceGroup.reset();
     m_pSortByXValuesResourceGroup.reset();
     m_xSubTypeListWin.reset();
@@ -234,7 +236,7 @@ void ChartTypePanel::Initialize()
         m_xSubTypeList->Hide();
         m_pDim3DLookResourceGroup->showControls(false);
         m_pStackingResourceGroup->showControls(false, false);
-        //m_pSplineResourceGroup->showControls( false );
+        m_pSplineResourceGroup->showControls(false);
         m_pGeometryResourceGroup->showControls(false);
         m_pSortByXValuesResourceGroup->showControls(false);
     }
@@ -344,8 +346,8 @@ void ChartTypePanel::showAllControls(ChartTypeDialogController& rTypeController)
     m_pDim3DLookResourceGroup->showControls(bShow);
     bShow = rTypeController.shouldShow_StackingControl();
     m_pStackingResourceGroup->showControls(bShow, false);
-    /*bShow = rTypeController.shouldShow_SplineControl();
-    m_pSplineResourceGroup->showControls( bShow );*/
+    bShow = rTypeController.shouldShow_SplineControl();
+    m_pSplineResourceGroup->showControls(bShow);
     bShow = rTypeController.shouldShow_GeometryControl();
     m_pGeometryResourceGroup->showControls(bShow);
     bShow = rTypeController.shouldShow_SortByXValuesResourceGroup();
@@ -364,7 +366,7 @@ void ChartTypePanel::fillAllControls(const ChartTypeParameter& rParameter,
     m_xSubTypeList->SelectItem(static_cast<sal_uInt16>(rParameter.nSubTypeIndex));
     m_pDim3DLookResourceGroup->fillControls(rParameter);
     m_pStackingResourceGroup->fillControls(rParameter);
-    //m_pSplineResourceGroup->fillControls( rParameter );
+    m_pSplineResourceGroup->fillControls(rParameter);
     m_pGeometryResourceGroup->fillControls(rParameter);
     m_pSortByXValuesResourceGroup->fillControls(rParameter);
     m_nChangingCalls--;
@@ -376,7 +378,7 @@ ChartTypeParameter ChartTypePanel::getCurrentParamter() const
     aParameter.nSubTypeIndex = static_cast<sal_Int32>(m_xSubTypeList->GetSelectedItemId());
     m_pDim3DLookResourceGroup->fillParameter(aParameter);
     m_pStackingResourceGroup->fillParameter(aParameter);
-    //m_pSplineResourceGroup->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 d2876e5b2f3a..60ddb85d925d 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -129,7 +129,7 @@ private:
 
     std::unique_ptr<Dim3DLookResourceGroup> m_pDim3DLookResourceGroup;
     std::unique_ptr<StackingResourceGroup> m_pStackingResourceGroup;
-    //std::unique_ptr<SplineResourceGroup>        m_pSplineResourceGroup;
+    std::unique_ptr<SplineResourceGroup> m_pSplineResourceGroup;
     std::unique_ptr<GeometryResourceGroup> m_pGeometryResourceGroup;
     std::unique_ptr<SortByXValuesResourceGroup> m_pSortByXValuesResourceGroup;