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>

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
 
 

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

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);
     }

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))