chart2/source/controller/sidebar/ChartColorWrapper.cxx | 2 +- chart2/source/controller/sidebar/ChartColorWrapper.hxx | 1 + include/svx/colorbox.hxx | 1 + reportdesign/source/ui/dlg/Condition.cxx | 3 ++- reportdesign/source/ui/dlg/Condition.hxx | 1 + svx/source/tbxctrls/tbcontrl.cxx | 3 ++- 6 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit c446adbcbd0fac9668de9cb3c48f3b57b95ba785 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Nov 18 00:00:24 2020 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed Nov 18 08:30:31 2020 +0100 Clarify signature of some opertor() that must match ColorSelectFunction Change-Id: Ibb71d1e993bbb0fa453c59f48ab5f7c79e1d8025 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106036 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index 962c5b935004..cbe7e088e313 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -80,7 +80,7 @@ ChartColorWrapper::ChartColorWrapper( { } -void ChartColorWrapper::operator()(const OUString& , const NamedColor& rColor) +void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const NamedColor& rColor) { css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index 63dc749bfe5d..b108eca90afe 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -27,6 +27,7 @@ public: const OUString& rPropertyName); void operator()(const OUString& rCommand, const NamedColor& rColor); + // ColorSelectFunction signature void updateModel(const css::uno::Reference<css::frame::XModel>& xModel); diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 51fbc00d4b5f..db33156e1f0b 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -21,6 +21,7 @@ class ListBoxColorWrapper public: ListBoxColorWrapper(ColorListBox* pControl); void operator()(const OUString& rCommand, const NamedColor& rColor); + // ColorSelectFunction signature private: ColorListBox* mpControl; }; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 2b44e1e549be..9918cd22abcc 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -73,7 +73,8 @@ ConditionColorWrapper::ConditionColorWrapper(Condition* pControl, sal_uInt16 nSl { } -void ConditionColorWrapper::operator()(const OUString& /*rCommand*/, const NamedColor& rNamedColor) +void ConditionColorWrapper::operator()( + [[maybe_unused]] const OUString& /*rCommand*/, const NamedColor& rNamedColor) { mpControl->ApplyCommand(mnSlotId, rNamedColor); } diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 641c1a2bf5dc..fe6fbb707356 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -59,6 +59,7 @@ namespace rptui public: ConditionColorWrapper(Condition* pControl, sal_uInt16 nSlotId); void operator()(const OUString& rCommand, const NamedColor& rColor); + // ColorSelectFunction signature private: Condition* mpControl; sal_uInt16 mnSlotId; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ac4c2339b872..954ebcf563e4 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -3798,7 +3798,8 @@ ListBoxColorWrapper::ListBoxColorWrapper(ColorListBox* pControl) { } -void ListBoxColorWrapper::operator()(const OUString& /*rCommand*/, const NamedColor& rColor) +void ListBoxColorWrapper::operator()( + [[maybe_unused]] const OUString& /*rCommand*/, const NamedColor& rColor) { mpControl->Selected(rColor); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
