diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-12-20 08:46:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-06-29 14:55:55 +0200 |
| commit | 349fccc2840a84520054bbbbb6864fdd8f2b8112 (patch) | |
| tree | a22e593ac3b918a83ef57ebe296d745725641c2b /reportdesign | |
| parent | e8b3609230406c6589c5d123f018edb38e543679 (diff) | |
sd theme: allow setting the color's theme index in the chardlg
This routes not only the rgb color and a name, but also a theme index
from the color picker to the chardlg (only there as a start).
That way the picked color will be updated if the master page theme
changes.
(cherry picked from commit 7d5984d7aed2bafcb599882b66bb0dde2d22ff3f)
Change-Id: I7a45d7cf63c7c36013e4656c66d9b2dbc3aa0b88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136608
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.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 030685c572a4..392b9d5e8af1 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 NamedColor& rNamedColor) + [[maybe_unused]] const OUString& /*rCommand*/, const svx::NamedThemedColor& rNamedColor) { - mpControl->ApplyCommand(mnSlotId, rNamedColor); + mpControl->ApplyCommand(mnSlotId, rNamedColor.ToNamedColor()); } // = Condition diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 02d26921bc62..2e25d343d1b9 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 NamedColor& rColor); + void operator()(const OUString& rCommand, const svx::NamedThemedColor& rColor); // ColorSelectFunction signature private: Condition* mpControl; |