diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-05-22 14:35:19 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-06-01 17:58:34 +0200 |
| commit | e538b0b10dea838ca7cf6329e67dc715bc6cf5ba (patch) | |
| tree | 2bdaceca37ec249962704bad66c363e038511b7c /reportdesign | |
| parent | f72273402b96ad54e27a73d99d29296efe61b8e3 (diff) | |
svx: combine svx::NamedThemedColor into NamedColor
Change-Id: I9a9656ddce9c12564411cfcb3e8e8714ae74a418
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152236
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 9a4b768b0a22bd3ae627c7355bbd223b9cf65015)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152265
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index e3a48258637f..2a4d5ff2ed89 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -74,9 +74,9 @@ ConditionColorWrapper::ConditionColorWrapper(Condition* pControl, sal_uInt16 nSl } void ConditionColorWrapper::operator()( - [[maybe_unused]] const OUString& /*rCommand*/, const svx::NamedThemedColor& rNamedColor) + [[maybe_unused]] const OUString& /*rCommand*/, const NamedColor& rNamedColor) { - mpControl->ApplyCommand(mnSlotId, rNamedColor.ToNamedColor()); + mpControl->ApplyCommand(mnSlotId, rNamedColor); } // = Condition diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 2e25d343d1b9..02d26921bc62 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -58,7 +58,7 @@ namespace rptui { public: ConditionColorWrapper(Condition* pControl, sal_uInt16 nSlotId); - void operator()(const OUString& rCommand, const svx::NamedThemedColor& rColor); + void operator()(const OUString& rCommand, const NamedColor& rColor); // ColorSelectFunction signature private: Condition* mpControl; |