diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-19 09:11:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-26 11:15:35 +0200 |
| commit | 167bc621ef825ed5b961502fe9324a675ee34e42 (patch) | |
| tree | 523838d8adc14a62f846529ee6eab3343b2fe87b /sfx2/source/view | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/view/viewprn.cxx | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 926839a7e65e..6b7ee5693f73 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1476,11 +1476,10 @@ void SfxBaseController::ShowInfoBars( ) } } -IMPL_LINK_NOARG ( SfxBaseController, CheckOutHandler ) +IMPL_LINK_NOARG_TYPED ( SfxBaseController, CheckOutHandler, Button*, void ) { if ( m_pData->m_pViewShell ) m_pData->m_pViewShell->GetObjectShell()->CheckOut( ); - return 0; } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b693a5736a59..4f20f7cfa438 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1367,10 +1367,9 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler) +IMPL_LINK_NOARG_TYPED(SfxViewFrame, SwitchReadOnlyHandler, Button*, void) { GetDispatcher()->Execute(SID_EDITDOC); - return 0; } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index e30cee24eca7..c5ad671722a9 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -415,13 +415,13 @@ private: SfxItemSet* _pOptions; bool _bHelpDisabled; - DECL_LINK( Execute, void * ); + DECL_LINK_TYPED( Execute, Button*, void ); public: SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent ); ~SfxDialogExecutor_Impl() { delete _pOptions; } - Link<> GetLink() const { return LINK(const_cast<SfxDialogExecutor_Impl*>(this), SfxDialogExecutor_Impl, Execute); } + Link<Button*, void> GetLink() const { return LINK(const_cast<SfxDialogExecutor_Impl*>(this), SfxDialogExecutor_Impl, Execute); } const SfxItemSet* GetOptions() const { return _pOptions; } void DisableHelp() { _bHelpDisabled = true; } }; @@ -436,7 +436,7 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe { } -IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) +IMPL_LINK_NOARG_TYPED(SfxDialogExecutor_Impl, Execute, Button*, void) { // Options noted locally if ( !_pOptions ) @@ -448,7 +448,7 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) assert(_pOptions); if (!_pOptions) - return 0; + return; // Create Dialog VclPtrInstance<SfxPrintOptionsDialog> pDlg( static_cast<vcl::Window*>(_pSetupParent), @@ -461,8 +461,6 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) _pOptions = pDlg->GetOptions().Clone(); } - - return 0; } /** |