diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-12-20 08:46:40 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-12-20 11:31:53 +0100 |
| commit | 7d5984d7aed2bafcb599882b66bb0dde2d22ff3f (patch) | |
| tree | 6565464f4d754a7c45700ae9b63d28aafa59b8da /chart2 | |
| parent | 24ea26f55ee4e8a3c69b6dc9911a8c42e56f1eb2 (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.
Change-Id: I7a45d7cf63c7c36013e4656c66d9b2dbc3aa0b88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127135
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/sidebar/ChartColorWrapper.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/controller/sidebar/ChartColorWrapper.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index 9340ed1c2028..08fbcdb1b6a9 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -85,7 +85,7 @@ ChartColorWrapper::ChartColorWrapper( { } -void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const NamedColor& rColor) +void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const svx::NamedThemedColor& rColor) { css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); @@ -95,7 +95,7 @@ void ChartColorWrapper::operator()([[maybe_unused]] const OUString& , const Name return; } - xPropSet->setPropertyValue(maPropertyName, css::uno::makeAny(rColor.first)); + xPropSet->setPropertyValue(maPropertyName, css::uno::makeAny(rColor.m_aColor)); } void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel>& xModel) diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index 66c880ae3ca2..694c5a9f7786 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -26,7 +26,7 @@ public: SvxColorToolBoxControl* pControl, const OUString& rPropertyName); - void operator()(const OUString& rCommand, const NamedColor& rColor); + void operator()(const OUString& rCommand, const svx::NamedThemedColor& rColor); // ColorSelectFunction signature void updateModel(const css::uno::Reference<css::frame::XModel>& xModel); |