[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source

[Caolán McNamara]

 cui/source/inc/cuitabarea.hxx   |    1 -
 cui/source/tabpages/tpcolor.cxx |   23 ++++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit 7cefd1e30412c68f0f5cfabd785d4e083c8b11f2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 26 13:58:05 2015 +0100

    Resolves: tdf#89904 allow the options color page to load/save palettes
    
    Change-Id: I02c5d57db9ffb854b096c9382d740923e9cc3b89
    (cherry picked from commit 0f98a035806aed03ba56e292bc7ee17b242ff2a0)
    
    dynamic_cast of this to the type is already is
    
    (cherry picked from commit 004b026865839a044fb9cd2e08e5eca46a64c8fe)

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 73ec463..9ea0cf6 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -663,7 +663,6 @@ private:
     DECL_LINK( ClickSaveHdl_Impl, void * );
 
     XPropertyListRef GetList();
-    void HideLoadSaveEmbed();
     bool GetEmbed();
     void SetEmbed( bool bEmbed );
     void UpdateTableName();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 048e458..9a09d3b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -69,9 +69,7 @@ XPropertyListRef SvxColorTabPage::GetList()
 
     // URGH - abstract this nicely ... for re-using SvxLoadSaveEmbed
     if( !pList.is() ) {
-        SvxColorTabPage *pPage = dynamic_cast< SvxColorTabPage *>( this );
-        if( pPage )
-            pList = pPage->GetColorList();
+        pList = GetColorList();
     }
 
     return XPropertyListRef( static_cast< XPropertyList * >( pList.get() ) );
@@ -97,13 +95,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, EmbedToggleHdl_Impl)
     return 0;
 }
 
-void SvxColorTabPage::HideLoadSaveEmbed()
-{
-    m_pBtnLoad->Hide();
-    m_pBtnSave->Hide();
-    m_pBoxEmbed->Hide();
-}
-
 void SvxColorTabPage::UpdateTableName()
 {
     // Truncate the name if necessary ...
@@ -167,9 +158,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
 
                 // FIXME: want to have a generic set and get method by type ...
                 if( pArea )
-                    pArea->SetNewColorList( pList );
+                    pArea->SetNewColorList(pList);
                 else if( pLine )
-                    pLine->SetNewColorList( pList );
+                    pLine->SetNewColorList(pList);
+                else
+                    SetColorList(pList);
 
                 bLoaded = true;
                 UpdateTableName();
@@ -451,8 +444,6 @@ void SvxColorTabPage::Construct()
     }
 }
 
-
-
 void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 {
     if( nDlgType == 0 ) // area dialog
@@ -502,11 +493,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
         }
     }
     else
-        HideLoadSaveEmbed();
+        m_pBoxEmbed->Hide();
 }
 
-
-
 SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
     if ( CheckChanges_Impl() == -1L )