diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-07 22:19:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 12:02:36 +0000 |
| commit | f150208ca885aeeaf5ecae2ff90ccf80717e3246 (patch) | |
| tree | 39365913e669e2478a2f85d0dbabf6ca0192390b /sfx2 | |
| parent | 91b5497f8a9a765af8fa3affa437ef1950783bfb (diff) | |
these Links either shouldn't be links, or shouldn't exist
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/tbxctrl.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 1559713cae95..be49b8d8919d 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -127,7 +127,7 @@ private: SAL_DLLPRIVATE SfxPopupWindow(SfxPopupWindow &); // not defined SAL_DLLPRIVATE void operator =(SfxPopupWindow &); // not defined - DECL_DLLPRIVATE_LINK( Delete, void * ); + void Delete(); protected: virtual void PopupModeEnd(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 53bfee21fddb..1e3fc03ebd3e 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1291,7 +1291,7 @@ sal_Bool SfxPopupWindow::Close() m_bFloating = sal_False; FloatingWindow::Close(); - Delete(0); + Delete(); return sal_True; } @@ -1319,7 +1319,7 @@ void SfxPopupWindow::DeleteFloatingWindow() if ( m_bFloating ) { Hide(); - Delete(0); + Delete(); } } @@ -1403,12 +1403,11 @@ void SfxPopupWindow::StateChanged( //-------------------------------------------------------------------- -IMPL_LINK_NOARG(SfxPopupWindow, Delete) +void SfxPopupWindow::Delete() { if ( m_aDeleteLink.IsSet() ) m_aDeleteLink.Call( this ); delete this; - return 0; } //-------------------------------------------------------------------- |