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

[Muhammet Kara (via logerrit)]

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

New commits:
commit 6dea617183ffb7567df666ab4858fc5e1d389e08
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Thu Nov 7 19:57:33 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Thu Nov 7 19:35:48 2019 +0100

    Rename getCurrentParamter() as getCurrentParameter()
    
    Change-Id: I0116b4526fea377130b1d1e101d30b3107af3c81
    Reviewed-on: https://gerrit.libreoffice.org/82243
    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 99d664cbb6b2..ab01b8973df3 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -692,7 +692,7 @@ IMPL_LINK_NOARG(ChartTypePanel, SelectSubTypeHdl, ValueSet*, void)
 {
     if (m_pCurrentMainType)
     {
-        ChartTypeParameter aParameter(getCurrentParamter());
+        ChartTypeParameter aParameter(getCurrentParameter());
         m_pCurrentMainType->adjustParameterToSubType(aParameter);
         fillAllControls(aParameter, false);
         commitToModel(aParameter);
@@ -887,7 +887,7 @@ void ChartTypePanel::fillAllControls(const ChartTypeParameter& rParameter,
     m_nChangingCalls--;
 }
 
-ChartTypeParameter ChartTypePanel::getCurrentParamter() const
+ChartTypeParameter ChartTypePanel::getCurrentParameter() const
 {
     ChartTypeParameter aParameter;
     aParameter.nSubTypeIndex = static_cast<sal_Int32>(m_pSubTypeList->GetSelectedItemId());
@@ -905,7 +905,7 @@ void ChartTypePanel::stateChanged(ChangingResource* /*pResource*/)
         return;
     m_nChangingCalls++;
 
-    ChartTypeParameter aParameter(getCurrentParamter());
+    ChartTypeParameter aParameter(getCurrentParameter());
     if (m_pCurrentMainType)
     {
         m_pCurrentMainType->adjustParameterToSubType(aParameter);
@@ -942,7 +942,7 @@ void ChartTypePanel::commitToModel(const ChartTypeParameter& rParameter)
 
 void ChartTypePanel::selectMainType()
 {
-    ChartTypeParameter aParameter(getCurrentParamter());
+    ChartTypeParameter aParameter(getCurrentParameter());
 
     if (m_pCurrentMainType)
     {
@@ -985,7 +985,7 @@ uno::Reference<css::chart2::XChartTypeTemplate> ChartTypePanel::getCurrentTempla
 {
     if (m_pCurrentMainType && m_xChartModel.is())
     {
-        ChartTypeParameter aParameter(getCurrentParamter());
+        ChartTypeParameter aParameter(getCurrentParameter());
         m_pCurrentMainType->adjustParameterToSubType(aParameter);
         uno::Reference<lang::XMultiServiceFactory> xTemplateManager(
             m_xChartModel->getChartTypeManager(), uno::UNO_QUERY);
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 0c8abe4e3db1..e7eac8176d58 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -91,7 +91,7 @@ private:
     ChartTypeDialogController* getSelectedMainType();
     void showAllControls(ChartTypeDialogController& rTypeController);
     void fillAllControls(const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList = true);
-    ChartTypeParameter getCurrentParamter() const;
+    ChartTypeParameter getCurrentParameter() const;
 
     virtual void stateChanged(ChangingResource* pResource) override;
 
commit fdecc551cae4bc0277337d0281c33c80b62f5445
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Thu Nov 7 19:54:34 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Thu Nov 7 19:35:38 2019 +0100

    Remove unused var mpChartTypeLabel
    
    Change-Id: I3de7eb4e438021f9522e581c60a84fb7fcc168c7
    Reviewed-on: https://gerrit.libreoffice.org/82242
    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 87a7141b2f8d..99d664cbb6b2 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -598,7 +598,6 @@ ChartTypePanel::ChartTypePanel(vcl::Window* pParent,
     , m_nChangingCalls(0)
     , m_aTimerTriggeredControllerLock(uno::Reference<frame::XModel>(m_xChartModel, uno::UNO_QUERY))
 {
-    get(mpChartTypeLabel, "lbl_chartType");
     get(m_pMainTypeList, "cmb_chartType");
     get(m_pSubTypeList, "subtype");
 
@@ -674,7 +673,6 @@ void ChartTypePanel::dispose()
                                                                     css::uno::UNO_QUERY_THROW);
     xBroadcaster->removeModifyListener(mxListener);
 
-    mpChartTypeLabel.clear();
     m_pMainTypeList.clear();
     m_pSubTypeList.clear();
 
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 02e9738cbd0f..0c8abe4e3db1 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -105,7 +105,6 @@ private:
     DECL_LINK(SelectSubTypeHdl, ValueSet*, void);
 
     //ui controls
-    VclPtr<FixedText> mpChartTypeLabel;
     VclPtr<ListBox> m_pMainTypeList;
     VclPtr<ValueSet> m_pSubTypeList;