diff options
author | Jim Raykowski <raykowj@gmail.com> | 2019-01-31 01:58:51 -0900 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2019-02-16 13:13:06 +0100 |
commit | 16d2876b61520a765a111d7c38d60b143e669a37 (patch) | |
tree | a2b25b547087568ca621f2c4b0f566b441e6622e /cui/source/options/optchart.cxx | |
parent | cda61b3442f329d3892b25d40260d7742c1b0772 (diff) |
tdf#123021 Fix options dialog cancel doesn't cancel chart color changes
...and add missed variable inititialization in options uitest that
causes Jenkins to report test failure when testing patches concerning
options charts default colors page.
Change-Id: I324bcbb7834abf1a270bfce01eb84db280420409
Reviewed-on: https://gerrit.libreoffice.org/67236
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'cui/source/options/optchart.cxx')
-rw-r--r-- | cui/source/options/optchart.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 2bb82ded9621..4645f4ea10d0 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -139,12 +139,8 @@ SvxDefaultColorOptPage::~SvxDefaultColorOptPage() void SvxDefaultColorOptPage::dispose() { - // save changes if (pChartOptions) { - pChartOptions->SetDefaultColors( pColorConfig->GetColorList() ); - pChartOptions->Commit(); - pColorConfig.reset(); pChartOptions.reset(); } @@ -200,6 +196,15 @@ void SvxDefaultColorOptPage::FillPaletteLB() } } +void SvxDefaultColorOptPage::SaveChartOptions() +{ + if (pChartOptions) + { + pChartOptions->SetDefaultColors( pColorConfig->GetColorList() ); + pChartOptions->Commit(); + } +} + // event handlers |