diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 14:20:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 14:20:19 +0100 |
| commit | 0f98a035806aed03ba56e292bc7ee17b242ff2a0 (patch) | |
| tree | fff2b68b02af7158c9eeccd64e7ba5f05a07a68d /cui | |
| parent | 004b026865839a044fb9cd2e08e5eca46a64c8fe (diff) | |
Resolves: tdf#89904 allow the options color page to load/save palettes
Change-Id: I02c5d57db9ffb854b096c9382d740923e9cc3b89
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/cuitabarea.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 19 |
2 files changed, 5 insertions, 15 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index f91b78f0227a..f1604c7465b7 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -662,7 +662,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 40a288020e82..9a09d3be1a7d 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -95,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 ... @@ -165,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(); @@ -449,8 +444,6 @@ void SvxColorTabPage::Construct() } } - - void SvxColorTabPage::ActivatePage( const SfxItemSet& ) { if( nDlgType == 0 ) // area dialog @@ -500,11 +493,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& ) } } else - HideLoadSaveEmbed(); + m_pBoxEmbed->Hide(); } - - SfxTabPage::sfxpg SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( CheckChanges_Impl() == -1L ) |