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/linectrl.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/linectrl.cxx')
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 1bfae3ee5dfc..2d419d246e70 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -348,7 +348,7 @@ void SvxLineColorToolBoxControl::StateChanged( void SvxLineColorToolBoxControl::Update( const SfxPoolItem* pState ) { - if ( pState && ( pState->ISA( SvxColorTableItem ) ) ) + if ( pState && ( pState->ISA( SvxColorListItem ) ) ) { SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() ); @@ -357,7 +357,7 @@ void SvxLineColorToolBoxControl::Update( const SfxPoolItem* pState ) // Die Liste der Farben (ColorTable) hat sich geaendert: ::Color aTmpColor( pBox->GetSelectEntryColor() ); pBox->Clear(); - pBox->Fill( ( (SvxColorTableItem*)pState )->GetColorTable() ); + pBox->Fill( ( (SvxColorListItem*)pState )->GetColorList() ); pBox->SelectEntry( aTmpColor ); } } @@ -382,7 +382,7 @@ SvxLineEndWindow::SvxLineEndWindow( SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ), - pLineEndList ( NULL ), + pLineEndList (), aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), nCols ( 2 ), nLines ( 12 ), @@ -525,7 +525,7 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG ) void SvxLineEndWindow::FillValueSet() { - if( pLineEndList ) + if( pLineEndList.is() ) { XLineEndEntry* pEntry = NULL; Bitmap* pBmp = NULL; |