chart2/source/controller/sidebar/ChartTypePanel.cxx | 18 ++++++++++--------
chart2/source/controller/sidebar/ChartTypePanel.hxx | 2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit dbfa1f2fea43771d00f656ce6c2aff438889f2c5
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Fri Nov 15 18:59:26 2019 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Sat Nov 16 13:11:11 2019 +0100
Add SplineResourceGroup to ChartTypePanel
Change-Id: I229eb1cc4963c04968ed9ac32b65847dbfd602c3
Reviewed-on: https://gerrit.libreoffice.org/82807
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@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 075ac094838b..c419a8f0b41e 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -126,7 +126,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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
