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 /sc/source/ui/docshell/docsh2.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 'sc/source/ui/docshell/docsh2.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index f94bc36acffc..b3ccd3933e83 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -128,7 +128,7 @@ void ScDocShell::InitItems() ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); if (pDrawLayer) { - PutItem( SvxColorTableItem ( pDrawLayer->GetColorTable(), SID_COLOR_TABLE ) ); + PutItem( SvxColorListItem ( pDrawLayer->GetColorList(), SID_COLOR_TABLE ) ); PutItem( SvxGradientListItem( pDrawLayer->GetGradientList(), SID_GRADIENT_LIST ) ); PutItem( SvxHatchListItem ( pDrawLayer->GetHatchList(), SID_HATCH_LIST ) ); PutItem( SvxBitmapListItem ( pDrawLayer->GetBitmapList(), SID_BITMAP_LIST ) ); @@ -144,7 +144,7 @@ void ScDocShell::InitItems() else { // always use global color table instead of local copy - PutItem( SvxColorTableItem( &XColorList::GetStdColorTable(), SID_COLOR_TABLE ) ); + PutItem( SvxColorListItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) ); } if ( !aDocument.GetForbiddenCharacters().is() || |