diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-09-23 14:05:07 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-09-24 08:33:46 +0100 |
| commit | c8dc73720883333a13187865cd0d69b64af6b4b5 (patch) | |
| tree | c9037bb6e79fd49507f2de1cf2b22f7159572720 /svx/source/tbxctrls/fillctrl.cxx | |
| parent | 7fc35af5fd3171cc9bf43d2c27660afcf407d3f6 (diff) | |
re-factor XPropertyList derivatives to use a rtl::Reference
This cleans up a lot of lifecycle nasties and cleans up some serious
cut/paste code duplication issues at the same time. Cleanup the
naming of ColorTable -> ColorList to match the impl. too
Diffstat (limited to 'svx/source/tbxctrls/fillctrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 98efd9bfe7d4..f3ecb1e68165 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -456,12 +456,12 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) XFillStyle eXFS = (XFillStyle) pStyleItem->GetValue(); // Die Listen haben sich geaendert ? - if( pState->ISA( SvxColorTableItem ) && + if( pState->ISA( SvxColorListItem ) && eXFS == XFILL_SOLID ) { ::Color aTmpColor( pFillAttrLB->GetSelectEntryColor() ); pFillAttrLB->Clear(); - pFillAttrLB->Fill( ( (SvxColorTableItem*)pState )->GetColorTable() ); + pFillAttrLB->Fill( ( (SvxColorListItem*)pState )->GetColorList() ); pFillAttrLB->SelectEntry( aTmpColor ); } if( pState->ISA( SvxGradientListItem ) && @@ -602,10 +602,10 @@ IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox ) { if ( pSh && pSh->GetItem( SID_COLOR_TABLE ) ) { - SvxColorTableItem aItem( *(const SvxColorTableItem*)( + SvxColorListItem aItem( *(const SvxColorListItem*)( pSh->GetItem( SID_COLOR_TABLE ) ) ); pLbFillAttr->Enable(); - pLbFillAttr->Fill( aItem.GetColorTable() ); + pLbFillAttr->Fill( aItem.GetColorList() ); } else pLbFillAttr->Disable(); |