diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-09-26 22:00:40 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-09-27 12:23:09 +0100 |
| commit | 3d3c70f969d7305ed1712e85c0979772074a4ed2 (patch) | |
| tree | d5117b50b74b0a6effe10f313babbce762bb44b9 /cui/source/tabpages/tpshadow.cxx | |
| parent | 1b5bcb6562abc4fe684fe4e046bde93df1af3d12 (diff) | |
more ColorTable to List cleanup, and abstraction of load/save
Diffstat (limited to 'cui/source/tabpages/tpshadow.cxx')
| -rw-r--r-- | cui/source/tabpages/tpshadow.cxx | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index dd5e4e7caef6..ea334b576bba 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -83,7 +83,6 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ), aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), rOutAttrs ( rInAttrs ), - pColorTab( NULL ), bDisable ( sal_False ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), aXFillAttr ( pXPool ), @@ -195,7 +194,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs void SvxShadowTabPage::Construct() { // Farbtabelle fuellen - aLbShadowColor.Fill( pColorTab ); + aLbShadowColor.Fill( pColorList ); if( bDisable ) { @@ -224,24 +223,24 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) if( nDlgType == 0 ) { - if( pColorTab.is() ) + if( pColorList.is() ) { - // ColorTable - if( *pnColorTableState & CT_CHANGED || - *pnColorTableState & CT_MODIFIED ) + // ColorList + if( *pnColorListState & CT_CHANGED || + *pnColorListState & CT_MODIFIED ) { - if( *pnColorTableState & CT_CHANGED ) + if( *pnColorListState & CT_CHANGED ) { SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); if( pArea ) { - pColorTab = pArea->GetNewColorTable(); + pColorList = pArea->GetNewColorList(); } else { SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); if( pLine ) - pColorTab = pLine->GetNewColorTable(); + pColorList = pLine->GetNewColorList(); } } @@ -249,7 +248,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet ) // aLbShadowColor nPos = aLbShadowColor.GetSelectEntryPos(); aLbShadowColor.Clear(); - aLbShadowColor.Fill( pColorTab ); + aLbShadowColor.Fill( pColorList ); nCount = aLbShadowColor.GetEntryCount(); if( nCount == 0 ) ; // Dieser Fall sollte nicht auftreten @@ -596,13 +595,12 @@ void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) void SvxShadowTabPage::PageCreated (SfxAllItemSet aSet) { - SFX_ITEMSET_ARG (&aSet,pColorTabItem,SvxColorListItem,SID_COLOR_TABLE,sal_False); + SFX_ITEMSET_ARG (&aSet,pColorListItem,SvxColorListItem,SID_COLOR_TABLE,sal_False); SFX_ITEMSET_ARG (&aSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); SFX_ITEMSET_ARG (&aSet,pDlgTypeItem,SfxUInt16Item,SID_DLG_TYPE,sal_False); - - if (pColorTabItem) - SetColorList(pColorTabItem->GetColorList()); + if (pColorListItem) + SetColorList(pColorListItem->GetColorList()); if (pPageTypeItem) SetPageType(pPageTypeItem->GetValue()); if (pDlgTypeItem) |