[Libreoffice-commits] core.git: cui/source sc/qa

[Libreoffice Gerrit user]

 cui/source/options/optchart.cxx   |   13 +++++++++----
 cui/source/options/optchart.hxx   |    2 ++
 cui/source/options/treeopt.cxx    |    5 +++++
 sc/qa/uitest/options/tdf122977.py |    1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 16d2876b61520a765a111d7c38d60b143e669a37
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Thu Jan 31 01:58:51 2019 -0900
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Sat Feb 16 13:13:06 2019 +0100

    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 at googlemail.com>

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
 
 
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 19db288db8e1..f99f0798cf79 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -72,6 +72,8 @@ public:
     static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
     virtual bool        FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void        Reset( const SfxItemSet* rInAttrs ) override;
+
+    void    SaveChartOptions();
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index c1383ea4e16b..0c01d7fc677c 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -683,6 +683,11 @@ void OfaTreeOptionsDialog::ApplyOptions(bool deactivate)
                 }
                 pPageInfo->m_pExtPage->SavePage();
             }
+            if ( pPageInfo->m_pPage && RID_OPTPAGE_CHART_DEFCOLORS == pPageInfo->m_nPageId )
+            {
+                SvxDefaultColorOptPage* pPage = static_cast<SvxDefaultColorOptPage *>(pPageInfo->m_pPage.get());
+                pPage->SaveChartOptions();
+            }
         }
         pEntry = pTreeLB->Next(pEntry);
     }
diff --git a/sc/qa/uitest/options/tdf122977.py b/sc/qa/uitest/options/tdf122977.py
index 3ced68542fee..ee8d4ff3b4c1 100644
--- a/sc/qa/uitest/options/tdf122977.py
+++ b/sc/qa/uitest/options/tdf122977.py
@@ -34,6 +34,7 @@ class chartDefaultColors(UITestCase):
         xDefault = xDialogOpt.getChild("default")
         #click Default - reset
         xDefault.executeAction("CLICK", tuple())
+        nrDefaultColors = get_state_as_dict(xColors)["EntryCount"]
         nrDefaultColors1 = int(nrDefaultColors) + 1
         xAdd.executeAction("CLICK", tuple())    #add new color
         self.assertEqual(get_state_as_dict(xColors)["EntryCount"], str(nrDefaultColors1))