chart2/source/controller/dialogs/ChangingResource.hxx | 2
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 9 +--
chart2/source/controller/dialogs/ChartTypeDialogController.hxx | 6 --
chart2/source/controller/dialogs/tp_ChartType.cxx | 24
+++++-----
chart2/source/controller/dialogs/tp_ChartType.hxx | 2
compilerplugins/clang/virtualdead.unusedparams.results | 6 --
6 files changed, 20 insertions(+), 29 deletions(-)
New commits:
commit 163086a649f1562d43281c7a0de3ee31fd818b31
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Oct 18 15:57:09 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 22 08:14:02 2019 +0200
loplugin:virtualdead unused param in ResourceChangeListener
Change-Id: I6bfaef6694ec654889ddf1f300851f323bcc56b3
Reviewed-on: https://gerrit.libreoffice.org/81272
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/dialogs/ChangingResource.hxx
b/chart2/source/controller/dialogs/ChangingResource.hxx
index 251fdf5cb7b6..90f3033ceebd 100644
--- a/chart2/source/controller/dialogs/ChangingResource.hxx
+++ b/chart2/source/controller/dialogs/ChangingResource.hxx
@@ -27,7 +27,7 @@ class ChangingResource;
class ResourceChangeListener
{
public:
- virtual void stateChanged( ChangingResource* pResource ) = 0;
+ virtual void stateChanged() = 0;
virtual ~ResourceChangeListener();
};
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index bbe3c1fd82d5..541236e4fa40 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1193,7 +1193,7 @@ void
CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl,
weld::SpinButton&, void)
{
if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
void CombiColumnLineChartDialogController::adjustParameterToSubType(
ChartTypeParameter& rParameter )
{
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index f46192b5a880..a9db960a0417 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -105,13 +105,13 @@ void Dim3DLookResourceGroup::fillParameter(
ChartTypeParameter& rParameter )
IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl,
weld::ToggleButton&, void)
{
if(m_pChangeListener)
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, weld::ComboBox&, void)
{
if(m_pChangeListener)
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
class SortByXValuesResourceGroup : public ChangingResource
@@ -156,7 +156,7 @@ void SortByXValuesResourceGroup::fillParameter(
ChartTypeParameter& rParameter )
IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl,
weld::ToggleButton&, void)
{
if(m_pChangeListener)
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
class StackingResourceGroup : public ChangingResource
@@ -251,13 +251,13 @@ IMPL_LINK( StackingResourceGroup, StackingChangeHdl,
weld::ToggleButton&, rRadio
//first uncheck of previous button -> ignore that call
//the second call gives the check of the new button
if (m_pChangeListener && rRadio.get_active())
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::ToggleButton&,
void)
{
if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
class SplinePropertiesDialog : public weld::GenericDialogController
@@ -506,7 +506,7 @@ void SplineResourceGroup::fillParameter(
ChartTypeParameter& rParameter )
IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl, weld::ComboBox&, void)
{
if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, weld::Button&,
void)
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SplineResourceGroup,
SplineDetailsDialogHdl, weld::Button&, void
if (getSplinePropertiesDialog().run() == RET_OK)
{
if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
else
{
@@ -541,7 +541,7 @@ IMPL_LINK_NOARG(SplineResourceGroup,
SteppedDetailsDialogHdl, weld::Button&, voi
if (getSteppedPropertiesDialog().run() == RET_OK)
{
if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
else
{
@@ -598,7 +598,7 @@ void
GeometryResourceGroup::fillParameter(ChartTypeParameter& rParameter)
IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&,
void)
{
if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
+ m_pChangeListener->stateChanged();
}
ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage,
weld::DialogController* pController, const uno::Reference< XChartDocument >&
xChartModel,
@@ -725,7 +725,7 @@ void ChartTypeTabPage::commitToModel( const
ChartTypeParameter& rParameter )
m_pCurrentMainType->commitToModel( rParameter, m_xChartModel );
}
-void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ )
+void ChartTypeTabPage::stateChanged()
{
if(m_nChangingCalls)
return;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx
b/chart2/source/controller/dialogs/tp_ChartType.hxx
index fadeee06e5a8..a9a15cb2f7c0 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -61,7 +61,7 @@ private:
void fillAllControls( const ChartTypeParameter& rParameter, bool
bAlsoResetSubTypeList=true );
ChartTypeParameter getCurrentParamter() const;
- virtual void stateChanged( ChangingResource* pResource ) override;
+ virtual void stateChanged() override;
void commitToModel( const ChartTypeParameter& rParameter );
void selectMainType();
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index 6a050a13ffcb..39927b31b9b3 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -31,9 +31,6 @@ basic/source/comp/codegen.cxx:466
basic/source/comp/codegen.cxx:467
void OffSetAccumulator::processOpCode2(enum
SbiOpcode,type-parameter-?-?,type-parameter-?-?,)
000
-chart2/source/controller/dialogs/ChangingResource.hxx:30
- void chart::ResourceChangeListener::stateChanged(class
chart::ChangingResource *,)
- 0
desktop/source/deployment/registry/inc/dp_backend.h:84
void dp_registry::backend::Package::processPackage_(class
osl::ResettableGuard<class osl::Mutex> &,_Bool,_Bool,const class
rtl::Reference<class dp_misc::AbortChannel> &,const class
com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment>
&,)
01111
commit 6921cde3917dcb4f420b50823394f84c3c8348c9
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Oct 18 15:55:55 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 22 08:13:56 2019 +0200
loplugin:virtualdead unused param in ChartTypeDialogController
Change-Id: I71eaedcd2fbd5b6d05bc90c4c5ddbc7fca9f5925
Reviewed-on: https://gerrit.libreoffice.org/81271
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index eeebd989e5ed..bbe3c1fd82d5 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -358,8 +358,7 @@ void
ChartTypeDialogController::showExtraControls(weld::Builder* /*pBuilder*/)
void ChartTypeDialogController::hideExtraControls() const
{
}
-void ChartTypeDialogController::fillExtraControls( const ChartTypeParameter&
/*rParameter*/
- , const uno::Reference<
XChartDocument >& /*xChartModel*/
+void ChartTypeDialogController::fillExtraControls( const uno::Reference<
XChartDocument >& /*xChartModel*/
, const uno::Reference<
beans::XPropertySet >& /*xTemplateProps*/ ) const
{
}
@@ -1147,8 +1146,8 @@ void
CombiColumnLineChartDialogController::hideExtraControls() const
m_xMF_NumberOfLines->hide();
}
-void CombiColumnLineChartDialogController::fillExtraControls( const
ChartTypeParameter& /*rParameter*/
- , const uno::Reference< XChartDocument >& xChartModel
+void CombiColumnLineChartDialogController::fillExtraControls(
+ const uno::Reference< XChartDocument >& xChartModel
, const uno::Reference< beans::XPropertySet >& xTemplateProps
) const
{
if (!m_xMF_NumberOfLines)
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index e655394c1da3..35953980578d 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -102,8 +102,7 @@ public:
virtual void showExtraControls(weld::Builder* pBuilder);
virtual void hideExtraControls() const;
- virtual void fillExtraControls( const ChartTypeParameter& rParameter
- , const css::uno::Reference<
css::chart2::XChartDocument >& xChartModel
+ virtual void fillExtraControls( const css::uno::Reference<
css::chart2::XChartDocument >& xChartModel
, const css::uno::Reference<
css::beans::XPropertySet >& xTemplateProps ) const;
/// @throws css::uno::RuntimeException
virtual void setTemplateProperties( const css::uno::Reference<
css::beans::XPropertySet >& xTemplateProps ) const;
@@ -267,8 +266,7 @@ public:
virtual void showExtraControls(weld::Builder* pBuilder) override;
virtual void hideExtraControls() const override;
- virtual void fillExtraControls( const ChartTypeParameter& rParameter
- , const css::uno::Reference<
css::chart2::XChartDocument >& xChartModel
+ virtual void fillExtraControls( const css::uno::Reference<
css::chart2::XChartDocument >& xChartModel
, const css::uno::Reference<
css::beans::XPropertySet >& xTemplateProps ) const override;
virtual void setTemplateProperties( const css::uno::Reference<
css::beans::XPropertySet >& xTemplateProps ) const override;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index f2d9e1e22b31..f46192b5a880 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -818,7 +818,7 @@ void ChartTypeTabPage::selectMainType()
fillAllControls( aParameter );
uno::Reference< beans::XPropertySet > xTemplateProps(
getCurrentTemplate(), uno::UNO_QUERY );
-
m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps);
+ m_pCurrentMainType->fillExtraControls(m_xChartModel,xTemplateProps);
}
}
@@ -898,7 +898,7 @@ void ChartTypeTabPage::initializePage()
fillAllControls( aParameter );
if( m_pCurrentMainType )
-
m_pCurrentMainType->fillExtraControls(aParameter,m_xChartModel,xTemplateProps);
+
m_pCurrentMainType->fillExtraControls(m_xChartModel,xTemplateProps);
break;
}
++nM;
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index fda3eaf9f698..6a050a13ffcb 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -34,9 +34,6 @@ basic/source/comp/codegen.cxx:467
chart2/source/controller/dialogs/ChangingResource.hxx:30
void chart::ResourceChangeListener::stateChanged(class
chart::ChangingResource *,)
0
-chart2/source/controller/dialogs/ChartTypeDialogController.hxx:105
- void chart::ChartTypeDialogController::fillExtraControls(const class
chart::ChartTypeParameter &,const class com::sun::star::uno::Reference<class
com::sun::star::chart2::XChartDocument> &,const class
com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet>
&,)const
- 011
desktop/source/deployment/registry/inc/dp_backend.h:84
void dp_registry::backend::Package::processPackage_(class
osl::ResettableGuard<class osl::Mutex> &,_Bool,_Bool,const class
rtl::Reference<class dp_misc::AbortChannel> &,const class
com::sun::star::uno::Reference<class com::sun::star::ucb::XCommandEnvironment>
&,)
01111
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
