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 /sd/source/ui/docshell | |
| 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 'sd/source/ui/docshell')
| -rw-r--r-- | sd/source/ui/docshell/docshel3.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index c853a6c72d8a..75cbaf86d656 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -188,12 +188,11 @@ void DrawDocShell::Execute( SfxRequest& rReq ) } break; - case SID_GET_COLORTABLE: + case SID_GET_COLORLIST: { - // passende ColorTable ist per PutItem gesetzt worden - SvxColorTableItem* pColItem = (SvxColorTableItem*) GetItem( SID_COLOR_TABLE ); - XColorList* pTable = pColItem->GetColorTable(); - rReq.SetReturnValue( OfaPtrItem( SID_GET_COLORTABLE, pTable ) ); + SvxColorListItem* pColItem = (SvxColorListItem*) GetItem( SID_COLOR_TABLE ); + XColorListRef pList = pColItem->GetColorList(); + rReq.SetReturnValue( OfaRefItem<XColorList>( SID_GET_COLORLIST, pList ) ); } break; diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index d87363f30b06..ce1f9469a6d6 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -443,7 +443,7 @@ void DrawDocShell::Deactivate( sal_Bool ) void DrawDocShell::UpdateTablePointers() { - PutItem( SvxColorTableItem( mpDoc->GetColorTable(), SID_COLOR_TABLE ) ); + PutItem( SvxColorListItem( mpDoc->GetColorList(), SID_COLOR_TABLE ) ); PutItem( SvxGradientListItem( mpDoc->GetGradientList(), SID_GRADIENT_LIST ) ); PutItem( SvxHatchListItem( mpDoc->GetHatchList(), SID_HATCH_LIST ) ); PutItem( SvxBitmapListItem( mpDoc->GetBitmapList(), SID_BITMAP_LIST ) ); |