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/dlg/copydlg.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 'sd/source/ui/dlg/copydlg.cxx')
| -rw-r--r-- | sd/source/ui/dlg/copydlg.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 2fb53f0b9d8d..83144e7d82ba 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -67,7 +67,7 @@ namespace sd { CopyDlg::CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, - XColorList* pColTab, + const XColorListRef &pColList, ::sd::View* pInView ) : SfxModalDialog ( pWindow, SdResId( DLG_COPY ) ), maFtCopies ( this, SdResId( FT_COPIES ) ), @@ -94,10 +94,10 @@ CopyDlg::CopyDlg( maBtnCancel ( this, SdResId( BTN_CANCEL ) ), maBtnHelp ( this, SdResId( BTN_HELP ) ), maBtnSetDefault ( this, SdResId( BTN_SET_DEFAULT ) ), - mrOutAttrs ( rInAttrs ), - mpColorTab ( pColTab ), + mrOutAttrs ( rInAttrs ), + mpColorList ( pColList ), maUIScale(pInView->GetDoc()->GetUIScale()), - mpView ( pInView ) + mpView ( pInView ) { FreeResource(); @@ -105,8 +105,8 @@ CopyDlg::CopyDlg( maBtnSetViewData.SetAccessibleName (maBtnSetViewData.GetQuickHelpText()); // Farbtabellen - DBG_ASSERT( mpColorTab, "Keine gueltige ColorTable uebergeben!" ); - maLbStartColor.Fill( mpColorTab ); + DBG_ASSERT( mpColorList, "Keine gueltige ColorTable uebergeben!" ); + maLbStartColor.Fill( mpColorList ); maLbEndColor.CopyEntries( maLbStartColor ); maLbStartColor.SetSelectHdl( LINK( this, CopyDlg, SelectColorHdl ) ); |