diff options
792 files changed, 3146 insertions, 4256 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index f3d22e797557..bf2fc8f86314 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -233,7 +233,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; - DECL_LINK( ButtonHdl, ImageButton * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); DECL_LINK(TreeListHdl, void *); DECL_LINK( implEndDragHdl, HeaderBar * ); DECL_LINK_TYPED( EditAccHdl, Accelerator *, void ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index ca9009c0c263..786f6d7bcfed 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1783,12 +1783,11 @@ bool WatchWindow::RemoveSelectedWatch() } -IMPL_LINK( WatchWindow, ButtonHdl, ImageButton *, pButton ) +IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void ) { if (pButton == aRemoveWatchButton.get()) if (SfxDispatcher* pDispatcher = GetDispatcher()) pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH); - return 0; } IMPL_LINK_NOARG(WatchWindow, TreeListHdl) diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 084d15eb8f51..b249c6c03b98 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -150,13 +150,12 @@ void BreakPointDialog::CheckButtons() } } -IMPL_LINK( BreakPointDialog, CheckBoxHdl, ::CheckBox *, pChkBx ) +IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void ) { + ::CheckBox * pChkBx = static_cast<::CheckBox*>(pButton); BreakPoint* pBrk = GetSelectedBreakPoint(); if ( pBrk ) pBrk->bEnabled = pChkBx->IsChecked(); - - return 0; } IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox *, pBox ) @@ -190,7 +189,7 @@ IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit *, pEdit ) -IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) +IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pOKButton) { @@ -237,8 +236,6 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton ) } CheckButtons(); } - - return 0; } diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index 50d18543d846..9d032b6ca513 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -43,10 +43,10 @@ private: protected: void CheckButtons(); - DECL_LINK( CheckBoxHdl, ::CheckBox * ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK( ComboBoxHighlightHdl, ComboBox * ); DECL_LINK( EditModifyHdl, Edit * ); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); void UpdateFields( BreakPoint* pBrk ); BreakPoint* GetSelectedBreakPoint(); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 1d06e969676b..6d831333eb7b 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -613,7 +613,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit ) -IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) +IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void ) { // apart from New/Record the Description is done by LoseFocus if (pButton == m_pRunButton) @@ -633,7 +633,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) if ( aDocument.isDocument() && !aDocument.allowMacros() ) { ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_CANNOTRUNMACRO), VCL_MESSAGE_WARNING)->Execute(); - return 0; + return; } } } @@ -644,12 +644,12 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute(); m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) ); m_pMacroNameEdit->GrabFocus(); - return 0; + return; } SbMethod* pMethod = GetMacro(); if ( pMethod && !QueryReplaceMacro( pMethod->GetName(), this ) ) - return 0; + return; } EndDialog(Macro_OkRun); @@ -666,7 +666,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScriptDocument aDocument( aDesc.GetDocument() ); DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" ); if ( !aDocument.isAlive() ) - return 0; + return; BasicManager* pBasMgr = aDocument.getBasicManager(); OUString aLib( aDesc.GetLibName() ); OUString aMod( aDesc.GetName() ); @@ -712,7 +712,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScopedVclPtrInstance<MessageDialog>::Create(this, IDEResId(RID_STR_BADSBXNAME))->Execute(); m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) ); m_pMacroNameEdit->GrabFocus(); - return 1; + return; } SbMethod* pMethod = CreateMacro(); if ( pMethod ) @@ -739,7 +739,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScriptDocument aDocument( aDesc.GetDocument() ); DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" ); if ( !aDocument.isAlive() ) - return 0; + return; BasicManager* pBasMgr = aDocument.getBasicManager(); OUString aLib( aDesc.GetLibName() ); OUString aMod( aDesc.GetName() ); @@ -783,7 +783,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) if ( nRet ) // not only closed { EndDialog(Macro_Edit); - return 0; + return; } Shell* pShell = GetShell(); @@ -792,7 +792,6 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) m_pBasicBox->UpdateEntries(); } - return 0; } diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index c9c36cee13a6..bbb4e2811201 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -71,7 +71,7 @@ private: DECL_LINK(MacroDoubleClickHdl, void *); DECL_LINK( BasicSelectHdl, SvTreeListBox * ); DECL_LINK( EditModifyHdl, Edit * ); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); void CheckButtons(); void SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index ad49d7ab737e..4f56a1a5aaef 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -351,7 +351,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) } // NewObjectDialog -IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) +IMPL_LINK_NOARG_TYPED(NewObjectDialog, OkButtonHandler, Button*, void) { if (IsValidSbxName(m_pEdit->GetText())) EndDialog(1); @@ -360,7 +360,6 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) ScopedVclPtrInstance<MessageDialog>::Create(this, IDE_RESSTR(RID_STR_BADSBXNAME))->Execute(); m_pEdit->GrabFocus(); } - return 0; } NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode, @@ -434,21 +433,19 @@ sal_Int32 GotoLineDialog::GetLineNumber() const return m_pEdit->GetText().toInt32(); } -IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler) +IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void) { if ( GetLineNumber() ) EndDialog(1); else m_pEdit->SetText(m_pEdit->GetText(), Selection(0, m_pEdit->GetText().getLength())); - return 0; } // ExportDialog -IMPL_LINK_NOARG(ExportDialog, OkButtonHandler) +IMPL_LINK_NOARG_TYPED(ExportDialog, OkButtonHandler, Button*, void) { mbExportAsPackage = m_pExportAsPackageButton->IsChecked(); EndDialog(1); - return 0; } ExportDialog::ExportDialog(vcl::Window * pParent) @@ -623,7 +620,7 @@ IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, pBox ) return 0; } -IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) +IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pEditButton) { @@ -640,7 +637,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) pDispatcher->Execute( SID_BASICIDE_LIBSELECTED, SfxCallMode::ASYNCHRON, &aDocItem, &aLibNameItem, 0L ); EndTabDialog( 1 ); - return 0; + return; } else if (pButton == m_pNewLibButton) NewLib(); @@ -709,7 +706,6 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) } } CheckButtons(); - return 0; } IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 0da8cdb3d640..d82e4c196ee7 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -694,7 +694,7 @@ IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, TreeListBox *, pBox ) return 0; } -IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) +IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void ) { if (pButton == m_pEditButton) { @@ -749,8 +749,6 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton ) NewDialog(); else if (pButton == m_pDelButton) DeleteCurrent(); - - return 0; } bool ObjectPage::GetSelection( ScriptDocument& rDocument, OUString& rLibName ) diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index c70e8b732a03..61400d2b7e31 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -51,7 +51,7 @@ private: VclPtr<Edit> m_pEdit; VclPtr<OKButton> m_pOKButton; - DECL_LINK(OkButtonHandler, void *); + DECL_LINK_TYPED(OkButtonHandler, Button*, void); public: NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false); virtual ~NewObjectDialog(); @@ -68,7 +68,7 @@ class GotoLineDialog : public ModalDialog { VclPtr<Edit> m_pEdit; VclPtr<OKButton> m_pOKButton; - DECL_LINK(OkButtonHandler, void *); + DECL_LINK_TYPED(OkButtonHandler, Button*, void); public: explicit GotoLineDialog(vcl::Window * pParent); virtual ~GotoLineDialog(); @@ -84,7 +84,7 @@ private: bool mbExportAsPackage; - DECL_LINK(OkButtonHandler, void *); + DECL_LINK_TYPED(OkButtonHandler, Button*, void); public: explicit ExportDialog( vcl::Window * pParent ); @@ -191,7 +191,7 @@ protected: VclPtr<PushButton> m_pDelButton; DECL_LINK( BasicBoxHighlightHdl, TreeListBox * ); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); void CheckButtons(); bool GetSelection( ScriptDocument& rDocument, OUString& rLibName ); void DeleteCurrent(); @@ -231,7 +231,7 @@ protected: DECL_LINK( TreeListHighlightHdl, SvTreeListBox * ); DECL_LINK( BasicSelectHdl, ListBox * ); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * ); void CheckButtons(); void DeleteCurrent(); diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index bde64e28cf6e..b1b7f8b120ac 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -144,7 +144,7 @@ void ManageLanguageDialog::ClearLanguageBox() m_pLanguageLB->Clear(); } -IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl) +IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void) { ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr ); if ( RET_OK == aDlg->Execute() ) @@ -166,10 +166,9 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl) if (SfxBindings* pBindings = GetBindingsPtr()) pBindings->Invalidate( SID_BASICIDE_CURRENT_LANG ); } - return 1; } -IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) +IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void) { ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui"); if ( aQBox->Execute() == RET_OK ) @@ -196,10 +195,9 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl) m_pLanguageLB->SelectEntryPos( nPos ); SelectHdl( NULL ); } - return 1; } -IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) +IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void) { sal_uInt16 nPos = m_pLanguageLB->GetSelectEntryPos(); LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos )); @@ -214,8 +212,6 @@ IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl) m_pLanguageLB->SelectEntryPos( nPos ); SelectHdl( NULL ); } - - return 1; } IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index f7ffc6ed9d1e..0bd64d700fbe 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -66,9 +66,9 @@ private: void FillLanguageBox(); void ClearLanguageBox(); - DECL_LINK(AddHdl, void *); - DECL_LINK(DeleteHdl, void *); - DECL_LINK(MakeDefHdl, void *); + DECL_LINK_TYPED(AddHdl, Button*, void); + DECL_LINK_TYPED(DeleteHdl, Button*, void); + DECL_LINK_TYPED(MakeDefHdl, Button*, void); DECL_LINK(SelectHdl, void *); public: diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index 6f62e49e97f4..b925c6cd4b8f 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -40,8 +40,8 @@ class SvRTLInputBox : public ModalDialog void InitButtons( const Size& rDlgSize ); void PositionEdit( const Size& rDlgSize ); void PositionPrompt( const OUString& rPrompt, const Size& rDlgSize ); - DECL_LINK( OkHdl, Button * ); - DECL_LINK( CancelHdl, Button * ); + DECL_LINK_TYPED( OkHdl, Button *, void ); + DECL_LINK_TYPED( CancelHdl, Button *, void ); public: SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle, @@ -129,22 +129,16 @@ void SvRTLInputBox::PositionPrompt(const OUString& rPrompt,const Size& rDlgSize) } -IMPL_LINK( SvRTLInputBox, OkHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvRTLInputBox, OkHdl, Button *, void ) { - (void)pButton; - aText = aEdit->GetText(); EndDialog( 1 ); - return 0; } -IMPL_LINK( SvRTLInputBox, CancelHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvRTLInputBox, CancelHdl, Button *, void ) { - (void)pButton; - aText.clear(); EndDialog(); - return 0; } diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index c069c6f92c51..7be2228bba72 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -70,8 +70,8 @@ class SbiInputDialog : public ModalDialog { VclPtr<OKButton> aOk; VclPtr<CancelButton> aCancel; OUString aText; - DECL_LINK( Ok, vcl::Window * ); - DECL_LINK( Cancel, vcl::Window * ); + DECL_LINK_TYPED( Ok, Button *, void ); + DECL_LINK_TYPED( Cancel, Button *, void ); public: SbiInputDialog( vcl::Window*, const OUString& ); virtual ~SbiInputDialog() { disposeOnce(); } @@ -115,21 +115,15 @@ void SbiInputDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK( SbiInputDialog, Ok, vcl::Window *, pWindow ) +IMPL_LINK_NOARG_TYPED( SbiInputDialog, Ok, Button *, void ) { - (void)pWindow; - aText = aInput->GetText(); EndDialog( 1 ); - return 0; } -IMPL_LINK( SbiInputDialog, Cancel, vcl::Window *, pWindow ) +IMPL_LINK_NOARG_TYPED( SbiInputDialog, Cancel, Button *, void ) { - (void)pWindow; - EndDialog(); - return 0; } SbiStream::SbiStream() diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 92c6cb668f56..946bb702cac9 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -640,10 +640,10 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } } -IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed) +IMPL_LINK_TYPED(SchAttribTabDlg, OKPressed, Button*, pButton, void) { m_bOKPressed = true; - return m_aOriginalOKClickHdl.Call( this ); + m_aOriginalOKClickHdl.Call( pButton ); } } //namespace chart diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 5ee6d2afc6b8..0c532e081d9f 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -178,12 +178,12 @@ void DataLabelResources::SetNumberFormatter( SvNumberFormatter* pFormatter ) m_pNumberFormatter = pFormatter; } -IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton ) +IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void ) { if( !m_pPool || !m_pNumberFormatter ) { OSL_FAIL("Missing item pool or number formatter"); - return 1; + return; } if( pButton == m_pPB_NumberFormatForValue && !m_pCBNumber->IsChecked()) @@ -224,15 +224,13 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, PushButton *, pButton ) rbMixedState = rbSourceMixedState = true; } } - return 0; } -IMPL_LINK( DataLabelResources, CheckHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( DataLabelResources, CheckHdl, Button*, pBox, void ) { if( pBox ) - pBox->EnableTriState( false ); + static_cast<CheckBox*>(pBox)->EnableTriState( false ); EnableControls(); - return 0; } void DataLabelResources::EnableControls() diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index cfb4758cc29b..acfc93a30dde 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -85,8 +85,8 @@ private: VclPtr<vcl::Window> m_pWindow; SfxItemPool* m_pPool; - DECL_LINK(NumberFormatDialogHdl, PushButton * ); - DECL_LINK(CheckHdl, CheckBox* ); + DECL_LINK_TYPED(NumberFormatDialogHdl, Button *, void ); + DECL_LINK_TYPED(CheckHdl, Button*, void ); void EnableControls(); }; diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 44377b08f22a..e0fc7181c0ad 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -138,7 +138,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa m_pRbPercent->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen )); m_pRbFunction->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen )); m_pRbRange->SetClickHdl( LINK( this, ErrorBarResources, CategoryChosen )); - m_pLbFunction->SetSelectHdl( LINK( this, ErrorBarResources, CategoryChosen )); + m_pLbFunction->SetSelectHdl( LINK( this, ErrorBarResources, CategoryChosen2 )); m_pCbSyncPosNeg->Check( false ); m_pCbSyncPosNeg->SetToggleHdl( LINK( this, ErrorBarResources, SynchronizePosAndNeg )); @@ -340,7 +340,13 @@ void ErrorBarResources::UpdateControlStates() } } -IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen ) +IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2 ) +{ + CategoryChosen(NULL); + return 0; +} + +IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void ) { m_bErrorKindUnique = true; SvxChartKindError eOldError = m_eErrorKind; @@ -396,7 +402,6 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen ) } UpdateControlStates(); - return 0; } IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg) @@ -422,7 +427,7 @@ IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged) return 0; } -IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged) +IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void) { m_bIndicatorUnique = true; if( m_pRbBoth->IsChecked()) @@ -435,14 +440,13 @@ IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged) m_bIndicatorUnique = false; UpdateControlStates(); - return 0; } -IMPL_LINK( ErrorBarResources, ChooseRange, PushButton*, pButton ) +IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void ) { OSL_ASSERT( m_apRangeSelectionHelper.get()); if( ! m_apRangeSelectionHelper.get()) - return 0; + return; OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); OUString aUIString; @@ -468,8 +472,6 @@ IMPL_LINK( ErrorBarResources, ChooseRange, PushButton*, pButton ) } else m_pCurrentRangeChoosingField = 0; - - return 0; } IMPL_LINK( ErrorBarResources, RangeChanged, Edit *, pEdit ) diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 98f1641c9f06..5862f13eea77 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -69,7 +69,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& pTabPage->get(m_pFI_MovingAverage,"imageMovingAverage"); FillValueSets(); - Link<> aLink = LINK(this, TrendlineResources, SelectTrendLine ); + Link<Button*,void> aLink = LINK(this, TrendlineResources, SelectTrendLine ); m_pRB_Linear->SetClickHdl( aLink ); m_pRB_Logarithmic->SetClickHdl( aLink ); m_pRB_Exponential->SetClickHdl( aLink ); @@ -77,10 +77,10 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& m_pRB_Polynomial->SetClickHdl( aLink ); m_pRB_MovingAverage->SetClickHdl( aLink ); - aLink = LINK(this, TrendlineResources, ChangeValue ); - m_pNF_Degree->SetModifyHdl( aLink ); - m_pNF_Period->SetModifyHdl( aLink ); - m_pFmtFld_InterceptValue->SetModifyHdl( aLink ); + Link<> aLink2 = LINK(this, TrendlineResources, ChangeValue ); + m_pNF_Degree->SetModifyHdl( aLink2 ); + m_pNF_Period->SetModifyHdl( aLink2 ); + m_pFmtFld_InterceptValue->SetModifyHdl( aLink2 ); Reset( rInAttrs ); UpdateControlStates(); @@ -89,7 +89,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& TrendlineResources::~TrendlineResources() {} -IMPL_LINK( TrendlineResources, SelectTrendLine, RadioButton *, pRadioButton ) +IMPL_LINK_TYPED( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void ) { if( pRadioButton == m_pRB_Linear ) m_eTrendLineType = CHREGRESS_LINEAR; @@ -106,8 +106,6 @@ IMPL_LINK( TrendlineResources, SelectTrendLine, RadioButton *, pRadioButton ) m_bTrendLineUnique = true; UpdateControlStates(); - - return 0; } void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 03c3ebe3bd87..d69581cbde4e 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -78,7 +78,7 @@ private: sal_Int32 m_nNbPoints; void UpdateControlStates(); - DECL_LINK( SelectTrendLine, RadioButton * ); + DECL_LINK_TYPED( SelectTrendLine, Button *, void ); DECL_LINK( ChangeValue, void *); }; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 04c725429f83..44f7acae528c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -415,7 +415,7 @@ IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl) return 0; } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton ) +IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void ) { bool bIsAmbientLight = (pButton==m_pBtn_AmbientLight_Color); ColorLB* pListBox = ( bIsAmbientLight ? m_pLB_AmbientLight : m_pLB_LightSource); @@ -449,7 +449,6 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton ) } SelectColorHdl( pListBox ); } - return 0; } IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox ) @@ -482,10 +481,11 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ColorLB*, pListBox return 0; } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, LightButton*, pButton ) +IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) { + LightButton* pButton = static_cast<LightButton*>(pBtn); if( !pButton ) - return 0; + return; LightSourceInfo* pInfo = 0; sal_Int32 nL=0; @@ -525,7 +525,6 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, LightBut lcl_selectColor( *m_pLB_LightSource, pInfo->aLightSource.nDiffuseColor ); } this->updatePreview(); - return 0; } void ThreeD_SceneIllumination_TabPage::updatePreview() diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index a94f1dcb6386..cb368ca33163 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -60,9 +60,9 @@ public: virtual void dispose() SAL_OVERRIDE; private: - DECL_LINK( ClickLightSourceButtonHdl, LightButton* ); + DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void ); DECL_LINK( SelectColorHdl, ColorLB* ); - DECL_LINK( ColorDialogHdl, Button* ); + DECL_LINK_TYPED( ColorDialogHdl, Button*, void ); DECL_LINK( PreviewChangeHdl, void* ); DECL_LINK( PreviewSelectHdl, void* ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 9fac6a5c3824..f478eb08aa99 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -298,7 +298,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories ) // event handling routines -IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel) +IMPL_LINK_NOARG_TYPED(SchAxisLabelTabPage, ToggleShowLabel, Button*, void) { bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE ); @@ -315,8 +315,6 @@ IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel) m_pFtTextDirection->Enable( bEnable ); m_pLbTextDirection->Enable( bEnable ); - - return 0L; } } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index ef591d0ea028..96ed45c47152 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -65,7 +65,7 @@ private: bool m_bHasInitialStacking; /// false = checkbox in tristate bool m_bComplexCategories; - DECL_LINK ( ToggleShowLabel, void* ); + DECL_LINK_TYPED ( ToggleShowLabel, Button*, void ); public: SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 84b9cc2d63bb..0a819d64d3e7 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -497,8 +497,8 @@ public: private: DECL_LINK( LineTypeChangeHdl, void* ); - DECL_LINK( SplineDetailsDialogHdl, void* ); - DECL_LINK( SteppedDetailsDialogHdl, void* ); + DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void ); + DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void ); SplinePropertiesDialog& getSplinePropertiesDialog(); SteppedPropertiesDialog& getSteppedPropertiesDialog(); @@ -595,7 +595,7 @@ IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl) +IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; @@ -614,9 +614,8 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl) m_pLB_LineType->SelectEntryPos( iOldLineTypePos ); getSplinePropertiesDialog().fillControls( aOldParameter ); } - return 0; } -IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl) +IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; @@ -635,7 +634,6 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl) m_pLB_LineType->SelectEntryPos( iOldLineTypePos ); getSteppedPropertiesDialog().fillControls( aOldParameter ); } - return 0; } class GeometryResourceGroup : public ChangingResource diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 66e8944d264b..9c7bc8bdff74 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -572,13 +572,13 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) { OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_RANGE; if( !m_pEDT_RANGE->GetText().isEmpty() && ! updateModelFromControl( m_pCurrentRangeChoosingField )) - return 0; + return; SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); bool bHasSelectedEntry = (pEntry != 0); @@ -611,26 +611,23 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) } else m_pCurrentRangeChoosingField = 0; - - return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void) { OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES; if( !m_pEDT_CATEGORIES->GetText().isEmpty() && ! updateModelFromControl( m_pCurrentRangeChoosingField )) - return 0; + return; OUString aStr( SCH_RESSTR( m_pFT_CATEGORIES->IsVisible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS )); lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( m_rDialogModel.getCategoriesRange(), aStr, *this ); - return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -666,11 +663,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl) m_pLB_SERIES->Select( pNextEntry ); } SeriesSelectionChangedHdl( 0 ); - - return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -710,11 +705,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl) } SeriesSelectionChangedHdl( 0 ); } - - return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -727,11 +720,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl) fillSeriesListBox(); SeriesSelectionChangedHdl(0); } - - return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -744,8 +735,6 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl) fillSeriesListBox(); SeriesSelectionChangedHdl(0); } - - return 0; } IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit*, pEdit ) diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index b949f81f50e2..92f8db40541b 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -75,14 +75,14 @@ protected: DECL_LINK( SeriesSelectionChangedHdl, void* ); DECL_LINK( RoleSelectionChangedHdl, void* ); - DECL_LINK( MainRangeButtonClickedHdl, void* ); - DECL_LINK( CategoriesRangeButtonClickedHdl, void* ); - DECL_LINK( AddButtonClickedHdl, void* ); - DECL_LINK( RemoveButtonClickedHdl, void* ); + DECL_LINK_TYPED( MainRangeButtonClickedHdl, Button*, void ); + DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void ); + DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void ); + DECL_LINK_TYPED( RemoveButtonClickedHdl, Button*, void ); DECL_LINK( RangeModifiedHdl, Edit* ); DECL_LINK( RangeUpdateDataHdl, Edit* ); - DECL_LINK( UpButtonClickedHdl, void* ); - DECL_LINK( DownButtonClickedHdl, void* ); + DECL_LINK_TYPED( UpButtonClickedHdl, Button*, void ); + DECL_LINK_TYPED( DownButtonClickedHdl, Button*, void ); // ____ RangeSelectionListenerParent ____ virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 2c9cd5d23685..db5467cdcdbf 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -366,7 +366,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl) return 0; } -IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) +IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void) { OUString aRange = m_pED_Range->GetText(); // using assignment for broken gcc 3.3 @@ -374,8 +374,6 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) lcl_enableRangeChoosing( true, m_pParentDialog ); m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this ); - - return 0; } void RangeChooserTabPage::listeningFinished( const OUString & rNewRange ) diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 8d6ad51fb28b..f8ad825f7e7d 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -71,7 +71,7 @@ protected: //methods bool isValid(); void setDirty(); - DECL_LINK( ChooseRangeHdl, void* ); + DECL_LINK_TYPED( ChooseRangeHdl, Button*, void ); DECL_LINK( ControlChangedHdl, void* ); DECL_LINK( ControlEditedHdl, void* ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 4a430b9efb84..0b9e69e647cf 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -218,8 +218,9 @@ void ScaleTabPage::EnableControls() EnableValueHdl(m_pCbx_AutoTimeResolution); } -IMPL_LINK( ScaleTabPage, EnableValueHdl, CheckBox *, pCbx ) +IMPL_LINK_TYPED( ScaleTabPage, EnableValueHdl, Button *, pButton, void ) { + CheckBox * pCbx = static_cast<CheckBox*>(pButton); bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled(); if (pCbx == m_pCbxAutoMin) { @@ -248,7 +249,6 @@ IMPL_LINK( ScaleTabPage, EnableValueHdl, CheckBox *, pCbx ) { m_pFmtFldOrigin->Enable( bEnable ); } - return 0; } enum AxisTypeListBoxEntry diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 959e831dbe26..c1143afab46b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -100,7 +100,7 @@ private: void EnableControls(); DECL_LINK( SelectAxisTypeHdl, void* ); - DECL_LINK( EnableValueHdl, CheckBox* ); + DECL_LINK_TYPED( EnableValueHdl, Button*, void ); DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, FormattedField* ); /** shows a warning window due to an invalid input. diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 06a4e5d3fbf5..a70a4e8b6ce1 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -87,14 +87,12 @@ void SchOptionTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) +IMPL_LINK_NOARG_TYPED(SchOptionTabPage, EnableHdl, Button*, void) { if( m_nAllSeriesAxisIndex == 0 ) m_pCBAxisSideBySide->Enable( m_pRbtAxis2->IsChecked()); else if( m_nAllSeriesAxisIndex == 1 ) m_pCBAxisSideBySide->Enable( m_pRbtAxis1->IsChecked()); - - return 0; } VclPtr<SfxTabPage> SchOptionTabPage::Create(vcl::Window* pWindow, diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index a6e7eda853a3..5db962921c8b 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -62,7 +62,7 @@ private: //member VclPtr<CheckBox> m_pCBIncludeHiddenCells; - DECL_LINK(EnableHdl, void * ); + DECL_LINK_TYPED(EnableHdl, Button*, void ); sal_Int32 m_nAllSeriesAxisIndex; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 0119c3d033c6..af82da8fe7a0 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -122,8 +122,8 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; - Link<> m_aOriginalOKClickHdl; - DECL_LINK( OKPressed, void * ); + Link<Button*,void> m_aOriginalOKClickHdl; + DECL_LINK_TYPED( OKPressed, Button*, void ); public: SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index 85917809db48..a2b309dc6ca2 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -122,11 +122,12 @@ private: bool m_bHasInternalDataProvider; bool m_bEnableDataTableDialog; - DECL_LINK( CategoryChosen, void * ); + DECL_LINK_TYPED( CategoryChosen, Button*, void ); + DECL_LINK( CategoryChosen2, void* ); DECL_LINK( SynchronizePosAndNeg, void * ); DECL_LINK( PosValueChanged, void * ); - DECL_LINK( IndicatorChanged, void * ); - DECL_LINK( ChooseRange, PushButton * ); + DECL_LINK_TYPED( IndicatorChanged, Button *, void ); + DECL_LINK_TYPED( ChooseRange, Button *, void ); DECL_LINK( RangeChanged, Edit * ); void UpdateControlStates(); diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 3866b98e4d42..572974b38097 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -238,7 +238,7 @@ void ChartAxisPanel::Initialize() updateData(); - Link<> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl); + Link<Button*,void> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl); mpCBShowLabel->SetClickHdl(aLink); mpCBReverse->SetClickHdl(aLink); @@ -328,8 +328,9 @@ void ChartAxisPanel::SelectionInvalid() { } -IMPL_LINK(ChartAxisPanel, CheckBoxHdl, CheckBox*, pCheckbox) +IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) { + CheckBox* pCheckbox = static_cast<CheckBox*>(pButton); OUString aCID = getCID(mxModel); bool bChecked = pCheckbox->IsChecked(); @@ -340,8 +341,6 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, CheckBox*, pCheckbox) } else if (pCheckbox == mpCBReverse.get()) setReverse(mxModel, aCID, bChecked); - - return 0; } IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl) diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index b38a32f05211..50c0021c2f26 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -92,7 +92,7 @@ private: void Initialize(); - DECL_LINK(CheckBoxHdl, CheckBox*); + DECL_LINK_TYPED(CheckBoxHdl, Button*, void); DECL_LINK(ListBoxHdl, void*); }; diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 2545e49c4b47..2cbb42c2424d 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -356,7 +356,7 @@ void ChartElementsPanel::Initialize() xBroadcaster->addModifyListener(mxListener); updateData(); - Link<> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl); + Link<Button*,void> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl); mpCBTitle->SetClickHdl(aLink); mpCBSubtitle->SetClickHdl(aLink); mpCBXAxis->SetClickHdl(aLink); @@ -475,8 +475,9 @@ void ChartElementsPanel::updateModel( xBroadcasterNew->addModifyListener(mxListener); } -IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox) +IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) { + CheckBox* pCheckBox = static_cast<CheckBox*>(pButton); bool bChecked = pCheckBox->IsChecked(); if (pCheckBox == mpCBTitle.get()) setTitleVisible(mxModel, TitleHelper::MAIN_TITLE, bChecked); @@ -515,8 +516,6 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox) setGridVisible(mxModel, GridType::VERT_MINOR, bChecked); else if (pCheckBox == mpCBGridHorizontalMinor.get()) setGridVisible(mxModel, GridType::HOR_MINOR, bChecked); - - return 0; } IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl) diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 50ceb72088ba..99553a196323 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -108,7 +108,7 @@ private: void Initialize(); - DECL_LINK(CheckBoxHdl, CheckBox*); + DECL_LINK_TYPED(CheckBoxHdl, Button*, void); DECL_LINK(LegendPosHdl, void*); }; diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 763262009086..f2c82e10f172 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -352,15 +352,15 @@ void ChartSeriesPanel::Initialize() updateData(); - Link<> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl); + Link<Button*,void> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl); mpCBLabel->SetClickHdl(aLink); mpCBTrendline->SetClickHdl(aLink); mpCBXError->SetClickHdl(aLink); mpCBYError->SetClickHdl(aLink); - aLink = LINK(this, ChartSeriesPanel, RadioBtnHdl); - mpRBPrimaryAxis->SetToggleHdl(aLink); - mpRBSecondaryAxis->SetToggleHdl(aLink); + Link<> aLink2 = LINK(this, ChartSeriesPanel, RadioBtnHdl); + mpRBPrimaryAxis->SetToggleHdl(aLink2); + mpRBSecondaryAxis->SetToggleHdl(aLink2); mpLBLabelPlacement->SetSelectHdl(LINK(this, ChartSeriesPanel, ListBoxHdl)); } @@ -459,8 +459,9 @@ void ChartSeriesPanel::SelectionInvalid() { } -IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, CheckBox*, pCheckBox) +IMPL_LINK_TYPED(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) { + CheckBox* pCheckBox = static_cast<CheckBox*>(pButton); bool bChecked = pCheckBox->IsChecked(); OUString aCID = getCID(mxModel); if (pCheckBox == mpCBLabel.get()) @@ -471,8 +472,6 @@ IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, CheckBox*, pCheckBox) setErrorBarVisible(mxModel, aCID, false, bChecked); else if (pCheckBox == mpCBYError.get()) setErrorBarVisible(mxModel, aCID, true, bChecked); - - return 0; } IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl) diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index be580cbf0c8b..947fb90487cf 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -108,7 +108,7 @@ private: void Initialize(); - DECL_LINK(CheckBoxHdl, CheckBox*); + DECL_LINK_TYPED(CheckBoxHdl, Button*, void); DECL_LINK(RadioBtnHdl, void*); DECL_LINK(ListBoxHdl, void*); }; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index aed91331eee1..5633b8505db7 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1050,20 +1050,18 @@ void SfxAcceleratorConfigPage::ResetConfig() m_pEntriesBox->Clear(); } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Load, Button*, void) { // ask for filename, where we should load the new config data from StartFileDialog( 0, aLoadAccelConfigStr ); - return 0; } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Save, Button*, void) { StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr ); - return 0; } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, Default, Button*, void) { uno::Reference<form::XReset> xReset(m_xAct, uno::UNO_QUERY); if (xReset.is()) @@ -1075,11 +1073,9 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) m_pEntriesBox->SetUpdateMode(true); m_pEntriesBox->Invalidate(); m_pEntriesBox->Select(m_pEntriesBox->GetEntry(0, 0)); - - return 0; } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) { sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() ); TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData()); @@ -1093,10 +1089,9 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl) m_pEntriesBox->SetEntryText(sLabel, nPos, nCol); ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); - return 0; } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) { // get selected entry sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() ); @@ -1108,7 +1103,6 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl) (pEntry->m_sCommand).clear(); ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); - return 0; } IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) @@ -1199,7 +1193,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) return 0; } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) { uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct; @@ -1210,7 +1204,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) // nothing changed? => do nothing! if ( m_xAct.is() && ( xOld == m_xAct ) ) - return 0; + return; m_pEntriesBox->SetUpdateMode( false ); ResetConfig(); @@ -1229,7 +1223,6 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) m_pGroupLBox->Select( pEntry ); ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); - return 1L; } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index e3ce1d4808eb..fca6544a212f 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2125,10 +2125,9 @@ IMPL_LINK( SvxConfigPage, AsyncInfoMsg, OUString*, pMsg ) return 0; } -IMPL_LINK( SvxConfigPage, MoveHdl, Button *, pButton ) +IMPL_LINK_TYPED( SvxConfigPage, MoveHdl, Button *, pButton, void ) { MoveEntry(pButton == m_pMoveUpButton); - return 0; } void SvxConfigPage::MoveEntry( bool bMoveUp ) @@ -2554,10 +2553,8 @@ IMPL_LINK( SvxMenuConfigPage, AddFunctionHdl, return 0; } -IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void ) { - (void)pButton; - VclPtrInstance<SvxMainMenuOrganizerDialog> pDialog( nullptr, GetSaveInData()->GetEntries(), nullptr, true ); @@ -2567,14 +2564,10 @@ IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton ) ReloadTopLevelListBox( pDialog->GetSelectedEntry() ); GetSaveInData()->SetModified(); } - - return 0; } -IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddCommandsHdl, Button *, void ) { - (void)pButton; - if ( m_pSelectorDlg == nullptr ) { // Create Script Selector which also shows builtin commands @@ -2593,7 +2586,6 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton ) m_pSelectorDlg->SetImageProvider( GetSaveInData() ); m_pSelectorDlg->Show(); - return 1; } SaveInData* SvxMenuConfigPage::CreateSaveInData( @@ -2740,14 +2732,14 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates() m_pMoveDownButton->Enable( selection != last ); } -IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) +IMPL_LINK_TYPED( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton, void ) { SvTreeListEntry *pSourceEntry = m_pMenuListBox->FirstSelected(); SvTreeListEntry *pTargetEntry = NULL; if ( !pSourceEntry ) { - return 0; + return; } if (pButton == m_pMoveDownButton) @@ -2791,8 +2783,6 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton ) { UpdateButtonStates(); } - - return 0; } @@ -3051,10 +3041,9 @@ bool SvxToolbarConfigPage::DeleteSelectedContent() return false; } -IMPL_LINK( SvxToolbarConfigPage, MoveHdl, Button *, pButton ) +IMPL_LINK_TYPED( SvxToolbarConfigPage, MoveHdl, Button *, pButton, void ) { MoveEntry(pButton == m_pMoveUpButton); - return 0; } void SvxToolbarConfigPage::MoveEntry( bool bMoveUp ) @@ -4422,10 +4411,8 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox ) return 0; } -IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, NewToolbarHdl, Button *, void ) { - (void)pButton; - OUString prefix = CUI_RES( RID_SVXSTR_NEW_TOOLBAR ); OUString aNewName = @@ -4481,14 +4468,10 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton ) pData->SetModified(); } - - return 0; } -IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void ) { - (void)pButton; - if ( m_pSelectorDlg == nullptr ) { // Create Script Selector which shows slot commands @@ -4505,7 +4488,6 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton ) m_pSelectorDlg->SetImageProvider( GetSaveInData() ); m_pSelectorDlg->Show(); - return 1; } IMPL_LINK( SvxToolbarConfigPage, AddFunctionHdl, @@ -5032,10 +5014,8 @@ IMPL_LINK_TYPED( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox, void ) } } -IMPL_LINK( SvxIconSelectorDialog, ImportHdl, PushButton *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void) { - (void)pButton; - sfx2::FileDialogHelper aImportDialog( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, SFXWB_GRAPHIC | SFXWB_MULTISELECTION ); @@ -5058,14 +5038,10 @@ IMPL_LINK( SvxIconSelectorDialog, ImportHdl, PushButton *, pButton ) uno::Sequence< OUString > paths = aImportDialog.GetMPath(); ImportGraphics ( paths ); } - - return 0; } -IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, DeleteHdl, Button *, void ) { - (void)pButton; - OUString message = CUI_RES( RID_SVXSTR_DELETE_ICON_CONFIRM ); if ( ScopedVclPtr<WarningBox>::Create( this, WinBits(WB_OK_CANCEL), message )->Execute() == RET_OK ) { @@ -5092,7 +5068,6 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton ) } } } - return 0; } bool SvxIconSelectorDialog::ReplaceGraphicItem( diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 812f5fd97cad..6f58102bbdc4 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -591,9 +591,9 @@ IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, ) return 0; } -IMPL_LINK( _SvxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) +IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void ) { - return GenericHandler_Impl( this, pBtn ); + GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) ); } IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, ) @@ -723,8 +723,8 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA m_xDocEvents = xDocEvents; m_xModifiable = xModifiable; SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); - Link<> aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl )); + HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); + Link<Button*,void> aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl )); mpImpl->pDeletePB->SetClickHdl( aLnk ); mpImpl->pAssignPB->SetClickHdl( aLnk ); if( mpImpl->pAssignComponentPB ) @@ -860,7 +860,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< fra -IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler) +IMPL_LINK_NOARG_TYPED(AssignComponentDialog, ButtonHandler, Button*, void) { OUString aMethodName = mpMethodEdit->GetText(); maURL.clear(); @@ -870,7 +870,6 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler) maURL += aMethodName; } EndDialog(1); - return 0; } AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ) @@ -901,12 +900,10 @@ void AssignComponentDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, void ) { - (void)pButton; //unused GetTabPage()->FillItemSet( 0 ); EndDialog( RET_OK ); - return 0; } diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 36a52f8e0b51..f5c183c756ca 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -45,7 +45,7 @@ private: OUString maURL; - DECL_LINK(ButtonHandler, void *); + DECL_LINK_TYPED(ButtonHandler, Button*, void); public: AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 8a5f26979f2f..3aacad8f595a 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -954,7 +954,7 @@ IMPL_LINK( SvxScriptSelectorDialog, FunctionDoubleClickHdl, Control*, pCtrl ) { (void)pCtrl; if (m_pOKButton->IsEnabled()) - return ClickHdl(m_pOKButton); + ClickHdl(m_pOKButton); return 0; } @@ -979,7 +979,7 @@ SvxScriptSelectorDialog::UpdateUI() } } -IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void ) { if (pButton == m_pCancelButton) { @@ -1016,8 +1016,6 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton ) } } } - - return 0; } void diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 9dbd04461aa6..420e644f0631 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -300,7 +300,7 @@ void SpellDialog::Init_Impl() m_pCheckGrammarCB->SetClickHdl( LINK( this, SpellDialog, CheckGrammarHdl )); m_pOptionsPB->SetClickHdl( LINK( this, SpellDialog, ExtClickHdl ) ); - m_pSuggestionLB->SetDoubleClickHdl( LINK( this, SpellDialog, ChangeHdl ) ); + m_pSuggestionLB->SetDoubleClickHdl( LINK( this, SpellDialog, DoubleClickChangeHdl ) ); m_pSentenceED->SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) ); @@ -473,7 +473,7 @@ IMPL_LINK( SpellDialog, InitHdl, SpellDialog *, ) -IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SpellDialog, ExtClickHdl, Button *, pBtn, void ) { if (m_pOptionsPB == pBtn) StartSpellOptDlg_Impl(); @@ -503,14 +503,12 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn ) } } } - return 0; } -IMPL_LINK( SpellDialog, CheckGrammarHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SpellDialog, CheckGrammarHdl, Button*, pBox, void ) { - rParent.SetGrammarChecking( pBox->IsChecked() ); + rParent.SetGrammarChecking( static_cast<CheckBox*>(pBox)->IsChecked() ); Impl_Restore(); - return 0; } void SpellDialog::StartSpellOptDlg_Impl() @@ -573,7 +571,13 @@ OUString SpellDialog::getReplacementString() const -IMPL_LINK_NOARG(SpellDialog, ChangeHdl) +IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl) +{ + ChangeHdl(NULL); + return 0; +} + +IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void) { if(m_pSentenceED->IsUndoEditMode()) { @@ -590,12 +594,11 @@ IMPL_LINK_NOARG(SpellDialog, ChangeHdl) } if(!m_pChangePB->IsEnabled()) m_pIgnorePB->GrabFocus(); - return 1; } -IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl) +IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeAllHdl, Button*, void) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); OUString aString = getReplacementString(); @@ -622,11 +625,10 @@ IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl) SpellContinue_Impl(); bModified = false; m_pSentenceED->UndoActionEnd(); - return 1; } -IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) +IMPL_LINK_TYPED( SpellDialog, IgnoreAllHdl, Button *, pButton, void ) { m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP ); // add word to IgnoreAll list @@ -670,16 +672,14 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) SpellContinue_Impl(); bModified = false; m_pSentenceED->UndoActionEnd(); - return 1; } -IMPL_LINK_NOARG(SpellDialog, UndoHdl) +IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void) { m_pSentenceED->Undo(); if(!m_pSentenceED->GetUndoActionCount()) m_pUndoPB->Enable(false); - return 0; } @@ -742,7 +742,7 @@ void SpellDialog::Impl_Restore() m_pIgnorePB->SetText(m_sIgnoreOnceST); } -IMPL_LINK_NOARG(SpellDialog, IgnoreHdl) +IMPL_LINK_NOARG_TYPED(SpellDialog, IgnoreHdl, Button*, void) { if (m_sResumeST.equals(m_pIgnorePB->GetText())) { @@ -757,7 +757,6 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl) // the word is being ignored SpellContinue_Impl( false, true ); } - return 1; } @@ -900,9 +899,9 @@ int SpellDialog::InitUserDicts() } -IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, ) +IMPL_LINK_NOARG_TYPED(SpellDialog, AddToDictClickHdl, Button*, void) { - return AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu()); + AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu()); } @@ -987,12 +986,11 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd) }; -IMPL_LINK_NOARG(SpellDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(SpellDialog, CancelHdl, Button*, void) { //apply changes and ignored text parts first - if there are any rParent.ApplyChangedSentence(m_pSentenceED->CreateSpellPortions(true), false); Close(); - return 0; } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index eeeadd13e7d9..310082ce1441 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -115,7 +115,7 @@ void AboutDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) +IMPL_LINK_TYPED( AboutDialog, HandleClick, Button*, pButton, void ) { OUString sURL = ""; @@ -131,7 +131,7 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) // If the URL is empty, don't do anything if ( sURL.isEmpty() ) - return 1; + return; try { Reference< css::system::XSystemShellExecute > xSystemShellExecute( @@ -147,8 +147,6 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) aErrorBox->SetText( GetText() ); aErrorBox->Execute(); } - - return 1; } void AboutDialog::StyleControls() diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 02e8fbcae34f..c2329e5fda54 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -396,7 +396,7 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont ) -IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) +IMPL_LINK_NOARG_TYPED(SvxCharacterMap, OKHdl, Button*, void) { OUString aStr = m_pShowText->GetText(); @@ -408,7 +408,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, OKHdl) m_pShowText->SetText( aOUStr ); } EndDialog( RET_OK ); - return 0; } void SvxCharacterMap::fillAllSubsets(ListBox &rListBox) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 14994118b9dd..7cc2288f0937 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -288,7 +288,7 @@ bool FmSearchDialog::Close() return ModalDialog::Close(); } -IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) +IMPL_LINK_TYPED(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) { if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull)) { @@ -306,11 +306,9 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) m_plbField->Disable(); m_pSearchEngine->RebuildUsedFields(-1); } - - return 0; } -IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) +IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnClickedSearchAgain, Button*, void) { if (m_pbClose->IsEnabled()) { // the button has the function 'search' @@ -352,10 +350,9 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) m_pSearchEngine->CancelSearch(); // the ProgressHandler is called when it's really finished, here it's only a demand } - return 0; } -IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) +IMPL_LINK_TYPED(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton, void ) { if (m_ppbApproxSettings == pButton) { @@ -395,8 +392,6 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton ) OnCheckBoxToggled( m_pHalfFullFormsCJK ); } } - - return 0; } IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 387ee3c86a31..f5c6db0d972e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -238,10 +238,9 @@ void SearchProgress::Terminate() -IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn) +IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void) { Terminate(); - return 0L; } @@ -377,10 +376,9 @@ void TakeProgress::Terminate() maTakeThread->terminate(); } -IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn) +IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void) { Terminate(); - return 0L; } IMPL_LINK_NOARG(TakeProgress, CleanUpHdl) @@ -497,12 +495,10 @@ short ActualizeProgress::Execute() -IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn) +IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void) { pTheme->AbortActualize(); EndDialog( RET_OK ); - - return 0L; } @@ -591,7 +587,7 @@ void GalleryIdDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) +IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void) { Gallery* pGal = pThm->GetParent(); const sal_uLong nId = GetId(); @@ -618,8 +614,6 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) if( !bDifferentThemeExists ) EndDialog( RET_OK ); - - return 0L; } @@ -1049,7 +1043,7 @@ void TPGalleryThemeProperties::SearchFiles() -IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) +IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void) { if( bInputAllowed ) { @@ -1084,8 +1078,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) OSL_FAIL( "Folder picker failed with illegal arguments" ); } } - - return 0L; } @@ -1105,7 +1097,7 @@ void TPGalleryThemeProperties::TakeFiles() -IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl) +IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void) { if ( bInputAllowed ) { @@ -1121,8 +1113,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl) else DoPreview(); } - - return 0; } @@ -1156,7 +1146,7 @@ void TPGalleryThemeProperties::DoPreview() -IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) +IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) { if( bInputAllowed ) { @@ -1177,13 +1167,11 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) TakeFiles(); } } - - return 0L; } -IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) +IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void) { if( bInputAllowed ) { @@ -1191,8 +1179,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) bTakeAll = true; TakeFiles(); } - - return 0L; } @@ -1236,11 +1222,10 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl) { aPreviewTimer.Stop(); - return (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound) ? - ClickTakeHdl(NULL) : 0; + if (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound) + ClickTakeHdl(NULL); } - else - return 0; + return 0; } diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 1fbe4cd9dbee..b360c6f0ab6d 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -271,12 +271,10 @@ void SvxHpLinkDlg::Move() } /// Click on OK button -IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickOkHdl_Impl, Button*, void) { Apply(); Close(); - - return 0L; } /************************************************************************* @@ -285,11 +283,9 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickApplyHdl_Impl, Button*, void) { Apply(); - - return 0L; } /************************************************************************* @@ -298,11 +294,9 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHpLinkDlg, ClickCloseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHpLinkDlg, ClickCloseHdl_Impl, Button*, void) { Close(); - - return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index b16f85284b35..c0f4ce69d054 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -191,18 +191,16 @@ void SvxMessDialog::dispose() /*************************************************************************/ -IMPL_LINK_NOARG(SvxMessDialog, Button1Hdl) +IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button1Hdl, Button*, void) { EndDialog( RET_BTN_1 ); - return 0; } /*************************************************************************/ -IMPL_LINK_NOARG(SvxMessDialog, Button2Hdl) +IMPL_LINK_NOARG_TYPED(SvxMessDialog, Button2Hdl, Button*, void) { EndDialog( RET_BTN_2 ); - return 0; } /*************************************************************************/ diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 2ab8c27021ca..fbcb8ea56c98 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -660,37 +660,37 @@ namespace svx } - void HangulHanjaConversionDialog::SetIgnoreHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetIgnoreHdl( const Link<Button*,void>& _rHdl ) { m_pIgnore->SetClickHdl( _rHdl ); } - void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) { m_pIgnoreAll->SetClickHdl( _rHdl ); } - void HangulHanjaConversionDialog::SetChangeHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetChangeHdl( const Link<Button*,void>& _rHdl ) { m_pReplace->SetClickHdl( _rHdl ); } - void HangulHanjaConversionDialog::SetChangeAllHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetChangeAllHdl( const Link<Button*,void>& _rHdl ) { m_pReplaceAll->SetClickHdl( _rHdl ); } - void HangulHanjaConversionDialog::SetFindHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetFindHdl( const Link<Button*,void>& _rHdl ) { m_pFind->SetClickHdl( _rHdl ); } - void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<>& _rHdl ) + void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) { m_pSimpleConversion->SetClickHdl( _rHdl ); m_pHangulBracketed->SetClickHdl( _rHdl ); @@ -728,18 +728,16 @@ namespace svx } - IMPL_LINK( HangulHanjaConversionDialog, ClickByCharacterHdl, CheckBox *, pBox ) + IMPL_LINK_TYPED( HangulHanjaConversionDialog, ClickByCharacterHdl, Button*, pBox, void ) { m_aClickByCharacterLink.Call( pBox ); - bool bByCharacter = pBox->IsChecked(); + bool bByCharacter = static_cast<CheckBox*>(pBox)->IsChecked(); m_pSuggestions->DisplayListBox( !bByCharacter ); - - return 0L; } - IMPL_LINK( HangulHanjaConversionDialog, OnConversionDirectionClicked, CheckBox *, pBox ) + IMPL_LINK_TYPED( HangulHanjaConversionDialog, OnConversionDirectionClicked, Button *, pBox, void ) { CheckBox *pOtherBox = 0; if ( pBox == m_pHangulOnly ) @@ -748,21 +746,18 @@ namespace svx pOtherBox = m_pHangulOnly; if ( pBox && pOtherBox ) { - bool bBoxChecked = pBox->IsChecked(); + bool bBoxChecked = static_cast<CheckBox*>(pBox)->IsChecked(); if ( bBoxChecked ) pOtherBox->Check( false ); pOtherBox->Enable( !bBoxChecked ); } - - return 0L; } - IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnOption ) + IMPL_LINK_NOARG_TYPED( HangulHanjaConversionDialog, OnOption, Button*, void ) { ScopedVclPtrInstance< HangulHanjaOptionsDialog > aOptDlg(this); aOptDlg->Execute(); m_aOptionsChangedLink.Call( this ); - return 0L; } @@ -967,7 +962,7 @@ namespace svx } } - IMPL_LINK_NOARG(HangulHanjaOptionsDialog, OkHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, OkHdl, Button*, void) { sal_uInt32 nCnt = m_aDictList.size(); sal_uInt32 n = 0; @@ -1018,7 +1013,6 @@ namespace svx aLngCfg.SetProperty( UPH_IS_AUTO_REPLACE_UNIQUE_ENTRIES, aTmp ); EndDialog( RET_OK ); - return 0; } IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl) @@ -1031,7 +1025,7 @@ namespace svx return 0; } - IMPL_LINK_NOARG(HangulHanjaOptionsDialog, NewDictHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void) { OUString aName; ScopedVclPtrInstance< HangulHanjaNewDictDialog > aNewDlg(this); @@ -1060,11 +1054,9 @@ namespace svx } } } - - return 0L; } - IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, EditDictHdl, Button*, void) { SvTreeListEntry* pEntry = m_pDictsLB->FirstSelected(); DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); @@ -1073,10 +1065,9 @@ namespace svx ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectEntryPos()); aEdDlg->Execute(); } - return 0L; } - IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) { sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos(); if( nSelPos != TREELIST_ENTRY_NOTFOUND ) @@ -1104,8 +1095,6 @@ namespace svx } } } - - return 0L; } HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent) @@ -1193,7 +1182,7 @@ namespace svx pEntry->SetUserData( new OUString( _rName ) ); } - IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaNewDictDialog, OKHdl, Button*, void) { OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' ')); @@ -1202,7 +1191,6 @@ namespace svx m_pDictNameED->SetText( aName ); // do this in case of trailing chars have been deleted EndDialog( RET_OK ); - return 0; } IMPL_LINK_NOARG(HangulHanjaNewDictDialog, ModifyHdl) @@ -1554,7 +1542,7 @@ namespace svx return 0; } - IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl ) + IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) { DBG_ASSERT( m_pSuggestions, "-HangulHanjaEditDictDialog::NewPBPushHdl(): no suggestions... search in hell..." ); Reference< XConversionDictionary > xDict = m_rDictList[ m_nCurrentDict ]; @@ -1591,7 +1579,6 @@ namespace svx { DBG_WARNING( "+HangulHanjaEditDictDialog::NewPBPushHdl(): dictionary faded away..." ); } - return 0; } bool HangulHanjaEditDictDialog::DeleteEntryFromDictionary( const OUString&, const Reference< XConversionDictionary >& xDict ) @@ -1623,7 +1610,7 @@ namespace svx return bRemovedSomething; } - IMPL_LINK_NOARG( HangulHanjaEditDictDialog, DeletePBPushHdl ) + IMPL_LINK_NOARG_TYPED( HangulHanjaEditDictDialog, DeletePBPushHdl, Button*, void ) { if( DeleteEntryFromDictionary( m_aOriginal, m_rDictList[ m_nCurrentDict ] ) ) { @@ -1631,7 +1618,6 @@ namespace svx m_bModifiedOriginal = true; InitEditDictDialog( m_nCurrentDict ); } - return 0; } void HangulHanjaEditDictDialog::InitEditDictDialog( sal_uInt32 _nSelDict ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index d0aba8f9cdd7..55ff3660c468 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -400,7 +400,7 @@ void SvxHyperlinkNewDocTp::DoApply () |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) { uno::Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -463,7 +463,6 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) m_pCbbPath->SetText ( aStrTmp ); } - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index c1125c6ba211..5eb75ed38173 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -189,7 +189,7 @@ void SvxHyperlinkDocTp::SetInitFocus() |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void) { // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( @@ -218,8 +218,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) if ( aOldURL != GetCurrentURL() ) ModifiedPathHdl_Impl (NULL); } - - return 0L; } /************************************************************************* @@ -228,7 +226,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void) { if ( GetPathType ( maStrURL ) == Type_ExistsFile || maStrURL.isEmpty() || @@ -250,8 +248,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl) mpMarkWnd->SetError( LERR_DOCNOTOPEN ); ShowMarkWnd (); - - return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 465e6a102e2d..a967710347bd 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -70,7 +70,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, // set handlers - Link<> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) ); + Link<Button*, void> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) ); m_pRbtLinktypInternet->SetClickHdl( aLink ); m_pRbtLinktypFTP->SetClickHdl ( aLink ); m_pCbAnonymous->SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) ); @@ -343,11 +343,10 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, Button*, void) { OUString aScheme = GetSchemeFromButtons(); SetScheme(aScheme); - return 0L; } /************************************************************************* @@ -356,7 +355,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, void) { // disable login-editfields if checked if ( m_pCbAnonymous->IsChecked() ) @@ -376,8 +375,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl) } else setFTPUser(maStrOldUser, maStrOldPassword); - - return 0L; } /************************************************************************* @@ -398,7 +395,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, Button*, void) { // Open URL if available @@ -413,8 +410,6 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; static_cast<SvxHpLinkDlg*>(mpDialog.get())->GetBindings()->Execute( SID_OPENDOC, ppItems, 0, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); - - return 0L; } void SvxHyperlinkInternetTp::RefreshMarkWindow() diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 5c0f79f2043e..7b20fed1ab06 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ModifiedReceiverHdl_Impl) |* |************************************************************************/ -IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) +IMPL_STATIC_LINK_NOARG_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void) { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if( pViewFrame ) @@ -253,9 +253,6 @@ IMPL_STATIC_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl) SfxRequest aReq(SID_VIEW_DATA_SOURCE_BROWSER, SfxCallMode::SLOT, rPool); pViewFrame->ExecuteSlot( aReq, true ); } - - - return 0L; } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index de23e79c1021..795887cd3913 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -150,7 +150,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) mpBtApply->SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); mpBtClose->SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) ); - mpLbTree->SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) ); + mpLbTree->SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl ) ); // add lines to the Tree-ListBox mpLbTree->SetStyle( mpLbTree->GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | @@ -561,7 +561,13 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) +IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl) +{ + ClickApplyHdl_Impl(NULL); + return 0; +} + +IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); @@ -574,8 +580,6 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) mpParent->SetMarkStr(pData->aUStrLinkname); } } - - return 0L; } /************************************************************************* @@ -584,7 +588,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = mpLbTree->GetCurEntry(); if ( pEntry ) @@ -618,8 +622,6 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl) } Close(); - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 2107a5c8b234..8a51a43f1ad7 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -307,7 +307,7 @@ SfxDispatcher* SvxHyperlinkTabPageBase::GetDispatcher() const } // Click on imagebutton : Script -IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, Button*, void) { SvxHyperlinkItem *pHyperlinkItem = const_cast<SvxHyperlinkItem*>(static_cast<const SvxHyperlinkItem *>( GetItemSet().GetItem (SID_HYPERLINK_GETLINK))); @@ -365,8 +365,6 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) } delete pItemSet; } - - return 0L; } // Get Macro-Infos diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 82d14bdb9ce6..1f4185d26381 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -337,7 +337,7 @@ void SvxHyphenWordDialog::SelRight() } -IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CutHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -345,11 +345,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl) ContinueHyph_Impl( /*m_nHyphPos*/m_nOldPos ); m_bBusy = false; } - return 0; } -IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, void ) { if( !m_bBusy ) { @@ -371,11 +370,10 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, /*pButton*/ ) DBG_ASSERT( false, "Hyphenate All failed" ); } } - return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, DeleteHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -383,11 +381,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl) ContinueHyph_Impl( 0 ); m_bBusy = false; } - return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, ContinueHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -395,11 +392,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl) ContinueHyph_Impl(); m_bBusy = false; } - return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, CancelHdl_Impl, Button*, void) { if( !m_bBusy ) { @@ -408,11 +404,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl) EndDialog(); m_bBusy = false; } - return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Left_Impl, Button*, void) { if( !m_bBusy ) { @@ -420,11 +415,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl) SelLeft(); m_bBusy = false; } - return 0; } -IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void) { if( !m_bBusy ) { @@ -432,7 +426,6 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl) SelRight(); m_bBusy = false; } - return 0; } diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index d6505423d66d..b24807bea094 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -378,7 +378,7 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) | \**********************************************************************/ -IMPL_LINK_NOARG(IconChoiceDialog, OkHdl) +IMPL_LINK_NOARG_TYPED(IconChoiceDialog, OkHdl, Button*, void) { bInOK = true; @@ -392,11 +392,10 @@ IMPL_LINK_NOARG(IconChoiceDialog, OkHdl) Close(); } } - return 0; } -IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl) +IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ApplyHdl, Button*, void) { bInOK = true; @@ -410,10 +409,9 @@ IMPL_LINK_NOARG(IconChoiceDialog, ApplyHdl) Close(); } } - return 0; } -IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl) +IMPL_LINK_NOARG_TYPED(IconChoiceDialog, ResetHdl, Button*, void) { ResetPageImpl (); @@ -428,18 +426,13 @@ IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl) } else pData->pPage->Reset( *pSet ); - - - return 0; } -IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(IconChoiceDialog, CancelHdl, Button*, void) { Close(); - - return 0; } /********************************************************************** diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 1a5a0f338d9f..eb59e4594af5 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl) return 0; } -IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) +IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -132,13 +132,11 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) INetURLObject aObj( aPathSeq[0] ); m_pEdFilepath->SetText( aObj.PathToFileName() ); } - - return 0; } -IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl) +IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, RadioHdl, Button*, void) { if ( m_pRbNewObject->IsChecked() ) { @@ -150,7 +148,6 @@ IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl) m_pFileFrame->Show(); m_pObjectTypeFrame->Hide(); } - return 0; } @@ -180,7 +177,7 @@ SvInsertOleDlg::SvInsertOleDlg get(m_pCbFilelink, "linktofile"); m_pLbObjecttype->SetDoubleClickHdl( LINK( this, SvInsertOleDlg, DoubleClickHdl ) ); m_pBtnFilepath->SetClickHdl( LINK( this, SvInsertOleDlg, BrowseHdl ) ); - Link<> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) ); + Link<Button*,void> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) ); m_pRbNewObject->SetClickHdl( aLink ); m_pRbObjectFromfile->SetClickHdl( aLink ); m_pRbNewObject->Check(); @@ -363,7 +360,7 @@ uno::Reference< io::XInputStream > SvInsertOleDlg::GetIconIfIconified( OUString* return uno::Reference< io::XInputStream >(); } -IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) +IMPL_LINK_NOARG_TYPED(SvInsertPlugInDialog, BrowseHdl, Button*, void) { Sequence< OUString > aFilterNames, aFilterTypes; fillNetscapePluginFilters( aFilterNames, aFilterTypes ); @@ -390,8 +387,6 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) INetURLObject aObj( aPathSeq[0] ); m_pEdFileurl->SetText(aObj.PathToFileName()); } - - return 0; } @@ -552,7 +547,7 @@ void SfxInsertFloatingFrameDialog::Init() get(m_pNMMarginHeight, "height"); get(m_pCBMarginHeightDefault, "defaultheight"); - Link<> aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) ); + Link<Button*, void> aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) ); m_pCBMarginWidthDefault->SetClickHdl( aLink ); m_pCBMarginHeightDefault->SetClickHdl( aLink ); @@ -738,8 +733,9 @@ short SfxInsertFloatingFrameDialog::Execute() -IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) +IMPL_LINK_TYPED( SfxInsertFloatingFrameDialog, CheckHdl, Button*, pButton, void ) { + CheckBox* pCB = static_cast<CheckBox*>(pButton); if ( pCB == m_pCBMarginWidthDefault ) { if ( pCB->IsChecked() ) @@ -755,13 +751,11 @@ IMPL_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) m_pFTMarginHeight->Enable( !pCB->IsChecked() ); m_pNMMarginHeight->Enable( !pCB->IsChecked() ); } - - return 0L; } -IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, ) +IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) { vcl::Window* pOldParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); @@ -779,7 +773,6 @@ IMPL_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, ) INetURLObject( aFileDlg.GetPath() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ) ); Application::SetDefDialogParent( pOldParent ); - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 0c01cdc3c5bd..39a753e16b74 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -256,31 +256,25 @@ IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox ) return 0; } -IMPL_LINK( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadioButton ) +IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) { - (void)pRadioButton; - sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if( pLink && !( FILEOBJECT & pLink->GetObjType() ) && SfxLinkUpdateMode::ALWAYS != pLink->GetUpdateMode() ) SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS ); - return 0; } -IMPL_LINK( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButton ) +IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ManualClickHdl, Button*, void ) { - (void)pRadioButton; - sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if( pLink && !( FILEOBJECT & pLink->GetObjType() ) && SfxLinkUpdateMode::ONCALL != pLink->GetUpdateMode()) SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL ); - return 0; } -IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) +IMPL_LINK_NOARG_TYPED(SvBaseLinksDlg, UpdateNowClickHdl, Button*, void) { SvTabListBox& rListBox = *m_pTbLinks; sal_uLong nSelCnt = rListBox.GetSelectionCount(); @@ -352,13 +346,10 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) pNewMgr->CloseCachedComps(); } - return 0; } -IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) +IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) { - (void)pPushButton; - sal_uLong nSelectionCount = m_pTbLinks->GetSelectionCount(); if(nSelectionCount > 1) { @@ -424,20 +415,17 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) if ( pLink && !pLink->GetLinkSourceName().isEmpty() ) pLink->Edit( this, LINK( this, SvBaseLinksDlg, EndEditHdl ) ); } - return 0; } -IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) +IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void ) { - (void)pPushButton; - bool bModified = false; if(m_pTbLinks->GetSelectionCount() <= 1) { sal_uLong nPos; SvBaseLinkRef xLink = GetSelEntry( &nPos ); if( !xLink.Is() ) - return 0; + return; ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, Closelinkmsg() ); @@ -515,7 +503,6 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) if( pLinkMgr && pLinkMgr->GetPersist() ) pLinkMgr->GetPersist()->SetModified(); } - return 0; } IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index c1d3bd5d72d6..446d5d78a688 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -68,7 +68,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox return 0; } -IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -99,10 +99,9 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl) SelectHdl_Impl( NULL ); } - return 0; } -IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, AddHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext); @@ -129,10 +128,9 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, AddHdl_Impl) SelectHdl_Impl( NULL ); } - return 0; } -IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, DelHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = m_pRadioLB->FirstSelected(); delete static_cast<OUString*>(pEntry->GetUserData()); @@ -156,10 +154,9 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl) } SelectHdl_Impl( NULL ); - return 0; } -IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPathSelectDialog, DelHdl_Impl, Button*, void) { sal_uInt16 nPos = m_pPathLB->GetSelectEntryPos(); m_pPathLB->RemoveEntry( nPos ); @@ -175,7 +172,6 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl) } SelectHdl_Impl( NULL ); - return 0; } SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent) diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 88d52d832fd0..ab2285d68555 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -49,7 +49,7 @@ struct PasswordToOpenModifyDialog_Impl bool m_bIsPasswordToModify; - DECL_LINK( OkBtnClickHdl, OKButton * ); + DECL_LINK_TYPED( OkBtnClickHdl, Button*, void ); PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ); @@ -94,7 +94,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl( m_pOptionsExpander->Hide(); } -IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, /*pBtn*/ ) +IMPL_LINK_NOARG_TYPED( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void ) { bool bInvalidState = !m_pOpenReadonlyCB->IsChecked() && m_pPasswdToOpenED->GetText().isEmpty() && @@ -137,8 +137,6 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, /*pBtn*/ m_pParent->EndDialog( RET_OK ); } } - - return 0; } PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 6355f2c78807..14dea85ec193 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -174,19 +174,17 @@ void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) -IMPL_LINK_NOARG(SvxPostItDialog, PrevHdl) +IMPL_LINK_NOARG_TYPED(SvxPostItDialog, PrevHdl, Button*, void) { aPrevHdlLink.Call( this ); - return 0; } -IMPL_LINK_NOARG(SvxPostItDialog, NextHdl) +IMPL_LINK_NOARG_TYPED(SvxPostItDialog, NextHdl, Button*, void) { aNextHdlLink.Call( this ); - return 0; } -IMPL_LINK_NOARG(SvxPostItDialog, Stamp) +IMPL_LINK_NOARG_TYPED(SvxPostItDialog, Stamp, Button*, void) { Date aDate( Date::SYSTEM ); tools::Time aTime( tools::Time::SYSTEM ); @@ -211,12 +209,11 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp) sal_Int32 nLen = aStr.getLength(); m_pEditED->GrabFocus(); m_pEditED->SetSelection( Selection( nLen, nLen ) ); - return 0; } -IMPL_LINK_NOARG(SvxPostItDialog, OKHdl) +IMPL_LINK_NOARG_TYPED(SvxPostItDialog, OKHdl, Button*, void) { const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); pOutSet = new SfxItemSet( rSet ); @@ -227,7 +224,6 @@ IMPL_LINK_NOARG(SvxPostItDialog, OKHdl) pOutSet->Put( SvxPostItTextItem( m_pEditED->GetText(), rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT ) ) ); EndDialog( RET_OK ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 971ff3afa2c4..6e5e5096620f 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -650,7 +650,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) return 0; } -IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) +IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) { if ( pButton == m_pCloseButton ) { @@ -670,7 +670,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) SFEntry* userData = 0; if ( !pEntry ) { - return 0; + return; } userData = static_cast<SFEntry*>(pEntry->GetUserData()); if ( userData ) @@ -683,7 +683,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) if ( !node.is() ) { - return 0; + return; } if ( pButton == m_pRunButton ) @@ -693,7 +693,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) Reference< provider::XScriptProvider > mspNode; if( !xProp.is() ) { - return 0; + return; } if ( xModel.is() ) @@ -701,13 +701,13 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) Reference< XEmbeddedScripts > xEmbeddedScripts( xModel, UNO_QUERY); if( !xEmbeddedScripts.is() ) { - return 0; + return; } if (!xEmbeddedScripts->getAllowMacroExecution()) { // Please FIXME: Show a message box if AllowMacroExecution is false - return 0; + return; } } @@ -796,7 +796,6 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) } } } - return 0; } Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvTreeListEntry* pEntry ) diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 7af9b3467b93..8f320ade4bc2 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -51,7 +51,7 @@ void FmShowColsDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) +IMPL_LINK_NOARG_TYPED(FmShowColsDialog, OnClickedOk, Button*, void) { DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !"); if (m_xColumns.is()) @@ -75,7 +75,6 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) } EndDialog(RET_OK); - return 0L; } diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 69bfd0ec0051..c6bf6b04d47d 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -73,13 +73,12 @@ SvxSplitTableDlg::~SvxSplitTableDlg() m_pDialog.disposeAndClear(); } -IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( SvxSplitTableDlg, ClickHdl, Button *, pButton, void ) { const bool bIsVert = pButton == m_pVertBox ; long nMax = bIsVert ? mnMaxVertical : mnMaxHorizontal; m_pPropCB->Enable(!bIsVert); m_pCountEdit->SetMax( nMax ); - return 0; } bool SvxSplitTableDlg::IsHorizontal() const diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index a8e298d08111..b07fa2ab3611 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -193,7 +193,7 @@ void SvxSearchAttributeDialog::dispose() } -IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) +IMPL_LINK_NOARG_TYPED(SvxSearchAttributeDialog, OKHdl, Button*, void) { SearchAttrItem aInvalidItem; aInvalidItem.pItem = reinterpret_cast<SfxPoolItem*>(-1); @@ -235,7 +235,6 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) rList.Remove( n ); EndDialog( RET_OK ); - return 0; } // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 21c9323c4e27..1448d18022df 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -340,7 +340,7 @@ void SvxThesaurusDialog::LookUp( const OUString &rText ) LookUp_Impl(); } -IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn ) +IMPL_LINK_TYPED( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) { if (pBtn && aLookUpHistory.size() >= 2) { @@ -349,7 +349,6 @@ IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn ) aLookUpHistory.pop(); LookUp_Impl(); } - return 0; } IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox*, pLB ) @@ -543,10 +542,9 @@ void SvxThesaurusDialog::dispose() SvxStandardDialog::dispose(); } -IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, /*pBtn*/ ) +IMPL_LINK_NOARG_TYPED( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, void ) { EndDialog(RET_OK); - return 0; } void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 059b5624ed93..0e8453296652 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -151,14 +151,14 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ) get(m_pColumnsEdit, "columnssb"); get(m_pBookModeChk, "bookmode"); get(m_pOKBtn, "ok"); - Link<> aLink = LINK(this, SvxZoomDialog, UserHdl); + Link<Button*,void> aLink = LINK(this, SvxZoomDialog, UserHdl); m_p100Btn->SetClickHdl(aLink); m_pOptimalBtn->SetClickHdl(aLink); m_pPageWidthBtn->SetClickHdl(aLink); m_pWholePageBtn->SetClickHdl(aLink); m_pUserBtn->SetClickHdl(aLink); - Link<> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl); + Link<Button*,void> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl); m_pAutomaticBtn->SetClickHdl(aViewLayoutLink); m_pSingleBtn->SetClickHdl(aViewLayoutLink); m_pColumnsBtn->SetClickHdl(aViewLayoutLink); @@ -166,7 +166,7 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ) Link<> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl); m_pColumnsEdit->SetModifyHdl(aViewLayoutSpinLink); - Link<> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl); + Link<Button*,void> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl); m_pBookModeChk->SetClickHdl(aViewLayoutCheckLink); m_pOKBtn->SetClickHdl(LINK(this, SvxZoomDialog, OKHdl)); @@ -313,7 +313,7 @@ void SvxZoomDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK(SvxZoomDialog, UserHdl, RadioButton *, pButton) +IMPL_LINK_TYPED(SvxZoomDialog, UserHdl, Button *, pButton, void) { mbModified = true; @@ -326,7 +326,6 @@ IMPL_LINK(SvxZoomDialog, UserHdl, RadioButton *, pButton) { m_pUserEdit->Disable(); } - return 0; } IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) @@ -338,7 +337,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) return 0; } -IMPL_LINK(SvxZoomDialog, ViewLayoutUserHdl, RadioButton*, pButton) +IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutUserHdl, Button*, pButton, void) { mbModified = true; @@ -362,10 +361,7 @@ IMPL_LINK(SvxZoomDialog, ViewLayoutUserHdl, RadioButton*, pButton) else { OSL_FAIL("Wrong Button"); - return 0; } - - return 0; } IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit) @@ -388,17 +384,15 @@ IMPL_LINK(SvxZoomDialog, ViewLayoutSpinHdl, NumericField*, pEdit) return 0; } -IMPL_LINK(SvxZoomDialog, ViewLayoutCheckHdl, CheckBox*, pCheckBox) +IMPL_LINK_TYPED(SvxZoomDialog, ViewLayoutCheckHdl, Button*, pCheckBox, void) { if (pCheckBox == m_pBookModeChk && !m_pColumnsBtn->IsChecked()) - return 0; + return; mbModified = true; - - return 0; } -IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton) +IMPL_LINK_TYPED(SvxZoomDialog, OKHdl, Button*, pButton, void) { if (mbModified || m_pOKBtn != pButton) { @@ -442,7 +436,7 @@ IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton) else { OSL_FAIL("Wrong Button"); - return 0; + return; } mpOutSet.reset(new SfxItemSet(mrSet)); mpOutSet->Put(aZoomItem); @@ -465,7 +459,6 @@ IMPL_LINK(SvxZoomDialog, OKHdl, Button*, pButton) { EndDialog(); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index efdc6f1104dc..4493bacd4293 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -266,22 +266,22 @@ void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link< pDlg->SetOptionsChangedHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link<Button*,void>& _rHdl ) { pDlg->SetIgnoreHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) { pDlg->SetIgnoreAllHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link<Button*,void>& _rHdl ) { pDlg->SetChangeHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<Button*,void>& _rHdl ) { pDlg->SetChangeAllHdl(_rHdl ); } @@ -291,11 +291,11 @@ void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Lin pDlg->SetClickByCharacterHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) { pDlg->SetConversionFormatChangedHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link<>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link<Button*,void>& _rHdl ) { pDlg->SetFindHdl(_rHdl ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index bff3db9066f4..42d96011a067 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -140,13 +140,13 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE; virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE; virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE; - virtual void SetIgnoreHdl( const Link<>& _rHdl ) SAL_OVERRIDE; - virtual void SetIgnoreAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ; - virtual void SetChangeHdl( const Link<>& _rHdl ) SAL_OVERRIDE ; - virtual void SetChangeAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ; + virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE; + virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; + virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; + virtual void SetChangeAllHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; virtual void SetClickByCharacterHdl( const Link<>& _rHdl ) SAL_OVERRIDE ; - virtual void SetConversionFormatChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE ; - virtual void SetFindHdl( const Link<>& _rHdl ) SAL_OVERRIDE; + virtual void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE ; + virtual void SetFindHdl( const Link<Button*,void>& _rHdl ) SAL_OVERRIDE; virtual bool GetUseBothDirections( ) const SAL_OVERRIDE; virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index c2f0d59e16b0..3f676d8e23f6 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -171,17 +171,18 @@ private: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell; - DECL_LINK(ChangeHdl, void *); - DECL_LINK(ChangeAllHdl, void *); - DECL_LINK( IgnoreAllHdl, Button * ); - DECL_LINK(IgnoreHdl, void *); - DECL_LINK( CheckGrammarHdl, CheckBox* ); - DECL_LINK( ExtClickHdl, Button * ); - DECL_LINK(CancelHdl, void *); + DECL_LINK_TYPED(ChangeHdl, Button*, void); + DECL_LINK(DoubleClickChangeHdl, void*); + DECL_LINK_TYPED(ChangeAllHdl, Button*, void); + DECL_LINK_TYPED( IgnoreAllHdl, Button*, void ); + DECL_LINK_TYPED(IgnoreHdl, Button*, void); + DECL_LINK_TYPED( CheckGrammarHdl, Button*, void ); + DECL_LINK_TYPED( ExtClickHdl, Button*, void ); + DECL_LINK_TYPED(CancelHdl, Button*, void); DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *); - DECL_LINK(UndoHdl, void *); + DECL_LINK_TYPED(UndoHdl, Button*, void); DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); - DECL_LINK( AddToDictClickHdl, PushButton* ); + DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); DECL_LINK( LanguageSelectHdl, SvxLanguageBox* ); DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_LINK( HandleHyperlink, FixedHyperlink * ); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 1ffabdced0ff..3928056c88a1 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -69,7 +69,7 @@ public: virtual ~AboutDialog(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( HandleClick, PushButton* ); + DECL_LINK_TYPED( HandleClick, Button*, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_ABOUT_HXX diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 9f05168476d0..ba7fc27e559f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -147,13 +147,13 @@ private: OUString m_sModuleShortName; OUString m_sModuleUIName; - DECL_LINK(ChangeHdl, void *); - DECL_LINK(RemoveHdl, void *); + DECL_LINK_TYPED(ChangeHdl, Button *, void); + DECL_LINK_TYPED(RemoveHdl, Button *, void); DECL_LINK( SelectHdl, Control * ); - DECL_LINK(Save, void *); - DECL_LINK(Load, void *); - DECL_LINK(Default, void *); - DECL_LINK(RadioHdl, void *); + DECL_LINK_TYPED(Save, Button *, void); + DECL_LINK_TYPED(Load, Button *, void); + DECL_LINK_TYPED(Default, Button *, void); + DECL_LINK_TYPED(RadioHdl, Button *, void); DECL_LINK_TYPED(LoadHdl, sfx2::FileDialogHelper *, void); DECL_LINK_TYPED(SaveHdl, sfx2::FileDialogHelper *, void); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index a667eb9a902b..b520e48bc031 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -78,6 +78,7 @@ private: bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const; DECL_LINK( UpdateEnableHdl, void* ); + DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void ); private: VclPtr<ListBox> m_pLbHorAlign; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 50bd18daae62..2261a5824cfa 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -161,7 +161,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, OfaACorrCheckListBox*); - DECL_LINK(EditHdl, void *); + DECL_LINK_TYPED(EditHdl, Button*, void); + DECL_LINK(DoubleClickEditHdl, void*); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -252,7 +253,8 @@ private: bool bSWriter:1; DECL_LINK(SelectHdl, SvTabListBox*); - DECL_LINK(NewDelHdl, PushButton*); + DECL_LINK_TYPED(NewDelHdl, Button*, void); + DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); void RefillReplaceBox( bool bFromReset, @@ -312,7 +314,8 @@ private: CollatorWrapper* pCompareClass; LanguageType eLang; - DECL_LINK(NewDelHdl, void*); + DECL_LINK_TYPED(NewDelHdl, Button*, void); + DECL_LINK(NewDelActionHdl, void*); DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); /// Box filled with new language @@ -380,8 +383,8 @@ private: sal_UCS4 cStartQuote; sal_UCS4 cEndQuote; - DECL_LINK( QuoteHdl, PushButton* ); - DECL_LINK( StdQuoteHdl, PushButton* ); + DECL_LINK_TYPED( QuoteHdl, Button*, void ); + DECL_LINK_TYPED( StdQuoteHdl, Button*, void ); OUString ChangeStringExt_Impl( sal_UCS4 ); @@ -453,7 +456,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; void CopyToClipboard() const; - DECL_LINK(DeleteHdl, void *); + DECL_LINK_TYPED(DeleteHdl, Button*, void); }; // class OfaSmartTagOptionsTabPage --------------------------------------------- @@ -496,7 +499,7 @@ private: Calls the displayPropertyPage function of the smart tag recognizer associated with the currently selected smart tag type. */ - DECL_LINK(ClickHdl, void *); + DECL_LINK_TYPED(ClickHdl, Button*, void); /** Handler for the list box diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 98933c9bdf5d..946d9c24a5de 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -134,9 +134,9 @@ private: DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void ); DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK(BrowseHdl_Impl, void *); - DECL_LINK( RadioClickHdl_Impl, RadioButton* ); - DECL_LINK( FileClickHdl_Impl, CheckBox* ); + DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); + DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void ); DECL_LINK(BackgroundColorHdl_Impl, void *); DECL_LINK( TblDestinationHdl_Impl, ListBox* ); }; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index ff7780403bbb..2fe47b70afd3 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -123,7 +123,7 @@ private: DECL_LINK( LinesChanged_Impl, void* ); DECL_LINK( ModifyDistanceHdl_Impl, MetricField*); DECL_LINK( ModifyWidthHdl_Impl, void*); - DECL_LINK( SyncHdl_Impl, CheckBox*); + DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c8ac9f6d998d..511040dcead7 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -365,7 +365,7 @@ protected: SvxConfigPage( vcl::Window*, const SfxItemSet& ); - DECL_LINK( MoveHdl, Button * ); + DECL_LINK_TYPED( MoveHdl, Button *, void ); virtual SaveInData* CreateSaveInData( const css::uno::Reference< css::ui::XUIConfigurationManager >&, @@ -442,10 +442,10 @@ private: DECL_LINK( SelectMenu, ListBox * ); DECL_LINK( SelectMenuEntry, Control * ); - DECL_LINK( NewMenuHdl, Button * ); + DECL_LINK_TYPED( NewMenuHdl, Button *, void ); DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK( AddCommandsHdl, Button * ); + DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); void Init() SAL_OVERRIDE; @@ -482,7 +482,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); - DECL_LINK( MoveHdl, Button * ); + DECL_LINK_TYPED( MoveHdl, Button *, void ); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( SelectHdl, Control* ); @@ -536,10 +536,10 @@ private: DECL_LINK( SelectToolbarEntry, Control * ); DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK( NewToolbarHdl, Button * ); - DECL_LINK( AddCommandsHdl, Button * ); + DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); + DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); - DECL_LINK( MoveHdl, Button * ); + DECL_LINK_TYPED( MoveHdl, Button *, void ); void UpdateButtonStates() SAL_OVERRIDE; short QueryReset() SAL_OVERRIDE; @@ -690,8 +690,8 @@ public: GetSelectedIcon(); DECL_LINK_TYPED( SelectHdl, ToolBox *, void ); - DECL_LINK( ImportHdl, PushButton * ); - DECL_LINK( DeleteHdl, PushButton * ); + DECL_LINK_TYPED( ImportHdl, Button *, void ); + DECL_LINK_TYPED( DeleteHdl, Button *, void ); }; class SvxIconReplacementDialog : public MessBox diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index a023a45d9b1e..42cc172fcb9b 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -215,8 +215,8 @@ private: bool FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( SelectHdl_Impl, ListBox* ); - DECL_LINK(CbClickHdl_Impl, void *); - DECL_LINK(TristClickHdl_Impl, void *); + DECL_LINK_TYPED(CbClickHdl_Impl, Button*, void); + DECL_LINK_TYPED(TristClickHdl_Impl, Button*, void); DECL_LINK(UpdatePreview_Impl, void *); DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); @@ -290,11 +290,11 @@ private: void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( sal_uInt16 nEsc ); - DECL_LINK( PositionHdl_Impl, RadioButton* ); - DECL_LINK( RotationHdl_Impl, RadioButton* ); + DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); + DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); DECL_LINK( FontModifyHdl_Impl, void *); - DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); - DECL_LINK( FitToLineHdl_Impl, CheckBox* ); + DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void ); + DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); DECL_LINK( KerningSelectHdl_Impl, void *); DECL_LINK( KerningModifyHdl_Impl, void *); DECL_LINK( LoseFocusHdl_Impl, MetricField* ); @@ -344,7 +344,7 @@ private: void SelectCharacter( ListBox* pBox ); void SetBracket( sal_Unicode cBracket, bool bStart ); - DECL_LINK(TwoLinesHdl_Impl, void *); + DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void); DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index d06f55a33fd6..fb0a61f49cd8 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -81,7 +81,7 @@ private: bool bOne; const SubsetMap* pSubsetMap; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); DECL_LINK(FontSelectHdl, void *); DECL_LINK(SubsetSelectHdl, void *); DECL_LINK(CharDoubleClickHdl, void *); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index e9840c6a664a..f4d00a7faab6 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -157,9 +157,9 @@ protected: private: // Handler for the Controls - DECL_LINK( OnClickedFieldRadios, Button* ); - DECL_LINK(OnClickedSearchAgain, void *); - DECL_LINK( OnClickedSpecialSettings, Button* ); + DECL_LINK_TYPED( OnClickedFieldRadios, Button*, void ); + DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); + DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); DECL_LINK(OnSearchTextModified, void *); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 64c92e5c62d4..1883de8d57fe 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -88,7 +88,7 @@ private: INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; - DECL_LINK( ClickCancelBtn, void* ); + DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -133,7 +133,7 @@ private: rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; - DECL_LINK( ClickCancelBtn, void* ); + DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -158,7 +158,7 @@ private: GalleryTheme* pTheme; GalleryProgress aStatusProgress; - DECL_LINK( ClickCancelBtn, void* ); + DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); DECL_LINK_TYPED( TimeoutHdl, Idle*, void ); DECL_LINK( ActualizeHdl, INetURLObject* ); @@ -188,7 +188,7 @@ private: VclPtr<ListBox> m_pLbResName; GalleryTheme* pThm; - DECL_LINK( ClickOkHdl, void* ); + DECL_LINK_TYPED( ClickOkHdl, Button*, void ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog(); @@ -278,10 +278,10 @@ class TPGalleryThemeProperties : public SfxTabPage void TakeFiles(); void DoPreview(); - DECL_LINK( ClickPreviewHdl, void* ); - DECL_LINK( ClickSearchHdl, void* ); - DECL_LINK( ClickTakeHdl, void* ); - DECL_LINK( ClickTakeAllHdl, void* ); + DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); + DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); + DECL_LINK_TYPED( ClickTakeHdl, Button*, void ); + DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void ); DECL_LINK( SelectFoundHdl, void* ); DECL_LINK( SelectFileTypeHdl, void* ); DECL_LINK( DClickFoundHdl, void* ); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 22558265a411..0a27c27d347a 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -69,9 +69,9 @@ private: bool mbReadOnly : 1; bool mbIsHTMLDoc : 1; - DECL_LINK (ClickOkHdl_Impl, void * ); - DECL_LINK (ClickApplyHdl_Impl, void * ); - DECL_LINK (ClickCloseHdl_Impl, void * ); + DECL_LINK_TYPED (ClickOkHdl_Impl, Button *, void ); + DECL_LINK_TYPED (ClickApplyHdl_Impl, Button *, void ); + DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void ); protected: virtual bool Close() SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index b48eecb57b84..e87e64ffe31e 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -71,7 +71,7 @@ private: protected: virtual short Ok() SAL_OVERRIDE; - DECL_LINK( CancelHdlImpl, void * ); + DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -140,9 +140,9 @@ class SvxTransparenceTabPage : public SvxTabPage XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK(ClickTransOffHdl_Impl, void * ); - DECL_LINK(ClickTransLinearHdl_Impl, void * ); - DECL_LINK(ClickTransGradientHdl_Impl, void * ); + DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void ); + DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void ); + DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void ); DECL_LINK(ModifyTransparentHdl_Impl, void*); DECL_LINK(ModifiedTrgrHdl_Impl, void*); @@ -269,13 +269,15 @@ private: DECL_LINK( ModifyHatchingHdl_Impl, void * ); DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * ); DECL_LINK( ModifyBitmapHdl_Impl, void * ); - DECL_LINK( ModifyStepCountHdl_Impl, void * ); + DECL_LINK( ModifyStepCountHdl_Impl, void* ); + DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void ); //UUUU - DECL_LINK( ClickImportHdl_Impl, void * ); + DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); DECL_LINK( ModifyTileHdl_Impl, void * ); - DECL_LINK( ClickScaleHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); void ClickHatchingHdl_Impl(); void ClickGradientHdl_Impl(); @@ -347,7 +349,7 @@ private: SfxItemSet& m_rXFSet; SfxMapUnit m_ePoolUnit; - DECL_LINK( ClickShadowHdl_Impl, void * ); + DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); DECL_LINK( ModifyShadowHdl_Impl, void * ); public: @@ -418,13 +420,13 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK( ChangeGradientHdl_Impl, void * ); DECL_LINK( ModifiedHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); long CheckChanges_Impl(); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -498,11 +500,11 @@ private: DECL_LINK( ChangeHatchHdl_Impl, void * ); DECL_LINK( ModifiedHdl_Impl, void * ); - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); long CheckChanges_Impl(); @@ -580,15 +582,15 @@ private: XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickImportHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK( ChangeBitmapHdl_Impl, void * ); DECL_LINK( ChangePixelColorHdl_Impl, void * ); DECL_LINK( ChangeBackgrndColorHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); long CheckChanges_Impl(); @@ -648,8 +650,8 @@ private: VclPtr<FixedText> m_pTableName; DECL_LINK( EmbedToggleHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); XPropertyListRef GetList(); bool GetEmbed(); @@ -712,10 +714,10 @@ private: void ImpColorCountChanged(); - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); - DECL_LINK( ClickWorkOnHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void ); DECL_LINK( SelectColorLBHdl_Impl, void * ); DECL_LINK( SelectValSetHdl_Impl, void * ); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index f2570fa0d5c8..c5204b9aa682 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -58,7 +58,7 @@ private: protected: virtual short Ok() SAL_OVERRIDE; - DECL_LINK( CancelHdlImpl, void * ); + DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -176,11 +176,13 @@ private: DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); DECL_LINK( SizeHdl_Impl, MetricField * ); - DECL_LINK( RatioHdl_Impl, CheckBox * ); + DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); DECL_LINK( ClickInvisibleHdl_Impl, void * ); DECL_LINK( ChangeStartHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void ); DECL_LINK( ChangeEndHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); DECL_LINK( ChangePreviewHdl_Impl, void * ); DECL_LINK( ChangeTransparentHdl_Impl, void * ); @@ -283,16 +285,16 @@ private: void FillDash_Impl(); void FillDialog_Impl(); - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK( SelectLinestyleHdl_Impl, void * ); DECL_LINK( ChangePreviewHdl_Impl, void * ); DECL_LINK( ChangeNumber1Hdl_Impl, void * ); DECL_LINK( ChangeNumber2Hdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); - DECL_LINK( ChangeMetricHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void ); DECL_LINK( SelectTypeHdl_Impl, void * ); void CheckChanges_Impl(); @@ -357,11 +359,11 @@ private: sal_uInt16 nDlgType; sal_Int32* pPosLineEndLb; - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); DECL_LINK( SelectLineEndHdl_Impl, void * ); long ChangePreviewHdl_Impl( void* p ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index d093de99cc68..2e0839395b1e 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -52,9 +52,10 @@ namespace svx bool m_bModified; #ifdef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX - DECL_LINK( NewHdl, void * ); - DECL_LINK( EditHdl, void * ); - DECL_LINK( DeleteHdl, void * ); + DECL_LINK_TYPED( NewHdl, Button*, void ); + DECL_LINK_TYPED( EditHdl, Button*, void ); + DECL_LINK_TYPED( DeleteHdl, Button*, void ); + DECL_LINK(PathBoxDoubleClickHdl, void *); DECL_LINK(PathSelect_Impl, void *); diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 644b441db613..567988d1680e 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -139,8 +139,8 @@ private: VclPtr<FixedImage> pFtImage; Image* pImage; - DECL_LINK(Button1Hdl, void *); - DECL_LINK(Button2Hdl, void *); + DECL_LINK_TYPED(Button1Hdl, Button*, void); + DECL_LINK_TYPED(Button2Hdl, Button*, void); public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index b565def29229..f756d374a97c 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -100,7 +100,7 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( CropHdl, const MetricField * ); DECL_LINK( CropLoseFocusHdl, MetricField * ); DECL_LINK( CropModifyHdl, MetricField * ); - DECL_LINK(OrigSizeHdl, void *); + DECL_LINK_TYPED(OrigSizeHdl, Button*, void); DECL_LINK_TYPED(Timeout, Timer *, void); void CalcZoom(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index fd317ff5983b..e60d723c3eec 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -142,14 +142,14 @@ namespace svx public: void SetOptionsChangedHdl( const Link<>& _rHdl ); - void SetIgnoreHdl( const Link<>& _rHdl ); - void SetIgnoreAllHdl( const Link<>& _rHdl ); - void SetChangeHdl( const Link<>& _rHdl ); - void SetChangeAllHdl( const Link<>& _rHdl ); + void SetIgnoreHdl( const Link<Button*,void>& _rHdl ); + void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ); + void SetChangeHdl( const Link<Button*,void>& _rHdl ); + void SetChangeAllHdl( const Link<Button*,void>& _rHdl ); void SetClickByCharacterHdl( const Link<>& _rHdl ); - void SetConversionFormatChangedHdl( const Link<>& _rHdl ); - void SetFindHdl( const Link<>& _rHdl ); + void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ); + void SetFindHdl( const Link<Button*,void>& _rHdl ); OUString GetCurrentString( ) const; void SetCurrentString( @@ -180,11 +180,11 @@ namespace svx void EnableRubySupport( bool bVal ); private: - DECL_LINK( OnOption, void* ); + DECL_LINK_TYPED( OnOption, Button*, void ); DECL_LINK( OnSuggestionModified, void* ); DECL_LINK( OnSuggestionSelected, void* ); - DECL_LINK( OnConversionDirectionClicked, CheckBox* ); - DECL_LINK( ClickByCharacterHdl, CheckBox* ); + DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); + DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); /// fill the suggestion list box with suggestions for the actual input void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); @@ -210,11 +210,11 @@ namespace svx HHDictList m_aDictList; css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; - DECL_LINK( OkHdl, void* ); + DECL_LINK_TYPED( OkHdl, Button*, void ); DECL_LINK( DictsLB_SelectHdl, void* ); - DECL_LINK( NewDictHdl, void* ); - DECL_LINK( EditDictHdl, void* ); - DECL_LINK( DeleteDictHdl, void* ); + DECL_LINK_TYPED( NewDictHdl, Button*, void ); + DECL_LINK_TYPED( EditDictHdl, Button*, void ); + DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); void Init(); ///< reads settings from core and init controls public: @@ -234,7 +234,7 @@ namespace svx bool m_bEntered; - DECL_LINK( OKHdl, void* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); DECL_LINK( ModifyHdl, void* ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); @@ -297,8 +297,8 @@ namespace svx DECL_LINK( EditModifyHdl4, Edit* ); DECL_LINK( BookLBSelectHdl, void* ); - DECL_LINK( NewPBPushHdl, void* ); - DECL_LINK( DeletePBPushHdl, void* ); + DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); + DECL_LINK_TYPED( DeletePBPushHdl, Button*, void ); void InitEditDictDialog( sal_uInt32 _nSelDict ); void UpdateOriginalLB(); diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 1df2992796d3..610c861dd9f0 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -36,10 +36,10 @@ private: VclPtr<PushButton> m_pBtCreate; VclPtr<ListBox> m_pLbDocTypes; - bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; + bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); - DECL_LINK (ClickNewHdl_Impl , void * ); + DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void ); protected: void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 9214f8024a0f..e65dbaed1748 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -41,8 +41,8 @@ private: bool mbMarkWndOpen; - DECL_LINK (ClickFileopenHdl_Impl , void * ); - DECL_LINK (ClickTargetHdl_Impl , void * ); + DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void ); + DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void ); DECL_LINK (ModifiedPathHdl_Impl , void * ); ///< Contens of combobox "Path" modified DECL_LINK (ModifiedTargetHdl_Impl, void * ); ///< Contens of editfield "Target" modified diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index a9252e102ed9..60216f581e9a 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -47,9 +47,9 @@ private: bool mbMarkWndOpen; - DECL_LINK (Click_SmartProtocol_Impl , void * ); ///< Radiobutton clicked: Type HTTP or FTP - DECL_LINK (ClickAnonymousHdl_Impl , void * ); ///< Checkbox : Anonymous User - DECL_LINK (ClickBrowseHdl_Impl , void * ); ///< Button : Browse + DECL_LINK_TYPED (Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP + DECL_LINK_TYPED (ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User + DECL_LINK_TYPED (ClickBrowseHdl_Impl , Button*, void ); ///< Button : Browse DECL_LINK (ModifiedLoginHdl_Impl , void * ); ///< Contens of editfield "Login" modified DECL_LINK (LostFocusTargetHdl_Impl , void * ); ///< Combobox "Target" lost its focus DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 6c560279da8b..857e21dd5f8d 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -35,7 +35,7 @@ private: VclPtr<FixedText> m_pFtSubject; VclPtr<Edit> m_pEdSubject; - DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *); + DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 65b010cf66af..209fe82c6d69 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -86,8 +86,9 @@ protected: virtual void Move () SAL_OVERRIDE; - DECL_LINK (ClickApplyHdl_Impl, void * ); - DECL_LINK (ClickCloseHdl_Impl, void * ); + DECL_LINK_TYPED (ClickApplyHdl_Impl, Button*, void ); + DECL_LINK (DoubleClickApplyHdl_Impl, void* ); + DECL_LINK_TYPED (ClickCloseHdl_Impl, Button*, void ); public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 9933d6c1c439..8683ccb77fad 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -101,7 +101,7 @@ protected: OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK (ClickScriptHdl_Impl, void * ); ///< Button : Script + DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script OUString aEmptyStr; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 421737ea663f..29cc98576e8f 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -70,13 +70,13 @@ class SvxHyphenWordDialog : public SfxModalDialog void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default sal_uInt16 GetHyphIndex_Impl(); - DECL_LINK(Left_Impl, void *); - DECL_LINK(Right_Impl, void *); - DECL_LINK(CutHdl_Impl, void *); - DECL_LINK(ContinueHdl_Impl, void *); - DECL_LINK(DeleteHdl_Impl, void *); - DECL_LINK( HyphenateAllHdl_Impl, Button* ); - DECL_LINK(CancelHdl_Impl, void *); + DECL_LINK_TYPED(Left_Impl, Button*, void); + DECL_LINK_TYPED(Right_Impl, Button*, void); + DECL_LINK_TYPED(CutHdl_Impl, Button*, void); + DECL_LINK_TYPED(ContinueHdl_Impl, Button*, void); + DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); + DECL_LINK_TYPED( HyphenateAllHdl_Impl, Button*, void ); + DECL_LINK_TYPED(CancelHdl_Impl, Button*, void); DECL_LINK(GetFocusHdl_Impl, void *); public: diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 3e52b449d281..b34f4e396bde 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -142,10 +142,10 @@ private: bool bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); - DECL_LINK(OkHdl, void *); - DECL_LINK(ApplyHdl, void *); - DECL_LINK(ResetHdl, void *); - DECL_LINK(CancelHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK_TYPED(ApplyHdl, Button*, void); + DECL_LINK_TYPED(ResetHdl, Button*, void); + DECL_LINK_TYPED(CancelHdl, Button*, void); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index aa42ba5594ec..29ac1132220a 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -70,8 +70,8 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl OUString m_aIconMediaType; DECL_LINK(DoubleClickHdl, void*); - DECL_LINK(BrowseHdl, void *); - DECL_LINK(RadioHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK_TYPED(RadioHdl, Button*, void); void SelectDefault(); ListBox& GetObjectTypes() { return *m_pLbObjecttype; } @@ -103,7 +103,7 @@ private: INetURLObject* m_pURL; OUString m_aCommands; - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); OUString GetPlugInFile() const { return m_pEdFileurl->GetText(); } OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } @@ -136,8 +136,8 @@ private: VclPtr<NumericField> m_pNMMarginHeight; VclPtr<CheckBox> m_pCBMarginHeightDefault; - DECL_LINK(OpenHdl, PushButton* ); - DECL_LINK(CheckHdl, CheckBox* ); + DECL_LINK_TYPED(OpenHdl, Button*, void ); + DECL_LINK_TYPED(CheckHdl, Button*, void ); void Init(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 7995287a00ec..7355781b4482 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -67,7 +67,7 @@ private: void SetupType_Impl( sal_uInt16 nType ); DECL_LINK( AnsatzSelectHdl_Impl, ListBox * ); DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * ); - DECL_LINK( LineOptHdl_Impl, Button * ); + DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void ); DECL_LINK( SelectCaptTypeHdl_Impl, void * ); const SfxItemSet& rOutAttrs; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 1d32fc2cde74..9af5b0dacb01 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -66,11 +66,11 @@ class SvBaseLinksDlg : public ModalDialog DECL_LINK( LinksSelectHdl, SvTabListBox * ); DECL_LINK( LinksDoubleClickHdl, SvTabListBox * ); - DECL_LINK( AutomaticClickHdl, RadioButton * ); - DECL_LINK( ManualClickHdl, RadioButton * ); - DECL_LINK(UpdateNowClickHdl, void *); - DECL_LINK( ChangeSourceClickHdl, PushButton * ); - DECL_LINK( BreakLinkClickHdl, PushButton * ); + DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); + DECL_LINK_TYPED( ManualClickHdl, Button *, void ); + DECL_LINK_TYPED(UpdateNowClickHdl, Button *, void); + DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void ); + DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void ); DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); DECL_LINK( EndEditHdl, sfx2::SvBaseLink* ); sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 4edb69f67f02..3fb037e5f0cb 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -40,6 +40,7 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * ); DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * ); + DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index ab7492f4d63b..de7d4a70825d 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -58,7 +58,7 @@ class _SvxMacroTabPage_Impl; class _SvxMacroTabPage : public SfxTabPage { DECL_LINK( SelectEvent_Impl, SvTabListBox * ); - DECL_LINK( AssignDeleteHdl_Impl, PushButton * ); + DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * ); static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn ); @@ -117,7 +117,7 @@ public: SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: - DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); + DECL_DLLPRIVATE_LINK_TYPED( OKHdl_Impl, Button *, void ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 28dbdfdc7c28..81ffca5cb44b 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -60,8 +60,9 @@ private: void FillUnitLB(); - DECL_LINK( ClickAutoPosHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); DECL_LINK( ChangeAttrHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); public: diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index ecc1395f6cad..566974177943 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -43,8 +43,8 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(DelHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(DelHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*); @@ -64,8 +64,8 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(DelHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(DelHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); public: diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index b27347651f68..f2a72c1d7088 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -149,13 +149,16 @@ private: void MakePreviewText( const OUString& rFormat ); void ChangePreviewText( sal_uInt16 nPos ); void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); + bool Click_Impl(PushButton* pIB); // Handler DECL_LINK( LostFocusHdl_Impl, Edit* ); DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); DECL_LINK( SelFormatHdl_Impl, void * ); - DECL_LINK( ClickHdl_Impl, PushButton* ); + DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); DECL_LINK( EditHdl_Impl, Edit* ); DECL_LINK( OptHdl_Impl, void * ); + DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 4b51379be685..37453a66a1aa 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -223,7 +223,7 @@ class SvxBitmapPickTabPage : public SfxTabPage protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); - DECL_LINK(ClickAddBrowseHdl_Impl, void * ); + DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); public: @@ -321,19 +321,19 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); DECL_LINK( LevelHdl_Impl, ListBox * ); - DECL_LINK_TYPED(PopupActivateHdl_Impl, Menu *, bool); + DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool); DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK(BulletHdl_Impl, void *); + DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); DECL_LINK( SizeHdl_Impl, MetricField * ); - DECL_LINK( RatioHdl_Impl, CheckBox * ); - DECL_LINK(CharFmtHdl_Impl, void *); + DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); + DECL_LINK( CharFmtHdl_Impl, void *); DECL_LINK( EditModifyHdl_Impl, Edit * ); DECL_LINK( AllLevelHdl_Impl, NumericField * ); DECL_LINK( OrientHdl_Impl, ListBox * ); - DECL_LINK( SameLevelHdl_Impl, CheckBox * ); + DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); DECL_LINK( BulColorHdl_Impl, ColorListBox* ); DECL_LINK( BulRelSizeHdl_Impl, MetricField *); - DECL_LINK_TYPED(PreviewInvalidateHdl_Impl, Timer *, void); + DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); public: SvxNumOptionsTabPage(vcl::Window* pParent, @@ -426,10 +426,10 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); DECL_LINK( LevelHdl_Impl, ListBox * ); - DECL_LINK(EditModifyHdl_Impl, void *); + DECL_LINK( EditModifyHdl_Impl, void *); DECL_LINK( DistanceHdl_Impl, MetricField * ); - DECL_LINK( RelativeHdl_Impl, CheckBox * ); - DECL_LINK(StandardHdl_Impl, void *); + DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); + DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 39d18ef48976..441f311e9919 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -49,7 +49,7 @@ class SvxAsianLayoutPage : public SfxTabPage SvxAsianLayoutPage_Impl* pImpl; DECL_LINK(LanguageHdl, void *); - DECL_LINK(ChangeStandardHdl, CheckBox*); + DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); DECL_LINK(ModifyHdl, Edit*); public: diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 7efb70d9e1e7..b8028ca9146a 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -59,7 +59,7 @@ private: css::uno::Reference< css::linguistic2::XDictionary > xNewDic; - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK(ModifyHdl_Impl, void *); public: @@ -132,7 +132,8 @@ private: DECL_LINK(SelectBookHdl_Impl, void *); DECL_LINK(SelectLangHdl_Impl, void *); DECL_LINK(SelectHdl, SvTabListBox*); - DECL_LINK(NewDelHdl, PushButton*); + DECL_LINK_TYPED(NewDelHdl, Button*, void); + DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index e09b39e277e6..50bce86b2262 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -75,9 +75,9 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); DECL_LINK(SelectHdl_Impl, SvxCheckListBox *); - DECL_LINK(UpDownHdl_Impl, PushButton *); - DECL_LINK(ClickHdl_Impl, void *); - DECL_LINK(BackHdl_Impl, void *); + DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void); + DECL_LINK_TYPED(ClickHdl_Impl, Button*, void); + DECL_LINK_TYPED(BackHdl_Impl, Button*, void); DECL_LINK( LangSelectHdl_Impl, ListBox* ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); DECL_LINK(OpenURLHdl_Impl, void *); @@ -137,7 +137,7 @@ private: static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( ClickHdl_Impl, PushButton * ); + DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); DECL_LINK(PostDblClickHdl_Impl, void *); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 2b443b4ee6b5..5d23015e74db 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -53,8 +53,9 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); - DECL_LINK(PathHdl_Impl, void *); - DECL_LINK(StandardHdl_Impl, void *); + DECL_LINK_TYPED(PathHdl_Impl, Button*, void); + DECL_LINK(DoubleClickPathHdl_Impl, void *); + DECL_LINK_TYPED(StandardHdl_Impl, Button*, void); DECL_LINK(PathSelect_Impl, void *); DECL_LINK( HeaderSelect_Impl, HeaderBar * ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index c7b6436e551d..0c39b832d57c 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -151,11 +151,11 @@ private: void Init_Impl(); DECL_LINK(LayoutHdl_Impl, void *); DECL_LINK(PaperBinHdl_Impl, void *); - DECL_LINK( SwapOrientation_Impl, RadioButton* ); + DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); DECL_LINK(BorderModify_Impl, void *); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK(CenterHdl_Impl, void *); + DECL_LINK_TYPED(CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); DECL_LINK( PaperSizeSelect_Impl, ListBox* ); @@ -168,7 +168,7 @@ private: DECL_LINK(RangeHdl_Impl, void *); void CalcMargin_Impl(); - DECL_LINK( RegisterModify, CheckBox * ); + DECL_LINK_TYPED( RegisterModify, Button*, void ); // page direction /** Disables vertical page direction entries in the text flow listbox. */ diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index db939787629c..ee5c1dda81c2 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -83,8 +83,8 @@ private: long nAbst; long nWidth; long nMinFixDist; - bool bRelativeMode; - bool bNegativeIndents; + bool bRelativeMode; + bool bNegativeIndents; void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); void Init_Impl(); @@ -92,7 +92,7 @@ private: DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK(ModifyHdl_Impl, void *); - DECL_LINK( AutoHdl_Impl, CheckBox* ); + DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -152,7 +152,7 @@ class SvxParaAlignTabPage : public SfxTabPage VclPtr<VclFrame> m_pPropertiesFL; VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB; - DECL_LINK(AlignHdl_Impl, void *); + DECL_LINK_TYPED(AlignHdl_Impl, Button*, void); DECL_LINK(LastLineHdl_Impl, void *); DECL_LINK(TextDirectionHdl_Impl, void *); @@ -253,12 +253,12 @@ private: bool bHtmlMode; sal_uInt16 nStdPos; - DECL_LINK(PageBreakHdl_Impl, void *); - DECL_LINK(KeepTogetherHdl_Impl, void *); - DECL_LINK(WidowHdl_Impl, void *); - DECL_LINK(OrphanHdl_Impl, void *); - DECL_LINK(HyphenClickHdl_Impl, void *); - DECL_LINK(ApplyCollClickHdl_Impl, void *); + DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); + DECL_LINK_TYPED(KeepTogetherHdl_Impl, Button*, void); + DECL_LINK_TYPED(WidowHdl_Impl, Button*, void); + DECL_LINK_TYPED(OrphanHdl_Impl, Button*, void); + DECL_LINK_TYPED(HyphenClickHdl_Impl, Button*, void); + DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); DECL_LINK( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); @@ -276,7 +276,7 @@ class SvxAsianTabPage : public SfxTabPage SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox* ); + DECL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); public: virtual ~SvxAsianTabPage(); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index b5d6c4cc9706..395190897541 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -94,10 +94,10 @@ private: Link<> aPrevHdlLink; Link<> aNextHdlLink; - DECL_LINK(Stamp, void *); - DECL_LINK(OKHdl, void *); - DECL_LINK(PrevHdl, void *); - DECL_LINK(NextHdl, void *); + DECL_LINK_TYPED(Stamp, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(PrevHdl, Button*, void); + DECL_LINK_TYPED(NextHdl, Button*, void); }; #endif diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9c82f2acd8c7..a60cc4174837 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -157,7 +157,7 @@ protected: const OUString m_renameErrTitleStr; DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node ); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 774851451ab0..ff7e5f21a731 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -184,7 +184,7 @@ class SvxScriptSelectorDialog : public ModelessDialog bool m_bShowSlots; Link<> m_aAddHdl; - DECL_LINK( ClickHdl, Button * ); + DECL_LINK_TYPED( ClickHdl, Button *, void ); DECL_LINK( SelectHdl, Control* ); DECL_LINK( FunctionDoubleClickHdl, Control* ); diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 96c7022d774f..77f6d5023ab5 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -48,7 +48,7 @@ public: void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols); protected: - DECL_LINK(OnClickedOk, void *); + DECL_LINK_TYPED(OnClickedOk, Button*, void); }; #endif // INCLUDED_CUI_SOURCE_INC_SHOWCOLS_HXX diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 9d727d1583f1..047feae4b315 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -41,7 +41,7 @@ public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg(); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK_TYPED( ClickHdl, Button *, void ); virtual bool IsHorizontal() const SAL_OVERRIDE; virtual bool IsProportional() const SAL_OVERRIDE; diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index f1c6aefde1a9..87a3eeeb4370 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -60,7 +60,7 @@ private: SearchAttrItemList& rList; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); }; // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 67f416ee1c63..5c4245f8c0c0 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -99,12 +99,13 @@ class SvxSwPosSizeTabPage : public SfxTabPage DECL_LINK(RangeModifyHdl, void *); - DECL_LINK(AnchorTypeHdl, void *); + DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); + DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); - DECL_LINK(MirrorHdl, void *); + DECL_LINK_TYPED(MirrorHdl, Button*, void); DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK(ProtectHdl, void *); + DECL_LINK_TYPED(ProtectHdl, Button*, void); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index d73e9635a813..c415eab9aaa6 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -107,12 +107,12 @@ private: void SetFillAndTabType_Impl(); // Handler - DECL_LINK( NewHdl_Impl, Button* ); - DECL_LINK(DelHdl_Impl, void *); - DECL_LINK(DelAllHdl_Impl, void *); + DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); + DECL_LINK_TYPED(DelHdl_Impl, Button*, void ); + DECL_LINK_TYPED(DelAllHdl_Impl, Button*, void ); - DECL_LINK( FillTypeCheckHdl_Impl, RadioButton* ); - DECL_LINK( TabTypeCheckHdl_Impl, RadioButton* ); + DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); + DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(ModifyHdl_Impl, void *); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index e0d237850114..c0a1896bcc4b 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -66,10 +66,10 @@ private: SfxMapUnit eUnit; DECL_LINK( SelectEffectHdl_Impl, void * ); - DECL_LINK( ClickEndlessHdl_Impl, void * ); - DECL_LINK( ClickAutoHdl_Impl, void * ); - DECL_LINK( ClickPixelHdl_Impl, void * ); - DECL_LINK( ClickDirectionHdl_Impl, ImageButton * ); + DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickAutoHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickPixelHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDirectionHdl_Impl, Button*, void ); void SelectDirection( SdrTextAniDirection nValue ); sal_uInt16 GetSelectedDirection(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 881f3fd4837c..c232882889c4 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -66,8 +66,8 @@ private: bool bWordWrapTextEnabled; bool bFitToSizeEnabled; - DECL_LINK( ClickFullWidthHdl_Impl, void * ); - DECL_LINK( ClickHdl_Impl, void * ); + DECL_LINK_TYPED( ClickFullWidthHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 4aaa4da782ec..6fd929d430fa 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -142,8 +142,8 @@ public: OUString getErrStr() const { return m_aErrStr; } // Handler - DECL_LINK( ReplaceBtnHdl_Impl, Button * ); - DECL_LINK( LeftBtnHdl_Impl, Button * ); + DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void ); + DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); DECL_LINK( LanguageHdl_Impl, ListBox * ); DECL_LINK( WordSelectHdl_Impl, ComboBox * ); DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 10bc6712d2f3..6a967756f2a9 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -130,16 +130,16 @@ private: RECT_POINT meRP; - DECL_LINK( ChangePosProtectHdl, void * ); - DECL_LINK( ChangeSizeProtectHdl, void * ); + DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void ); + DECL_LINK_TYPED( ChangeSizeProtectHdl, Button*, void ); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); DECL_LINK( ChangeWidthHdl, void * ); DECL_LINK( ChangeHeightHdl, void * ); - DECL_LINK( ClickSizeProtectHdl, void * ); - DECL_LINK( ClickAutoHdl, void * ); + DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); + DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 4bb282dbccba..08a7d2fb1b7e 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -185,8 +185,8 @@ private: protected: DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* ); DECL_LINK(ShowPageHdl_Impl, void *); - DECL_LINK(BackHdl_Impl, void *); - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(BackHdl_Impl, Button*, void); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 55bb1dc2adc9..dcd7c41c81a4 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -48,12 +48,12 @@ private: std::unique_ptr<SfxItemSet> mpOutSet; bool mbModified; - DECL_LINK(UserHdl, RadioButton*); + DECL_LINK_TYPED(UserHdl, Button*, void); DECL_LINK(SpinHdl, void*); - DECL_LINK(ViewLayoutUserHdl, RadioButton*); + DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); DECL_LINK(ViewLayoutSpinHdl, NumericField*); - DECL_LINK(ViewLayoutCheckHdl, CheckBox*); - DECL_LINK(OKHdl, Button*); + DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 89a4930942a8..e0e6866e18e1 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -115,7 +115,7 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent) AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding())); } -IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(CertPathDialog, OKHdl_Impl, Button*, void) { try { @@ -131,8 +131,6 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) } EndDialog(RET_OK); - - return 0; } OUString CertPathDialog::getDirectory() const @@ -217,7 +215,7 @@ void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath HandleCheckEntry(pEntry); } -IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl) +IMPL_LINK_NOARG_TYPED(CertPathDialog, AddHdl_Impl, Button*, void) { try { @@ -240,8 +238,6 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl) { SAL_WARN("cui.options", "caught UNO exception: " << e.Message); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 5a09f9c153eb..510c1529efc2 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -27,8 +27,8 @@ private: OUString m_sManual; DECL_LINK(CheckHdl_Impl, SvSimpleTable *); - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const OUString &rProfile, const OUString &rPath); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index b8253a6b1d21..21e5b51c776b 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -449,7 +449,7 @@ namespace offapp } - IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox ) + IMPL_LINK_TYPED( ConnectionPoolOptionsPage, OnEnabledDisabled, Button*, _pCheckBox, void ) { bool bGloballyEnabled = m_pEnablePooling->IsChecked(); bool bLocalDriverChanged = m_pDriverPoolingEnabled == _pCheckBox; @@ -474,8 +474,6 @@ namespace offapp m_pDriverList->getCurrentRow()->bEnabled = m_pDriverPoolingEnabled->IsChecked(); m_pDriverList->updateCurrentRow(); } - - return 0L; } } // namespace offapp diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index d06ec8893afd..124a7971c9b4 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -59,7 +59,7 @@ namespace offapp virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; protected: - DECL_LINK( OnEnabledDisabled, const CheckBox* ); + DECL_LINK_TYPED( OnEnabledDisabled, Button*, void ); DECL_LINK( OnDriverRowChanged, const void* ); void implInitControls(const SfxItemSet& _rSet, bool _bFromReset); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 569032936e65..eedd4f4b440c 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -145,7 +145,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons Size aHeadSize = rBar.GetSizePixel(); m_pPathBox->SetStyle( m_pPathBox->GetStyle()|nBits ); - m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) ); + m_pPathBox->SetDoubleClickHdl( LINK( this, DbRegistrationOptionsPage, PathBoxDoubleClickHdl ) ); m_pPathBox->SetSelectHdl( LINK( this, DbRegistrationOptionsPage, PathSelect_Impl ) ); m_pPathBox->SetSelectionMode( SINGLE_SELECTION ); m_pPathBox->SetPosSizePixel( Point( 0, aHeadSize.Height() ), @@ -273,7 +273,7 @@ void DbRegistrationOptionsPage::FillUserData() SetUserData( aUserData ); } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) +IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, DeleteHdl, Button*, void) { SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); if ( pEntry ) @@ -282,32 +282,35 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) if ( aQuery->Execute() == RET_YES ) m_pPathBox->GetModel()->Remove(pEntry); } - return 0; } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) +IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void) { OUString sNewName,sNewLocation; openLinkDialog(sNewName,sNewLocation); +} + +IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl) +{ + EditHdl(NULL); return 0; } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) + +IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) { SvTreeListEntry* pEntry = m_pPathBox->GetCurEntry(); if ( !pEntry ) - return 0L; + return; DatabaseRegistration* pOldRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); if ( !pOldRegistration || pOldRegistration->bReadOnly ) - return 0L; + return; OUString sOldName = SvTabListBox::GetEntryText(pEntry,0); m_pCurEntry = pEntry; openLinkDialog( sOldName, pOldRegistration->sLocation, pEntry ); m_pCurEntry = NULL; - - return 1L; } diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index f5f24b741380..304a74ad285e 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -103,7 +103,7 @@ namespace svx } - IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk) + IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnOk, Button*, void) { // get the current URL OUString sURL = m_pURL->GetText(); @@ -128,7 +128,7 @@ namespace svx sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText()); ScopedVclPtrInstance< MessageDialog > aError(this, sMsg); aError->Execute(); - return 0L; + return; } // if (!bFileExists) INetURLObject aURL( sURL ); if ( aURL.GetProtocol() != INetProtocol::File ) @@ -137,7 +137,7 @@ namespace svx sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText()); ScopedVclPtrInstance< MessageDialog > aError(this, sMsg); aError->Execute(); - return 0L; + return; } OUString sCurrentText = m_pName->GetText(); @@ -152,16 +152,15 @@ namespace svx m_pName->SetSelection(Selection(0,sCurrentText.getLength())); m_pName->GrabFocus(); - return 0L; + return; } } EndDialog(RET_OK); - return 0L; } - IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile) + IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnBrowseFile, Button*, void) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); @@ -180,7 +179,7 @@ namespace svx } if (0 != aFileDlg.Execute()) - return 0L; + return; if (m_pName->GetText().isEmpty()) { // default the name to the base of the chosen URL @@ -202,7 +201,6 @@ namespace svx m_pURL->SetText(aTransformer.get(OFileNotation::N_SYSTEM)); validate(); - return 0L; } diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 376d6f04d0e7..a9c935c3a085 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -60,8 +60,8 @@ namespace svx protected: DECL_LINK(OnTextModified, void *); - DECL_LINK( OnBrowseFile, void* ); - DECL_LINK( OnOk, void* ); + DECL_LINK_TYPED( OnBrowseFile, Button*, void ); + DECL_LINK_TYPED( OnOk, Button*, void ); void validate( ); }; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 848625204ca8..3d5c9f978c3d 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -89,15 +89,16 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, aTextColor = m_pCheckLB->GetTextColor(); Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl)); + Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl)); m_pCheckLB->SetSelectHdl(aLink); - m_pUseTableCB->SetClickHdl(aLink); + m_pUseTableCB->SetClickHdl(aClickLink); m_pFont1CB->SetSelectHdl(aLink); m_pFont1CB->SetModifyHdl(aLink); m_pFont2CB->SetSelectHdl(aLink); m_pFont2CB->SetModifyHdl(aLink); - m_pApply->SetClickHdl(aLink); - m_pDelete->SetClickHdl(aLink); + m_pApply->SetClickHdl(aClickLink); + m_pDelete->SetClickHdl(aClickLink); m_pNonPropFontsOnlyCB->SetClickHdl(LINK(this, SvxFontSubstTabPage, NonPropFontsHdl)); @@ -256,6 +257,11 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* ) m_pFontHeightLB->SaveValue(); } +IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void) +{ + SelectHdl(pButton); +} + IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) { if (pWin == m_pApply || pWin == m_pDelete) @@ -333,10 +339,10 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) } -IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) +IMPL_LINK_TYPED(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) { OUString sFontName = m_pFontNameLB->GetSelectEntry(); - bool bNonPropOnly = pBox->IsChecked(); + bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked(); m_pFontNameLB->Clear(); FontList aFntLst( Application::GetDefaultDevice() ); m_pFontNameLB->InsertEntry(m_sAutomatic); @@ -348,7 +354,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox) m_pFontNameLB->InsertEntry(rInfo.GetName()); } m_pFontNameLB->SelectEntry(sFontName); - return 0; } void SvxFontSubstTabPage::CheckEnable() diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 5a47c784d791..f82330bba6d5 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -82,7 +82,8 @@ class SvxFontSubstTabPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, vcl::Window *); - DECL_LINK(NonPropFontsHdl, CheckBox* ); + DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK_TYPED(NonPropFontsHdl, Button*, void); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); void CheckEnable(); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 7b18d07adc2a..c4676a1446b9 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -155,7 +155,7 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI m_pEditBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, StandardHdl_Impl ) ); m_pResetBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, ResetBtnHdl_Impl ) ); - m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, StandardHdl_Impl) ); + m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, DoubleClickHdl_Impl) ); m_pPrefBox->SetExpandingHdl( LINK(this, CuiAboutConfigTabPage, ExpandingHdl_Impl) ); m_pSearchBtn->SetClickHdl( LINK(this, CuiAboutConfigTabPage, SearchHdl_Impl) ); @@ -570,17 +570,22 @@ void CuiAboutConfigValueDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG( CuiAboutConfigTabPage, ResetBtnHdl_Impl ) +IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void ) { Reset(); +} + +IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl ) +{ + StandardHdl_Impl(NULL); return 0; } -IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) +IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) { SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry(); if(pEntry == nullptr) - return 0; + return; UserData *pUserData = static_cast<UserData*>(pEntry->GetUserData()); if(pUserData && pUserData->bIsPropertyPath) @@ -812,10 +817,9 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl ) { } } - return 0; } -IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl) +IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, SearchHdl_Impl, Button*, void) { m_pPrefBox->Clear(); m_pPrefBox->SetUpdateMode( false ); @@ -863,8 +867,6 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, SearchHdl_Impl) m_pPrefBox->SortByCol(sortedCol, sortMode == SortAscending); m_pPrefBox->SetUpdateMode( true ); - - return 0; } void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry) diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 0938dc86d0ce..35fdd5559c41 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -61,9 +61,10 @@ private: static std::vector< OUString > commaStringToSequence( const OUString& rCommaSepString ); void InsertEntry( SvTreeListEntry *pEntry); - DECL_LINK( StandardHdl_Impl, void * ); - DECL_LINK( ResetBtnHdl_Impl, void * ); - DECL_LINK( SearchHdl_Impl, void* ); + DECL_LINK_TYPED( StandardHdl_Impl, Button*, void ); + DECL_LINK( DoubleClickHdl_Impl, void* ); + DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void ); + DECL_LINK_TYPED( SearchHdl_Impl, Button*, void ); DECL_LINK( ExpandingHdl_Impl, void* ); public: diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 31d4b4308659..9f2ac0421969 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -378,16 +378,15 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl) return 0; } -IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox) +IMPL_LINK_TYPED(SvxAsianLayoutPage, ChangeStandardHdl, Button*, pBox, void) { - bool bCheck = pBox->IsChecked(); + bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); m_pStartED->Enable(!bCheck); m_pEndED->Enable(!bCheck); m_pStartFT->Enable(!bCheck); m_pEndFT->Enable(!bCheck); ModifyHdl(m_pStartED); - return 0; } IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit) diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index f9e3c0e22d40..04193d1d5b53 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -180,7 +180,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol ) // ResetToDefaults -IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) +IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, ResetToDefaults, Button*, void) { if( pColorConfig ) { @@ -192,14 +192,12 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) m_pLbChartColors->SelectEntryPos( 0 ); m_pPBRemove->Enable( true ); } - - return 0L; } // AddChartColor -IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) +IMPL_LINK_NOARG_TYPED(SvxDefaultColorOptPage, AddChartColor, Button*, void) { if( pColorConfig ) { @@ -213,19 +211,17 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) m_pLbChartColors->SelectEntryPos( pColorConfig->GetColorList().size() - 1 ); m_pPBRemove->Enable( true ); } - - return 0L; } // RemoveChartColor -IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton ) +IMPL_LINK_TYPED( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) { sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos(); if (m_pLbChartColors->GetSelectEntryCount() == 0) - return 0L; + return; if( pColorConfig ) { @@ -249,8 +245,6 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton ) m_pPBRemove->Enable(true); } } - - return 0L; } IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ColorLB*, _pColorList ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 506b9c87f1a0..17f6af34a627 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -43,9 +43,9 @@ private: SvxChartColorTableItem* pColorConfig; XColorListRef pColorList; - DECL_LINK( ResetToDefaults, void * ); - DECL_LINK( AddChartColor, void * ); - DECL_LINK( RemoveChartColor, PushButton * ); + DECL_LINK_TYPED( ResetToDefaults, Button *, void ); + DECL_LINK_TYPED( AddChartColor, Button *, void ); + DECL_LINK_TYPED( RemoveChartColor, Button *, void ); DECL_LINK( ListClickedHdl, ColorLB * ); DECL_LINK(BoxClickedHdl, void *); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 999aeecdea2b..1f90dcf72efc 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -179,7 +179,7 @@ public: virtual void dispose() SAL_OVERRIDE; public: - void SetLinks (Link<> const&, Link<> const&, Link<> const&); + void SetLinks (Link<Button*,void> const&, Link<> const&, Link<> const&); unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); } void Update (EditableColorConfig const*, EditableExtendedColorConfig const*); void ScrollHdl(const ScrollBar&); @@ -221,7 +221,7 @@ private: void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList); void SetTextColor (Color C) { m_pText->SetTextColor(C); } public: - void SetLinks (Link<> const&, Link<> const&, Link<> const&); + void SetLinks (Link<Button*,void> const&, Link<> const&, Link<> const&); void Update (ColorConfigEntry, ColorConfigValue const&); void Update (ExtendedColorConfigValue const&); void ColorChanged (ColorConfigEntry, ColorConfigValue&); @@ -416,7 +416,7 @@ void ColorConfigWindow_Impl::Entry::SetAppearance( // SetLinks() void ColorConfigWindow_Impl::Entry::SetLinks( - Link<> const& aCheckLink, Link<> const& aColorLink, + Link<Button*,void> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink) { m_pColorList->SetSelectHdl(aColorLink); @@ -691,7 +691,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB) // SetLinks() void ColorConfigWindow_Impl::SetLinks ( - Link<> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink + Link<Button*,void> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink ) { for (unsigned i = 0; i != vEntries.size(); ++i) vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink); @@ -847,7 +847,7 @@ class ColorConfigCtrl_Impl : public VclVBox EditableExtendedColorConfig* pExtColorConfig; DECL_LINK(ScrollHdl, ScrollBar*); - DECL_LINK(ClickHdl, CheckBox*); + DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK(ColorHdl, ColorListBox*); DECL_LINK(ControlFocusHdl, Control*); @@ -901,7 +901,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent) m_pVScroll->SetScrollHdl(aScrollLink); m_pVScroll->SetEndScrollHdl(aScrollLink); - Link<> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl); + Link<Button*,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl); Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl); Link<> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl); m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink); @@ -1002,11 +1002,10 @@ void ColorConfigCtrl_Impl::DataChanged( const DataChangedEvent& rDCEvt ) } } -IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, CheckBox*, pBox) +IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ClickHdl, Button*, pBox, void) { DBG_ASSERT(pColorConfig, "Configuration not set"); - m_pScrollWindow->ClickHdl(pColorConfig, pBox); - return 0; + m_pScrollWindow->ClickHdl(pColorConfig, static_cast<CheckBox*>(pBox)); } // a color list has changed @@ -1071,7 +1070,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( get<vcl::Window>("preview")->GetText()); m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl)); - Link<> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl ); + Link<Button*,void> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl ); m_pSaveSchemePB->SetClickHdl(aLk); m_pDeleteSchemePB->SetClickHdl(aLk); } @@ -1188,7 +1187,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox*, pBox) return 0; } -IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) +IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) { if (m_pSaveSchemePB == pButton) { @@ -1230,7 +1229,6 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) } } m_pDeleteSchemePB->Enable( m_pColorSchemeLB->GetEntryCount() > 1 ); - return 0; } IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog ) diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index c16c2973ee0f..ca290410d458 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -42,7 +42,7 @@ class SvxColorOptionsTabPage : public SfxTabPage svtools::EditableExtendedColorConfig* pExtColorConfig; DECL_LINK(SchemeChangedHdl_Impl, ListBox*); - DECL_LINK(SaveDeleteHdl_Impl, PushButton*); + DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void); DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog*); void UpdateColorConfig(); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 4cc080630f75..5b8911db6fa3 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -24,7 +24,7 @@ // class SvxCTLOptionsPage ----------------------------------------------------- -IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) +IMPL_LINK_NOARG_TYPED(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, Button*, void) { bool bIsSequenceChecking = m_pSequenceCheckingCB->IsChecked(); m_pRestrictedCB->Enable( bIsSequenceChecking ); @@ -35,7 +35,6 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) m_pTypeReplaceCB->Check(); m_pRestrictedCB->Check(); } - return 0; } SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index ac2544d47c27..3cffb33e08e6 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -39,7 +39,7 @@ private: VclPtr<ListBox> m_pNumeralsLB; - DECL_LINK( SequenceCheckingCB_Hdl, void* ); + DECL_LINK_TYPED( SequenceCheckingCB_Hdl, Button*, void ); public: SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 7026e5f3664f..9b3e949a6fa2 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -133,7 +133,7 @@ void SvxNewDictionaryDialog::dispose() } -IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNewDictionaryDialog, OKHdl_Impl, Button*, void) { OUString sDict = comphelper::string::stripEnd(pNameEdit->GetText(), ' '); // add extension for personal dictionaries @@ -158,7 +158,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) // duplicate names? ScopedVclPtrInstance<MessageDialog>::Create(this, CUI_RESSTR(RID_SVXSTR_OPT_DOUBLE_DICTS), VCL_MESSAGE_INFO)->Execute(); pNameEdit->GrabFocus(); - return 0; + return; } // create and add @@ -202,7 +202,6 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl) EndDialog( RET_OK ); - return 0; } @@ -273,8 +272,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( pWordED->SetModifyHdl(LINK(this, SvxEditDictionaryDialog, ModifyHdl)); pReplaceED->SetModifyHdl(LINK(this, SvxEditDictionaryDialog, ModifyHdl)); - pWordED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl)); - pReplaceED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl)); + pWordED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelActionHdl)); + pReplaceED->SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelActionHdl)); // fill listbox with all available WB's const Reference< XDictionary > *pDic = aDics.getConstArray(); @@ -593,7 +592,12 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) -IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) +IMPL_LINK_TYPED(SvxEditDictionaryDialog, NewDelHdl, Button*, pBtn, void) +{ + NewDelActionHdl(static_cast<PushButton*>(pBtn)); +} + +IMPL_LINK(SvxEditDictionaryDialog, NewDelActionHdl, PushButton*, pBtn) { SvTreeListEntry* pEntry = pWordsLB->FirstSelected(); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index af543b331743..4f35b27cf43d 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -73,16 +73,14 @@ void OfaMSFilterTabPage::dispose() } -IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl) +IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, Button*, void) { aWBasicWbctblCB->Enable( aWBasicCodeCB->IsChecked() ); - return 0; } -IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl) +IMPL_LINK_NOARG_TYPED(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void) { aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() ); - return 0; } VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent, diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 2abda52cb46e..d9535fb5dbf0 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -37,8 +37,8 @@ class OfaMSFilterTabPage : public SfxTabPage VclPtr<CheckBox> aPBasicStgCB; - DECL_LINK(LoadWordBasicCheckHdl_Impl, void *); - DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *); + DECL_LINK_TYPED(LoadWordBasicCheckHdl_Impl, Button*, void); + DECL_LINK_TYPED(LoadExcelBasicCheckHdl_Impl, Button*, void); public: OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 4970b4b4fda5..02926c82368c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1140,7 +1140,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) ); m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) ); - Link<> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) ); + Link<Button*,void> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) ); m_pAsianSupportCB->SetClickHdl( aLink ); m_pCTLSupportCB->SetClickHdl( aLink ); @@ -1615,10 +1615,10 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) } } -IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( OfaLanguagesTabPage, SupportHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" ); - bool bCheck = pBox->IsChecked(); if ( m_pAsianSupportCB == pBox ) { @@ -1638,8 +1638,6 @@ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox ) } else SAL_WARN( "cui.options", "OfaLanguagesTabPage::SupportHdl(): wrong pBox" ); - - return 0; } namespace diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 013f28d4ac7e..b031e7918bbb 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -160,7 +160,7 @@ class OfaLanguagesTabPage : public SfxTabPage bool m_bDatePatternsValid; - DECL_LINK( SupportHdl, CheckBox* ) ; + DECL_LINK_TYPED( SupportHdl, Button*, void ) ; DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ; DECL_LINK( DatePatternsHdl, Edit* ) ; diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 537018c5ef4f..a54e17f63871 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -182,10 +182,9 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) aCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() ); } -IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED(OfaHtmlTabPage, CheckBoxHdl_Impl, Button*, pBox, void) { - aStarBasicWarningCB->Enable(!pBox->IsChecked()); - return 0; + aStarBasicWarningCB->Enable(!static_cast<CheckBox*>(pBox)->IsChecked()); } diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index c8a0bd999343..3fce3de5273a 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -47,7 +47,7 @@ class OfaHtmlTabPage : public SfxTabPage VclPtr<CheckBox> aSaveGrfLocalCB; VclPtr<SvxTextEncodingBox> aCharSetLB; - DECL_LINK(CheckBoxHdl_Impl, CheckBox*); + DECL_LINK_TYPED(CheckBoxHdl_Impl, Button*, void); public: virtual ~OfaHtmlTabPage(); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 67d5fed7124c..4891a4550e73 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -666,15 +666,14 @@ void SvxSecurityTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl) +IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SecurityOptionsHdl, Button*, void) { if ( !mpSecOptDlg ) mpSecOptDlg = VclPtr<svx::SecurityOptionsDialog>::Create( this, mpSecOptions ); mpSecOptDlg->Execute(); - return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) +IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, SavePasswordHdl, Button*, void) { try { @@ -725,11 +724,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) { m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() ); } - - return 0; } -IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl) +IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void) { try { @@ -741,11 +738,9 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl) } catch (const Exception&) {} - - return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl) +IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, MasterPasswordCBHdl, Button*, void) { try { @@ -785,11 +780,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl) { m_pSavePasswordsCB->Check( !m_pSavePasswordsCB->IsChecked() ); } - - return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl) +IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) { try { @@ -804,10 +797,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl) } catch (const Exception&) {} - return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl) +IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, CertPathPBHdl, Button*, void) { if (!mpCertPathDlg) mpCertPathDlg = VclPtr<CertPathDialog>::Create(this); @@ -820,11 +812,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl) ScopedVclPtrInstance< MessageDialog > aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO); aWarnBox->Execute(); } - - return 0; } -IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl) +IMPL_LINK_NOARG_TYPED(SvxSecurityTabPage, TSAURLsPBHdl, Button*, void) { // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between // invocations. Seems clearer to my little brain that way. @@ -832,11 +822,9 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl) ScopedVclPtrInstance<TSAURLsDialog> pTSAURLsDlg(this); pTSAURLsDlg->Execute(); - - return 0; } -IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl) +IMPL_STATIC_LINK_NOARG_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void) { try { @@ -849,7 +837,6 @@ IMPL_STATIC_LINK_NOARG(SvxSecurityTabPage, MacroSecPBHdl) OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); (void)e; } - return 0; } @@ -1076,7 +1063,7 @@ void SvxEMailTabPage::Reset( const SfxItemSet* ) /* -------------------------------------------------------------------------*/ -IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) +IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) { if (m_pMailerURLPB == pButton && !pImpl->bROProgram) { @@ -1103,7 +1090,6 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) m_pMailerURLED->SetText(sPath); } } - return 0; } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index c23dc7be8c87..0c5da70c3cee 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -155,14 +155,14 @@ private: OUString m_sPasswordStoringDeactivateStr; - DECL_LINK(SecurityOptionsHdl, void *); - DECL_LINK(SavePasswordHdl, void* ); - DECL_STATIC_LINK(SvxSecurityTabPage, MasterPasswordHdl, void *); - DECL_LINK(MasterPasswordCBHdl, void* ); - DECL_LINK(ShowPasswordsHdl, void *); - DECL_STATIC_LINK(SvxSecurityTabPage, MacroSecPBHdl, void* ); - DECL_LINK(CertPathPBHdl, void* ); - DECL_LINK(TSAURLsPBHdl, void* ); + DECL_LINK_TYPED(SecurityOptionsHdl, Button*, void); + DECL_LINK_TYPED(SavePasswordHdl, Button*, void); + DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MasterPasswordHdl, Button*, void); + DECL_LINK_TYPED(MasterPasswordCBHdl, Button*, void); + DECL_LINK_TYPED(ShowPasswordsHdl, Button*, void); + DECL_STATIC_LINK_TYPED(SvxSecurityTabPage, MacroSecPBHdl, Button*, void ); + DECL_LINK_TYPED(CertPathPBHdl, Button*, void ); + DECL_LINK_TYPED(TSAURLsPBHdl, Button*, void ); void InitControls(); @@ -195,7 +195,7 @@ class SvxEMailTabPage : public SfxTabPage SvxEMailTabPage_Impl* pImpl; - DECL_LINK( FileDialogHdl_Impl, PushButton* ) ; + DECL_LINK_TYPED( FileDialogHdl_Impl, Button*, void ); public: SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 6da45086e863..ee9afe036efa 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -236,12 +236,11 @@ void SvxJavaOptionsPage::dispose() -IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) { bool bEnable = m_pJavaEnableCB->IsChecked(); m_pJavaBox->Enable(bEnable); bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable(); - return 0; } @@ -273,7 +272,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) -IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, AddHdl_Impl, Button*, void) { try { @@ -294,13 +293,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl) { SAL_WARN( "cui.options", "SvxJavaOptionsPage::AddHdl_Impl(): caught exception: " << e.Message); } - - return 0; } -IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA Sequence< OUString > aParameterList; @@ -344,12 +341,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl) else m_pParamDlg->SetParameters( aParameterList ); #endif - return 0; } -IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ClassPathHdl_Impl, Button*, void) { #if HAVE_FEATURE_JAVA OUString sClassPath; @@ -389,7 +385,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) else m_pPathDlg->SetClassPath( sClassPath ); #endif - return 0; } @@ -433,7 +428,7 @@ IMPL_LINK_TYPED( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, -IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl ) +IMPL_LINK_NOARG_TYPED( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void ) { ScopedVclPtrInstance< CuiAboutConfigTabPage > m_pExpertConfigDlg(this); m_pExpertConfigDlg->Reset();//initialize and reset function @@ -444,7 +439,6 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl ) } m_pExpertConfigDlg.disposeAndClear(); - return 0; } @@ -844,7 +838,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl) -IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, AssignHdl_Impl, Button*, void) { OUString sParam = comphelper::string::strip(m_pParameterEdit->GetText(), ' '); if (!sParam.isEmpty()) @@ -857,8 +851,6 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl) ModifyHdl_Impl( m_pParameterEdit ); EnableRemoveButton(); } - - return 0; } @@ -881,7 +873,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl) -IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -896,8 +888,6 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl) } } EnableRemoveButton(); - - return 0; } @@ -979,7 +969,7 @@ void SvxJavaClassPathDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) { sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) ); @@ -1011,12 +1001,11 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl) } } EnableRemoveButton(); - return 0; } -IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) { Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Reference < XFolderPicker2 > xFolderPicker = FolderPicker::create(xContext);; @@ -1048,12 +1037,11 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl) } } EnableRemoveButton(); - return 0; } -IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) { sal_Int32 nPos = m_pPathList->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -1069,7 +1057,6 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl) } EnableRemoveButton(); - return 0; } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 06bd595bb81b..70acc0e922c9 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -84,18 +84,18 @@ private: css::uno::Reference< ::svt::DialogClosedListener > xDialogListener; css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; - DECL_LINK(EnableHdl_Impl, void *); + DECL_LINK_TYPED(EnableHdl_Impl, Button*, void); DECL_LINK( CheckHdl_Impl, SvSimpleTable * ); DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(ParameterHdl_Impl, void *); - DECL_LINK(ClassPathHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(ParameterHdl_Impl, Button*, void); + DECL_LINK_TYPED(ClassPathHdl_Impl, Button*, void); DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void); DECL_LINK( StartFolderPickerHdl, void * ); DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); - DECL_LINK(ExpertConfigHdl_Impl, void *); + DECL_LINK_TYPED(ExpertConfigHdl_Impl, Button*, void); void ClearJavaInfo(); void ClearJavaList(); @@ -128,10 +128,10 @@ private: VclPtr<PushButton> m_pRemoveBtn; DECL_LINK(ModifyHdl_Impl, void *); - DECL_LINK(AssignHdl_Impl, void *); + DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(DblClickHdl_Impl, void *); - DECL_LINK(RemoveHdl_Impl, void *); + DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void); inline void EnableRemoveButton() { m_pRemoveBtn->Enable( @@ -162,9 +162,9 @@ private: OUString m_sOldPath; - DECL_LINK(AddArchiveHdl_Impl, void *); - DECL_LINK(AddPathHdl_Impl, void *); - DECL_LINK(RemoveHdl_Impl, void *); + DECL_LINK_TYPED(AddArchiveHdl_Impl, Button*, void); + DECL_LINK_TYPED(AddPathHdl_Impl, Button*, void); + DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); bool IsPathDuplicate( const OUString& _rPath ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 5a6817984955..f404fa28fa4c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1582,7 +1582,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) -IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) +IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) { if (m_pLinguModulesEditPB == pBtn) { @@ -1670,7 +1670,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDeleteDictionaryDialog", "cui/ui/querydeletedictionarydialog.ui"); if (RET_NO == aQuery->Execute()) - return 0; + return; SvTreeListEntry *pEntry = m_pLinguDicsCLB->GetCurEntry(); if (pEntry) @@ -1758,8 +1758,6 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) { OSL_FAIL( "pBtn unexpected value" ); } - - return 0; } @@ -2274,7 +2272,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) return 0; } -IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) +IMPL_LINK_TYPED( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) { bool bUp = m_pPrioUpPB == pBtn; sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos(); @@ -2300,22 +2298,19 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) SelectHdl_Impl(m_pModulesCLB); m_pModulesCLB->SetUpdateMode(true); } - return 0; } -IMPL_LINK_NOARG(SvxEditModulesDlg, ClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, ClickHdl_Impl, Button*, void) { // store language config LangSelectHdl_Impl(m_pLanguageLB); EndDialog( RET_OK ); - return 0; } -IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void) { rLinguData = *pDefaultLinguData; LangSelectHdl_Impl(0); - return 0; } diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx index 4c97609dcbc4..e20876b9ede0 100644 --- a/cui/source/options/optopencl.cxx +++ b/cui/source/options/optopencl.cxx @@ -372,41 +372,40 @@ void SvxOpenCLTabPage::EnableOpenCLHdl(VclFrame* pFrame, bool aEnable) pFrame->Enable(aEnable); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListEditHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListEditHdl, Button*, void) { - return EditHdl(mpBlackList, maConfig.maBlackList, "bledit"); + EditHdl(mpBlackList, maConfig.maBlackList, "bledit"); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListAddHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListAddHdl, Button*, void) { - return AddHdl(mpBlackList, maConfig.maBlackList, "bladd"); + AddHdl(mpBlackList, maConfig.maBlackList, "bladd"); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, BlackListDeleteHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, BlackListDeleteHdl, Button*, void) { - return DeleteHdl(mpBlackList, maConfig.maBlackList); + DeleteHdl(mpBlackList, maConfig.maBlackList); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListEditHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListEditHdl, Button*, void) { - return EditHdl(mpWhiteList, maConfig.maWhiteList, "wledit"); + EditHdl(mpWhiteList, maConfig.maWhiteList, "wledit"); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListAddHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListAddHdl, Button*, void) { - return AddHdl(mpWhiteList, maConfig.maWhiteList, "wladd"); + AddHdl(mpWhiteList, maConfig.maWhiteList, "wladd"); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, WhiteListDeleteHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, WhiteListDeleteHdl, Button*, void) { - return DeleteHdl(mpWhiteList, maConfig.maWhiteList); + DeleteHdl(mpWhiteList, maConfig.maWhiteList); } -IMPL_LINK_NOARG(SvxOpenCLTabPage, EnableOpenCLHdl) +IMPL_LINK_NOARG_TYPED(SvxOpenCLTabPage, EnableOpenCLHdl, Button*, void) { EnableOpenCLHdl(mpBlackListFrame, mpUseOpenCL->IsChecked()); EnableOpenCLHdl(mpWhiteListFrame, mpUseOpenCL->IsChecked()); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index 99886acbe038..1c57826bfa43 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -52,15 +52,15 @@ private: VclPtr<PushButton> mpWhiteListAdd; VclPtr<PushButton> mpWhiteListDelete; - DECL_LINK(BlackListEditHdl, void*); - DECL_LINK(BlackListAddHdl, void*); - DECL_LINK(BlackListDeleteHdl, void*); + DECL_LINK_TYPED(BlackListEditHdl, Button*, void); + DECL_LINK_TYPED(BlackListAddHdl, Button*, void); + DECL_LINK_TYPED(BlackListDeleteHdl, Button*, void); - DECL_LINK(WhiteListEditHdl, void*); - DECL_LINK(WhiteListAddHdl, void*); - DECL_LINK(WhiteListDeleteHdl, void*); + DECL_LINK_TYPED(WhiteListEditHdl, Button*, void); + DECL_LINK_TYPED(WhiteListAddHdl, Button*, void); + DECL_LINK_TYPED(WhiteListDeleteHdl, Button*, void); - DECL_LINK(EnableOpenCLHdl, void*); + DECL_LINK_TYPED(EnableOpenCLHdl, Button*, void); long EditHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag); long AddHdl(SvSimpleTable* pListBox, OpenCLConfig::ImplMatcherSet& rSet, const OString& rTag); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 6b985e73c876..787b9564160d 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -195,8 +195,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pPathCtrl, "paths"); m_pStandardBtn->SetClickHdl(LINK(this, SvxPathTabPage, StandardHdl_Impl)); - Link<> aLink = LINK( this, SvxPathTabPage, PathHdl_Impl ); - m_pPathBtn->SetClickHdl( aLink ); + m_pPathBtn->SetClickHdl( LINK( this, SvxPathTabPage, PathHdl_Impl ) ); Size aControlSize(236 , 147); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); @@ -224,7 +223,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) aTabs[3] = aTabs[2] + nWidth2 + 12; pPathBox->SetTabs(aTabs, MAP_PIXEL); - pPathBox->SetDoubleClickHdl( aLink ); + pPathBox->SetDoubleClickHdl( LINK( this, SvxPathTabPage, DoubleClickPathHdl_Impl ) ); pPathBox->SetSelectHdl( LINK( this, SvxPathTabPage, PathSelect_Impl ) ); pPathBox->SetSelectionMode( MULTIPLE_SELECTION ); pPathBox->SetHighlightRange(); @@ -405,7 +404,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) -IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPathTabPage, StandardHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) @@ -456,7 +455,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) } pEntry = pPathBox->NextSelected( pEntry ); } - return 0; } @@ -526,7 +524,13 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) -IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) +IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl) +{ + PathHdl_Impl(NULL); + return 0; +} + +IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) { SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); sal_uInt16 nPos = ( pEntry != NULL ) ? static_cast<PathUserData_Impl*>(pEntry->GetUserData())->nRealId : 0; @@ -541,7 +545,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) } if(pEntry && !(!SvTreeListBox::GetCollapsedEntryBmp(pEntry))) - return 0; + return; if ( IsMultiPath_Impl( nPos ) ) { @@ -615,7 +619,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) { short nRet = xFolderPicker->execute(); if ( ExecutableDialogResults::OK != nRet ) - return 0; + return; OUString sFolder( xFolderPicker->getDirectory() ); ChangeCurrentEntry( sFolder ); @@ -626,7 +630,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) SAL_WARN( "cui.options", "SvxPathTabPage::PathHdl_Impl: exception from folder picker" ); } } - return 0; } diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 8bb88384c6c6..1ec65657ccd0 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -118,8 +118,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet aDocTypeLB->SetEntryData(5, reinterpret_cast<void*>(APP_DRAW) ); aDocTypeLB->SetEntryData(6, reinterpret_cast<void*>(APP_MATH) ); - Link<> aLink = LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ); - aAutoSaveCB->SetClickHdl( aLink ); + aAutoSaveCB->SetClickHdl( LINK( this, SvxSaveTabPage, AutoClickHdl_Impl ) ); aAutoSaveEdit->SetMaxTextLen( 2 ); SvtModuleOptions aModuleOpt; @@ -186,7 +185,7 @@ SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pImpl->aDefaultReadonlyArr[APP_WRITER_GLOBAL] = aModuleOpt.IsDefaultFilterReadonly(SvtModuleOptions::EFactory::WRITERGLOBAL); } - aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl ); + Link<> aLink = LINK( this, SvxSaveTabPage, ODFVersionHdl_Impl ); aODFVersionLB->SetSelectHdl( aLink ); aLink = LINK( this, SvxSaveTabPage, FilterHdl_Impl ); aDocTypeLB->SetSelectHdl( aLink ); @@ -515,7 +514,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) -IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxSaveTabPage, AutoClickHdl_Impl, Button*, pBox, void ) { if ( pBox == aAutoSaveCB ) { @@ -532,7 +531,6 @@ IMPL_LINK( SvxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox ) aUserAutoSaveCB->Disable(); } } - return 0; } static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties) diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 98ec868a1b88..0a33a2a36239 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -60,7 +60,7 @@ private: SvxSaveTabPage_Impl* pImpl; - DECL_LINK( AutoClickHdl_Impl, CheckBox * ); + DECL_LINK_TYPED( AutoClickHdl_Impl, Button*, void ); DECL_LINK( FilterHdl_Impl, ListBox * ); DECL_LINK(ODFVersionHdl_Impl, void *); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 5dee38d29b04..741a2ecca292 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -277,20 +277,18 @@ void SvxOnlineUpdateTabPage::FillUserData() -IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, Button*, pBox, void ) { - bool bEnabled = pBox->IsChecked(); + bool bEnabled = static_cast<CheckBox*>(pBox)->IsChecked(); m_pEveryDayButton->Enable(bEnabled); m_pEveryWeekButton->Enable(bEnabled); m_pEveryMonthButton->Enable(bEnabled); - - return 0; } -IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, FileDialogHdl_Impl, Button*, void) { uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext); @@ -308,13 +306,11 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl) if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder)) m_pDestPath->SetText( aFolder ); } - - return 0; } -IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxOnlineUpdateTabPage, CheckNowHdl_Impl, Button*, void) { uno::Reference < uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); @@ -361,8 +357,6 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) OSL_TRACE( "Caught exception: %s\n thread terminated.\n", OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index efafee9a6dc5..aaba652011fe 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -42,9 +42,9 @@ private: OUString m_aNeverChecked; OUString m_aLastCheckedTemplate; - DECL_LINK(FileDialogHdl_Impl, void *) ; - DECL_LINK(CheckNowHdl_Impl, void *) ; - DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ; + DECL_LINK_TYPED(FileDialogHdl_Impl, Button*, void); + DECL_LINK_TYPED(CheckNowHdl_Impl, Button*, void); + DECL_LINK_TYPED(AutoCheckHdl_Impl, Button*, void); css::uno::Reference< css::container::XNameReplace > m_xUpdateAccess; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 8c0c5941026a..2450e1ab9484 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -119,7 +119,7 @@ OUString SelectPersonaDialog::GetSelectedPersona() const return OUString(); } -IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton ) +IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas, Button*, pButton, void ) { OUString searchTerm; if( m_rSearchThread.is() ) @@ -140,7 +140,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton ) } if( searchTerm.isEmpty( ) ) - return 0; + return; // TODO FIXME! // Before the release, the allizom.org url should be changed to: @@ -176,10 +176,9 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, PushButton*, pButton ) OUString rSearchURL = "https://addons.allizom.org/en-US/firefox/api/1.5/search/" + searchTerm + "/9/9"; m_rSearchThread = new SearchAndParseThread( this, rSearchURL ); m_rSearchThread->launch(); - return 0; } -IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /* pButton */ ) +IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionOK, Button*, void ) { OUString aSelectedPersona = GetSelectedPersona(); @@ -195,19 +194,17 @@ IMPL_LINK( SelectPersonaDialog, ActionOK, PushButton*, /* pButton */ ) m_rSearchThread->StopExecution(); EndDialog( RET_OK ); } - return 0; } -IMPL_LINK( SelectPersonaDialog, ActionCancel, PushButton*, /* pButton */ ) +IMPL_LINK_NOARG_TYPED( SelectPersonaDialog, ActionCancel, Button*, void ) { if( m_rSearchThread.is() ) m_rSearchThread->StopExecution(); EndDialog(); - return 0; } -IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton ) +IMPL_LINK_TYPED( SelectPersonaDialog, SelectPersona, Button*, pButton, void ) { if( m_rSearchThread.is() ) m_rSearchThread->StopExecution(); @@ -229,7 +226,6 @@ IMPL_LINK( SelectPersonaDialog, SelectPersona, PushButton*, pButton ) break; } } - return 0; } void SelectPersonaDialog::SetAppliedPersonaSetting( OUString& rPersonaSetting ) @@ -474,7 +470,7 @@ void SvxPersonalizationTabPage::LoadExtensionThemes() } } -IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SvxPersonalizationTabPage, SelectPersona, Button*, void ) { ScopedVclPtrInstance< SelectPersonaDialog > aDialog(nullptr); @@ -486,19 +482,15 @@ IMPL_LINK( SvxPersonalizationTabPage, SelectPersona, PushButton*, /*pButton*/ ) SetPersonaSettings( aPersonaSetting ); } } - - return 0; } -IMPL_LINK( SvxPersonalizationTabPage, ForceSelect, RadioButton*, pButton ) +IMPL_LINK_TYPED( SvxPersonalizationTabPage, ForceSelect, Button*, pButton, void ) { if ( pButton == m_pOwnPersona && m_aPersonaSettings.isEmpty() ) SelectPersona( m_pSelectPersona ); - - return 0; } -IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, PushButton*, pButton ) +IMPL_LINK_TYPED( SvxPersonalizationTabPage, DefaultPersona, Button*, pButton, void ) { m_pDefaultPersona->Check(); for( sal_Int32 nIndex = 0; nIndex < 3; nIndex++ ) @@ -506,8 +498,6 @@ IMPL_LINK( SvxPersonalizationTabPage, DefaultPersona, PushButton*, pButton ) if( pButton == m_vDefaultPersonaImages[nIndex] ) m_aPersonaSettings = m_vDefaultPersonaSettings[nIndex]; } - - return 0; } IMPL_LINK( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox*, ) diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index f5805026a01f..59e9cbdf81a9 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -59,13 +59,13 @@ public: private: /// Handle the Persona selection - DECL_LINK( SelectPersona, PushButton* ); + DECL_LINK_TYPED( SelectPersona, Button*, void ); /// When 'own' is chosen, but the Persona is not chosen yet. - DECL_LINK( ForceSelect, RadioButton* ); + DECL_LINK_TYPED( ForceSelect, Button*, void ); /// Handle the default Persona selection - DECL_LINK( DefaultPersona, PushButton* ); + DECL_LINK_TYPED( DefaultPersona, Button*, void ); /// Handle the Personas installed through extensions selection DECL_LINK( SelectInstalledPersona, ListBox* ); @@ -107,10 +107,10 @@ public: private: /// Handle the Search button - DECL_LINK( SearchPersonas, PushButton* ); - DECL_LINK( SelectPersona, PushButton* ); - DECL_LINK( ActionOK, PushButton* ); - DECL_LINK( ActionCancel, PushButton* ); + DECL_LINK_TYPED( SearchPersonas, Button*, void ); + DECL_LINK_TYPED( SelectPersona, Button*, void ); + DECL_LINK_TYPED( ActionOK, Button*, void ); + DECL_LINK_TYPED( ActionCancel, Button*, void ); }; class SearchAndParseThread: public salhelper::Thread diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 3cb968246754..e83351f80191 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl) return 0; } -IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) +IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) { if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) { @@ -674,10 +674,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) else if ( pPageInfo->m_pExtPage ) pPageInfo->m_pExtPage->ResetPage(); } - return 0; } -IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) { pTreeLB->EndSelection(); if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) ) @@ -695,7 +694,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) { // the page mustn't be left pTreeLB->Select(pCurrentPageEntry); - return 0; + return; } } pPageInfo->m_pPage->Hide(); @@ -724,7 +723,6 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) pEntry = pTreeLB->Next(pEntry); } EndDialog(RET_OK); - return 0; } // an opened group shall be completely visible diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index a886975b4bab..82668264249f 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -50,7 +50,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent) } } -IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(TSAURLsDialog, OKHdl_Impl, Button*, void) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); @@ -63,8 +63,6 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl) batch->commit(); EndDialog(RET_OK); - - return 0; } TSAURLsDialog::~TSAURLsDialog() @@ -97,7 +95,7 @@ void TSAURLsDialog::AddTSAURL(const OUString& rURL) m_pURLListBox->SetUpdateMode(true); } -IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl) +IMPL_LINK_NOARG_TYPED(TSAURLsDialog, AddHdl_Impl, Button*, void) { OUString aURL; OUString aDesc( get<FixedText>("enteraurl")->GetText() ); @@ -112,22 +110,18 @@ IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl) AddTSAURL(aURL); m_pOKBtn->Enable(); } - - return 0; } -IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(TSAURLsDialog, DeleteHdl_Impl, Button*, void) { sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos(); if (nSel == LISTBOX_ENTRY_NOTFOUND) - return 0; + return; m_aURLs.erase(m_pURLListBox->GetEntry(nSel)); m_pURLListBox->RemoveEntry(nSel); m_pOKBtn->Enable(); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index 421710113533..003c9771c27f 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -21,9 +21,9 @@ private: VclPtr<PushButton> m_pDeleteBtn; VclPtr<OKButton> m_pOKBtn; - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(DeleteHdl_Impl, void *); - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); std::set<OUString> m_aURLs; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 98e0b875d904..b58a7cbf2ee6 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -206,7 +206,7 @@ void WebConnectionInfoDialog::FillPasswordList() } -IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) +IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemovePasswordHdl, Button*, void) { try { @@ -233,12 +233,10 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) } catch( uno::Exception& ) {} - - return 0; } -IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl) +IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, RemoveAllPasswordsHdl, Button*, void) { try { @@ -257,12 +255,10 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl) } catch( uno::Exception& ) {} - - return 0; } -IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) +IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) { try { @@ -296,8 +292,6 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) } catch( uno::Exception& ) {} - - return 0; } diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 9b830af762e3..02bf741eff6e 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -51,9 +51,9 @@ namespace svx sal_Int32 m_nPos; DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* ); - DECL_LINK(RemovePasswordHdl, void *); - DECL_LINK(RemoveAllPasswordsHdl, void *); - DECL_LINK(ChangePasswordHdl, void *); + DECL_LINK_TYPED(RemovePasswordHdl, Button*, void); + DECL_LINK_TYPED(RemoveAllPasswordsHdl, Button*, void); + DECL_LINK_TYPED(ChangePasswordHdl, Button*, void); DECL_LINK( EntrySelectedHdl, void* ); void FillPasswordList(); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index cad777dfcc7a..343f42dacc1b 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -206,7 +206,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor Link<> aLink = LINK( this, AlignmentTabPage, UpdateEnableHdl ); m_pLbHorAlign->SetSelectHdl( aLink ); - m_pBtnWrap->SetClickHdl( aLink ); + m_pBtnWrap->SetClickHdl( LINK( this, AlignmentTabPage, UpdateEnableClickHdl ) ); // Asian vertical mode m_pCbAsianMode->Show( SvtCJKOptions().IsVerticalTextEnabled() ); @@ -430,6 +430,11 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n return eMethodOld != eMethodNew; } +IMPL_LINK_NOARG_TYPED(AlignmentTabPage, UpdateEnableClickHdl, Button*, void) +{ + UpdateEnableControls(); +} + IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl) { UpdateEnableControls(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 57ab3849edf1..7487c6d7523d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -446,7 +446,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, m_pCheckLB->SetStyle(m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL); m_pCheckLB->SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl)); - m_pCheckLB->SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, EditHdl)); + m_pCheckLB->SetDoubleClickHdl(LINK(this, OfaSwAutoFmtOptionsPage, DoubleClickEditHdl)); static long aStaticTabs[]= { @@ -724,7 +724,13 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox) return 0; } -IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) +IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl) +{ + EditHdl(NULL); + return 0; +} + +IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) { sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos(); if( nSelEntryPos == REPLACE_BULLETS || @@ -757,7 +763,6 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) } } m_pCheckLB->Invalidate(); - return 0; } void OfaACorrCheckListBox::SetTabs() @@ -900,8 +905,8 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, m_pDeleteReplacePB->SetClickHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl) ); m_pShortED->SetModifyHdl( LINK(this, OfaAutocorrReplacePage, ModifyHdl) ); m_pReplaceED->SetModifyHdl( LINK(this, OfaAutocorrReplacePage, ModifyHdl) ); - m_pShortED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl) ); - m_pReplaceED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelHdl) ); + m_pShortED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelActionHdl) ); + m_pReplaceED->SetActionHdl( LINK(this, OfaAutocorrReplacePage, NewDelActionHdl) ); m_pReplaceED->SetSpaces(true); m_pShortED->SetSpaces(true); @@ -1237,7 +1242,12 @@ void OfaAutocorrReplacePage::DeleteEntry(const OUString& sShort, const OUString& rDeletedArray.push_back(aDeletedString); } -IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) +IMPL_LINK_TYPED(OfaAutocorrReplacePage, NewDelHdl, Button*, pBtn, void) +{ + NewDelActionHdl(static_cast<PushButton*>(pBtn)); +} + +IMPL_LINK(OfaAutocorrReplacePage, NewDelActionHdl, PushButton*, pBtn) { SvTreeListEntry* pEntry = m_pReplaceTLB->FirstSelected(); if( pBtn == m_pDeleteReplacePB ) @@ -1443,8 +1453,8 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItem m_pAbbrevED->SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl)); m_pDoubleCapsED->SetModifyHdl(LINK(this, OfaAutocorrExceptPage, ModifyHdl)); - m_pAbbrevED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl)); - m_pDoubleCapsED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl)); + m_pAbbrevED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelActionHdl)); + m_pDoubleCapsED->SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelActionHdl)); } OfaAutocorrExceptPage::~OfaAutocorrExceptPage() @@ -1681,7 +1691,12 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet* ) m_pAutoCapsCB->SaveValue(); } -IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, void*, pBtn) +IMPL_LINK_TYPED(OfaAutocorrExceptPage, NewDelHdl, Button*, pBtn, void) +{ + NewDelActionHdl(pBtn); +} + +IMPL_LINK(OfaAutocorrExceptPage, NewDelActionHdl, void*, pBtn) { if((pBtn == m_pNewAbbrevPB || pBtn == m_pAbbrevED.get() ) && !m_pAbbrevED->GetText().isEmpty()) @@ -2046,7 +2061,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* ) #define DBL_END 3 -IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) { sal_uInt16 nMode = SGL_START; if (pBtn == m_pSglEndQuotePB) @@ -2116,11 +2131,9 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) break; } } - - return 0; } -IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( OfaQuoteTabPage, StdQuoteHdl, Button*, pBtn, void ) { if (pBtn == m_pDblStandardPB) { @@ -2137,7 +2150,6 @@ IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn ) cSglEndQuote = 0; m_pSglEndExFT->SetText(ChangeStringExt_Impl(0)); } - return 0; } @@ -2357,7 +2369,7 @@ void OfaAutoCompleteTabPage::ActivatePage( const SfxItemSet& ) static_cast<OfaAutoCorrDlg*>(GetTabDialog())->EnableLanguage( false ); } -IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl) +IMPL_LINK_NOARG_TYPED(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) { sal_Int32 nSelCnt = (m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0; @@ -2369,7 +2381,6 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl) editeng::IAutoCompleteString hack(*pStr); // UGLY m_pAutoCompleteList->erase(&hack); } - return 0; } IMPL_LINK( OfaAutoCompleteTabPage, CheckHdl, CheckBox*, pBox ) @@ -2579,7 +2590,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) /** Handler for the push button */ -IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl) +IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) { const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos(); const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos); @@ -2590,8 +2601,6 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl) const lang::Locale aLocale( LanguageTag::convertToLocale( eLastDialogLanguage ) ); if ( xRec->hasPropertyPage( nSmartTagIdx, aLocale ) ) xRec->displayPropertyPage( nSmartTagIdx, aLocale ); - - return 0; } /** Handler for the check box diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index e5841f02e6e9..10764588a3c5 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1163,7 +1163,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl) return 0; } -IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SvxBackgroundTabPage, FileClickHdl_Impl, Button*, pBox, void ) { if (m_pBtnLink == pBox) { @@ -1207,10 +1207,9 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox ) else m_pPreviewWin2->NotifyChange( NULL ); } - return 0; } -IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( SvxBackgroundTabPage, RadioClickHdl_Impl, Button*, pBtn, void ) { if (pBtn == m_pBtnPosition) { @@ -1225,16 +1224,15 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn ) m_pWndPosition->Disable(); m_pWndPosition->Invalidate(); } - return 0; } /** Handler, called by pressing the browse button. Create graphic/insert dialog, set path and start. */ -IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) { if ( pPageImpl->pLoadIdle->IsActive() ) - return 0; + return; bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText()); @@ -1261,7 +1259,6 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) } else DELETEZ( pImportDlg ); - return 0; } /** Delayed loading of the graphic. diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index b9cdb4517f5b..bcd3846fd139 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1196,10 +1196,9 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField) return 0; } -IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED( SvxBorderTabPage, SyncHdl_Impl, Button*, pBox, void) { - mbSync = pBox->IsChecked(); - return 0; + mbSync = static_cast<CheckBox*>(pBox)->IsChecked(); } void SvxBorderTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 4d822c0afc3b..c5a74d674dfd 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1496,9 +1496,9 @@ void SvxCharEffectsPage::Initialize() m_pEffectsLB->SelectEntryPos( 0 ); m_pIndividualWordsBtn->SetClickHdl( LINK( this, SvxCharEffectsPage, CbClickHdl_Impl ) ); - aLink = LINK( this, SvxCharEffectsPage, TristClickHdl_Impl ); - m_pOutlineBtn->SetClickHdl( aLink ); - m_pShadowBtn->SetClickHdl( aLink ); + Link<Button*,void> aLink2 = LINK( this, SvxCharEffectsPage, TristClickHdl_Impl ); + m_pOutlineBtn->SetClickHdl( aLink2 ); + m_pShadowBtn->SetClickHdl( aLink2 ); if ( !SvtLanguageOptions().IsAsianTypographyEnabled() ) { @@ -1738,18 +1738,16 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl) -IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, CbClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); - return 0; } -IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharEffectsPage, TristClickHdl_Impl, Button*, void) { UpdatePreview_Impl(); - return 0; } @@ -2693,17 +2691,17 @@ void SvxCharPositionPage::Initialize() m_pKerningLB->SelectEntryPos( 0 ); KerningSelectHdl_Impl( NULL ); - Link<> aLink = LINK( this, SvxCharPositionPage, PositionHdl_Impl ); - m_pHighPosBtn->SetClickHdl( aLink ); - m_pNormalPosBtn->SetClickHdl( aLink ); - m_pLowPosBtn->SetClickHdl( aLink ); + Link<Button*,void> aLink2 = LINK( this, SvxCharPositionPage, PositionHdl_Impl ); + m_pHighPosBtn->SetClickHdl( aLink2 ); + m_pNormalPosBtn->SetClickHdl( aLink2 ); + m_pLowPosBtn->SetClickHdl( aLink2 ); - aLink = LINK( this, SvxCharPositionPage, RotationHdl_Impl ); - m_p0degRB->SetClickHdl( aLink ); - m_p90degRB->SetClickHdl( aLink ); - m_p270degRB->SetClickHdl( aLink ); + aLink2 = LINK( this, SvxCharPositionPage, RotationHdl_Impl ); + m_p0degRB->SetClickHdl( aLink2 ); + m_p90degRB->SetClickHdl( aLink2 ); + m_p270degRB->SetClickHdl( aLink2 ); - aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl ); + Link<> aLink = LINK( this, SvxCharPositionPage, FontModifyHdl_Impl ); m_pHighLowMF->SetModifyHdl( aLink ); m_pFontSizeMF->SetModifyHdl( aLink ); @@ -2773,7 +2771,7 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc ) -IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( SvxCharPositionPage, PositionHdl_Impl, Button*, pBtn, void ) { sal_uInt16 nEsc = SVX_ESCAPEMENT_OFF; // also when pBtn == NULL @@ -2783,12 +2781,11 @@ IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn ) nEsc = SVX_ESCAPEMENT_SUBSCRIPT; SetEscapement_Impl( nEsc ); - return 0; } -IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( SvxCharPositionPage, RotationHdl_Impl, Button*, pBtn, void ) { bool bEnable = false; if (m_p90degRB == pBtn || m_p270degRB == pBtn) @@ -2796,7 +2793,6 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn ) else OSL_ENSURE( m_p0degRB == pBtn, "unexpected button" ); m_pFitToLineCB->Enable( bEnable ); - return 0; } @@ -2812,9 +2808,9 @@ IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl) -IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SvxCharPositionPage, AutoPositionHdl_Impl, Button*, pBox, void ) { - if ( pBox->IsChecked() ) + if ( static_cast<CheckBox*>(pBox)->IsChecked() ) { m_pHighLowFT->Disable(); m_pHighLowMF->Disable(); @@ -2823,12 +2819,11 @@ IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox ) PositionHdl_Impl( m_pHighPosBtn->IsChecked() ? m_pHighPosBtn : m_pLowPosBtn->IsChecked() ? m_pLowPosBtn : m_pNormalPosBtn ); - return 0; } -IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SvxCharPositionPage, FitToLineHdl_Impl, Button*, pBox, void ) { if (m_pFitToLineCB == pBox) { @@ -2839,7 +2834,6 @@ IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox ) m_pPreviewWin->SetFontWidthScale( nVal ); } - return 0; } @@ -3168,8 +3162,8 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet ) m_pScalingAndRotationFT->Show(); m_pScalingFT->Hide(); - Link<> aOldLink( m_pFitToLineCB->GetClickHdl() ); - m_pFitToLineCB->SetClickHdl( Link<>() ); + Link<Button*,void> aOldLink( m_pFitToLineCB->GetClickHdl() ); + m_pFitToLineCB->SetClickHdl( Link<Button*,void>() ); if( eState >= SfxItemState::DEFAULT ) { const SvxCharRotateItem& rItem = @@ -3489,13 +3483,12 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) -IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) { bool bChecked = m_pTwoLinesBtn->IsChecked(); m_pEnclosingFrame->Enable( bChecked ); UpdatePreview_Impl(); - return 0; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 538fa48836ac..22521fd51fb7 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -118,8 +118,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) m_pTopMF->SetLoseFocusHdl( aLk ); m_pBottomMF->SetLoseFocusHdl( aLk ); - aLk = LINK(this, SvxGrfCropPage, OrigSizeHdl); - m_pOrigSizePB->SetClickHdl( aLk ); + m_pOrigSizePB->SetClickHdl( LINK(this, SvxGrfCropPage, OrigSizeHdl) ); aTimer.SetTimeoutHdl(LINK(this, SvxGrfCropPage, Timeout)); aTimer.SetTimeout( 1500 ); @@ -571,7 +570,7 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) description: set original size --------------------------------------------------------------------*/ -IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl) +IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, OrigSizeHdl, Button*, void) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -589,7 +588,6 @@ IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl) m_pWidthZoomMF->SetValue(100); m_pHeightZoomMF->SetValue(100); bSetOrigSize = true; - return 0; } /*-------------------------------------------------------------------- description: compute scale diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 3e0ae6245af1..f26fe3c287c3 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -440,7 +440,7 @@ IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox ) return 0; } -IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) +IMPL_LINK_TYPED( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void ) { if (pButton == m_pCB_LAENGE) { @@ -455,7 +455,6 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton ) m_pMF_LAENGE->Enable(); } } - return 0; } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 0f6c8b566d7f..cfa8eecc4e55 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -297,6 +297,11 @@ IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, ) return 0; } +IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) +{ + AssignDeleteHdl_Impl(static_cast<PushButton*>(pBtn)); +} + IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); @@ -367,8 +372,8 @@ void _SfxMacroTabPage::InitAndSetHandler() HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); Link<> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); mpImpl->pMacroLB->SetDoubleClickHdl( aLnk ); - mpImpl->pDeletePB->SetClickHdl( aLnk ); - mpImpl->pAssignPB->SetClickHdl( aLnk ); + mpImpl->pDeletePB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) ); + mpImpl->pAssignPB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) ); rListBox.SetDoubleClickHdl( aLnk ); rListBox.SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectEvent_Impl )); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 0e83582080fe..2d76be168a90 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -142,9 +142,9 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs m_pMtrFldHelpline1Len->SetModifyHdl( aLink ); m_pMtrFldHelpline2Len->SetModifyHdl( aLink ); m_pMtrFldDecimalPlaces->SetModifyHdl( aLink ); - m_pTsbBelowRefEdge->SetClickHdl( aLink ); - m_pTsbParallel->SetClickHdl( aLink ); - m_pTsbShowUnit->SetClickHdl( aLink ); + m_pTsbBelowRefEdge->SetClickHdl( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl ) ); + m_pTsbParallel->SetClickHdl( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl ) ); + m_pTsbShowUnit->SetClickHdl( LINK( this, SvxMeasurePage, ChangeAttrClickHdl_Impl ) ); m_pLbUnit->SetSelectHdl( aLink ); } @@ -613,7 +613,7 @@ void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) ChangeAttrHdl_Impl( pWindow ); } -IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxMeasurePage, ClickAutoPosHdl_Impl, Button*, p, void ) { if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE ) { @@ -658,10 +658,12 @@ IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, void *, p ) } } ChangeAttrHdl_Impl( p ); - - return 0L; } +IMPL_LINK_TYPED( SvxMeasurePage, ChangeAttrClickHdl_Impl, Button*, p, void ) +{ + ChangeAttrHdl_Impl(p); +} IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) { diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index de90abbc676e..173ca19d0e7e 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -341,14 +341,14 @@ void SvxNumberFormatTabPage::Init_Impl() m_pLbFormat->SetSelectHdl( aLink ); m_pLbLanguage->SetSelectHdl( aLink ); m_pLbCurrency->SetSelectHdl( aLink ); - m_pCbSourceFormat->SetClickHdl( aLink ); + m_pCbSourceFormat->SetClickHdl( LINK( this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl ) ); aLink = LINK( this, SvxNumberFormatTabPage, OptHdl_Impl ); m_pEdDecimals->SetModifyHdl( aLink ); m_pEdLeadZeroes->SetModifyHdl( aLink ); - m_pBtnNegRed->SetClickHdl( aLink ); - m_pBtnThousand->SetClickHdl( aLink ); + m_pBtnNegRed->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) ); + m_pBtnThousand->SetClickHdl( LINK( this, SvxNumberFormatTabPage, OptClickHdl_Impl ) ); m_pLbFormat->SetDoubleClickHdl( HDL( DoubleClickHdl_Impl ) ); m_pEdFormat->SetModifyHdl( HDL( EditHdl_Impl ) ); m_pIbAdd->SetClickHdl( HDL( ClickHdl_Impl ) ); @@ -732,7 +732,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) // delete it in case of bOneAreaFlag and resulting category change). // Upon switching tab pages we need all settings to be consistent // in case this page will be redisplayed later. - bDataChanged = (ClickHdl_Impl(m_pIbAdd) != 0); + bDataChanged = Click_Impl(m_pIbAdd); nCurKey = pNumFmtShell->GetCurNumFmtKey(); } else if(nCurKey == NUMKEY_UNDEFINED) @@ -1190,6 +1190,10 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) #* #************************************************************************/ +IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, void ) +{ + SelFormatHdl_Impl(pLb); +} IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) { if (pLb == m_pCbSourceFormat) @@ -1311,9 +1315,13 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) #* #************************************************************************/ -IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, PushButton*, pIB) +IMPL_LINK_TYPED( SvxNumberFormatTabPage, ClickHdl_Impl, Button*, pIB, void) +{ + Click_Impl(static_cast<PushButton*>(pIB)); +} +bool SvxNumberFormatTabPage::Click_Impl(PushButton* pIB) { - bool bDeleted = false; + bool bDeleted = false; sal_uLong nReturn = 0; const sal_uLong nReturnChanged = 0x1; // THE boolean return value const sal_uLong nReturnAdded = 0x2; // temp: format added @@ -1554,6 +1562,10 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat ) #* #************************************************************************/ +IMPL_LINK_TYPED( SvxNumberFormatTabPage, OptClickHdl_Impl, Button*, pOptCtrl, void ) +{ + OptHdl_Impl(pOptCtrl); +} IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) { if ( (pOptCtrl == m_pEdLeadZeroes) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 4b6e643a932d..ad06c745e3c4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1012,13 +1012,13 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl) return 0; } -IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0, 0); aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE)); if ( aFileDialog.Execute() != ERRCODE_NONE ) - return 0; + return; OUString aPath = SvtPathOptions().GetGalleryPath(); OUString aPathToken = aPath.getToken( 1 , SEARCHPATH_DELIMITER ); @@ -1103,7 +1103,6 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl) } } - return 0; } // static @@ -2008,9 +2007,9 @@ IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox ) } -IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxNumOptionsTabPage, SameLevelHdl_Impl, Button*, pBox, void ) { - bool bSet = pBox->IsChecked(); + bool bSet = static_cast<CheckBox*>(pBox)->IsChecked(); pActNum->SetContinuousNumbering(bSet); bool bRepaint = false; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -2024,7 +2023,6 @@ IMPL_LINK( SvxNumOptionsTabPage, SameLevelHdl_Impl, CheckBox *, pBox ) } SetModified(bRepaint); InitControls(); - return 0; } IMPL_LINK( SvxNumOptionsTabPage, BulColorHdl_Impl, ColorListBox*, pBox ) @@ -2198,7 +2196,7 @@ IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, bool) return false; } -IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, BulletHdl_Impl, Button*, void) { VclPtrInstance< SvxCharacterMap > pMap( this, true ); @@ -2255,7 +2253,6 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl) SetModified(); } - return 0; } IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) @@ -2326,16 +2323,15 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, MetricField *, pField) return 0; } -IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) { - if (pBox->IsChecked()) + if (static_cast<CheckBox*>(pBox)->IsChecked()) { if (bLastWidthModified) SizeHdl_Impl(m_pWidthMF); else SizeHdl_Impl(m_pHeightMF); } - return 0; } IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl) @@ -3472,9 +3468,9 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) return 0; } -IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxNumPositionTabPage, RelativeHdl_Impl, Button*, pBox, void ) { - bool bOn = pBox->IsChecked(); + bool bOn = static_cast<CheckBox*>(pBox)->IsChecked(); bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && SAL_MAX_UINT16 != nActNumLvl; bool bSetValue = false; long nValue = 0; @@ -3512,7 +3508,6 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox ) m_pDistBorderMF->Enable(bOn || bSingleSelection); m_pDistBorderFT->Enable(bOn || bSingleSelection); bLastRelative = bOn; - return 0; } IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl) @@ -3648,7 +3643,7 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld ) return 0; } -IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, StandardHdl_Impl, Button*, void) { sal_uInt16 nMask = 1; SvxNumRule aTmpNumRule( pActNum->GetFeatureFlags(), @@ -3685,7 +3680,6 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, StandardHdl_Impl) InitControls(); SetModified(); - return 0; } void SvxNumPositionTabPage::SetModified(bool bRepaint) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 7a60414d310f..d1f1e4a95476 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1087,7 +1087,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl) -IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) +IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) { if ( (!bLandscape && pBtn == m_pLandscapeBtn) || @@ -1111,7 +1111,6 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn ) SwapFirstValues_Impl( bBorderModified ); UpdateExample_Impl( true ); } - return 0; } @@ -1649,12 +1648,11 @@ void SvxPageDescPage::CalcMargin_Impl() -IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPageDescPage, CenterHdl_Impl, Button*, void) { m_pBspWin->SetHorz( m_pHorzBox->IsChecked() ); m_pBspWin->SetVert( m_pVertBox->IsChecked() ); UpdateExample_Impl(); - return 0; } void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) @@ -1673,10 +1671,10 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) -IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox ) +IMPL_LINK_TYPED( SvxPageDescPage, RegisterModify, Button*, pBox, void ) { bool bEnable = false; - if(pBox->IsChecked()) + if(static_cast<CheckBox*>(pBox)->IsChecked()) { bEnable = true; if(USHRT_MAX == m_pRegisterLB->GetSelectEntryPos()) @@ -1684,7 +1682,6 @@ IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox ) } m_pRegisterFT->Enable( bEnable ); m_pRegisterLB->Enable( bEnable ); - return 0; } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 1b13d74fbd30..1544e8d3482d 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -900,12 +900,11 @@ void SvxStdParagraphTabPage::EnableContextualMode() m_pContextualCB->Show(); } -IMPL_LINK( SvxStdParagraphTabPage, AutoHdl_Impl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SvxStdParagraphTabPage, AutoHdl_Impl, Button*, pBox, void ) { - bool bEnable = !pBox->IsChecked(); + bool bEnable = !static_cast<CheckBox*>(pBox)->IsChecked(); m_pFLineLabel->Enable(bEnable); m_pFLineIndent->Enable(bEnable); - return 0; } void SvxStdParagraphTabPage::SetPageWidth( sal_uInt16 nPageWidth ) @@ -1018,7 +1017,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet if ( m_pLastLineLB->GetEntryCount() == LASTLINECOUNT_NEW ) m_pLastLineLB->RemoveEntry( nLastLinePos ); - Link<> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl ); + Link<Button*,void> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl ); m_pLeft->SetClickHdl( aLink ); m_pRight->SetClickHdl( aLink ); m_pCenter->SetClickHdl( aLink ); @@ -1263,7 +1262,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) UpdateExample_Impl(); } -IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) { bool bJustify = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bJustify); @@ -1271,7 +1270,6 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; m_pExpandCB->Enable(bJustify && bLastLineIsBlock); UpdateExample_Impl(); - return 0; } IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl) @@ -1976,7 +1974,7 @@ void SvxExtParagraphTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) { switch ( m_pPageBreakBox->GetState() ) { @@ -2015,19 +2013,16 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl) m_pBreakPositionLB->Enable(false); break; } - return 0; } -IMPL_LINK_NOARG(SvxExtParagraphTabPage, KeepTogetherHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, Button*, void) { bool bEnable = m_pKeepTogetherBox->GetState() == TRISTATE_FALSE; m_pWidowBox->Enable(bEnable); m_pOrphanBox->Enable(bEnable); - - return 0; } -IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, WidowHdl_Impl, Button*, void) { switch ( m_pWidowBox->GetState() ) { @@ -2047,10 +2042,9 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl) m_pWidowRowLabel->Enable(false); break; } - return 0; } -IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, OrphanHdl_Impl, Button*, void) { switch( m_pOrphanBox->GetState() ) { @@ -2070,10 +2064,9 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl) m_pOrphanRowLabel->Enable(false); break; } - return 0; } -IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, HyphenClickHdl_Impl, Button*, void) { bool bEnable = m_pHyphenBox->GetState() == TRISTATE_TRUE; @@ -2084,11 +2077,9 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, HyphenClickHdl_Impl) m_pMaxHyphenLabel->Enable(bEnable); m_pMaxHyphenEdit->Enable(bEnable); m_pHyphenBox->SetState( bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); - - return 0; } -IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void) { bool bEnable = false; if ( m_pApplyCollBtn->GetState() == TRISTATE_TRUE && @@ -2107,7 +2098,6 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl) m_pPagenumText->Enable(bEnable); m_pPagenumEdit->Enable(bEnable); } - return 0; } IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox *, pListBox ) @@ -2171,7 +2161,7 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) get(m_pHangingPunctCB,"checkHangPunct"); get(m_pScriptSpaceCB,"checkApplySpacing"); - Link<> aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl ); + Link<Button*,void> aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl ); m_pHangingPunctCB->SetClickHdl( aLink ); m_pScriptSpaceCB->SetClickHdl( aLink ); m_pForbiddenRulesCB->SetClickHdl( aLink ); @@ -2262,10 +2252,9 @@ void SvxAsianTabPage::Reset( const SfxItemSet* rSet ) lcl_SetBox(*rSet, SID_ATTR_PARA_SCRIPTSPACE, *m_pScriptSpaceCB ); } -IMPL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox*, pBox ) +IMPL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, pBox, void ) { - pBox->EnableTriState( false ); - return 0; + static_cast<CheckBox*>(pBox)->EnableTriState( false ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 2b5652759297..7b45ae17f6aa 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -563,7 +563,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& m_pHeightMF->SetLoseFocusHdl( aLk ); m_pHoriByMF->SetLoseFocusHdl( aLk ); m_pVertByMF->SetLoseFocusHdl( aLk ); - m_pFollowCB->SetClickHdl( aLk ); + m_pFollowCB->SetClickHdl( LINK(this, SvxSwPosSizeTabPage, RangeModifyClickHdl) ); aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl); m_pWidthMF->SetModifyHdl( aLk ); @@ -571,12 +571,12 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& m_pHoriByMF->SetModifyHdl( aLk ); m_pVertByMF->SetModifyHdl( aLk ); - aLk = LINK(this, SvxSwPosSizeTabPage, AnchorTypeHdl); - m_pToPageRB->SetClickHdl( aLk ); - m_pToParaRB->SetClickHdl( aLk ); - m_pToCharRB->SetClickHdl( aLk ); - m_pAsCharRB->SetClickHdl( aLk ); - m_pToFrameRB->SetClickHdl( aLk ); + Link<Button*,void> aLk2 = LINK(this, SvxSwPosSizeTabPage, AnchorTypeHdl); + m_pToPageRB->SetClickHdl( aLk2 ); + m_pToParaRB->SetClickHdl( aLk2 ); + m_pToCharRB->SetClickHdl( aLk2 ); + m_pAsCharRB->SetClickHdl( aLk2 ); + m_pToFrameRB->SetClickHdl( aLk2 ); m_pHoriLB->SetSelectHdl(LINK(this, SvxSwPosSizeTabPage, PosHdl)); m_pVertLB->SetSelectHdl(LINK(this, SvxSwPosSizeTabPage, PosHdl)); @@ -1137,6 +1137,10 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) return nRet; } +IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void) +{ + RangeModifyHdl(NULL); +} IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl) { if(m_bPositioningDisabled) @@ -1221,7 +1225,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl) return 0; } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl) +IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) { m_pHoriMirrorCB->Enable(!m_pAsCharRB->IsChecked() && !m_bIsMultiSelection); @@ -1239,15 +1243,12 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl) PosHdl(m_pHoriLB); PosHdl(m_pVertLB); } - return 0; } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl) +IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, MirrorHdl, Button*, void) { short nId = GetAnchorType(); InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); - - return 0; } IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) @@ -1408,10 +1409,9 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, Edit *, pEdit ) return 0; } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl) +IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) { m_pSizeCB->Enable(m_pPositionCB->IsEnabled() && !m_pPositionCB->IsChecked()); - return 0; } short SvxSwPosSizeTabPage::GetRelation(FrmMap *, ListBox &rRelationLB) diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 13f031668f36..62169efe59ff 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -223,12 +223,11 @@ short SvxAreaTabDialog::Ok() -IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl) +IMPL_LINK_NOARG_TYPED(SvxAreaTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); EndDialog(); - return 0; } void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 2e96f608f10e..56245180390f 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -183,12 +183,11 @@ short SvxLineTabDialog::Ok() -IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl) +IMPL_LINK_NOARG_TYPED(SvxLineTabDialog, CancelHdlImpl, Button*, void) { SavePalettes(); EndDialog(); - return 0; } void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 73f8ae4d64c9..7f3fbb8fa097 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -148,7 +148,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(vcl::Window* pParent, const SfxItemSet& m_pDelBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelHdl_Impl ) ); m_pDelAllBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelAllHdl_Impl ) ); - Link<> aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl ); + Link<Button*,void> aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl ); m_pLeftTab->SetClickHdl( aLink ); m_pRightTab->SetClickHdl( aLink ); m_pDezTab->SetClickHdl( aLink ); @@ -461,7 +461,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pFillBtn->Check(); } -IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) +IMPL_LINK_TYPED( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn, void ) { // Add a new one and select it // Get the value from the display @@ -469,7 +469,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) // If the pBtn == 0 && the value == 0 then do not create a tab, because we create via OK if ( nVal == 0 && pBtn == 0 ) - return 0; + return; long nOffset = 0; const SfxPoolItem* pItem = 0; @@ -514,20 +514,19 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn ) bCheck = true; // Set the selection into the position Edit m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength())); - return 0; } -IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelHdl_Impl, Button*, void) { sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() ); if ( nPos == COMBOBOX_ENTRY_NOTFOUND ) - return 0; + return; if ( m_pTabBox->GetEntryCount() == 1 ) { DelAllHdl_Impl( 0 ); - return 0; + return; } // Delete Tab @@ -555,10 +554,9 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl) // If no RadioButton was clicked, we need to put anyway bCheck = true; - return 0; } -IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, DelAllHdl_Impl, Button*, void) { if ( aNewTabs.Count() ) { @@ -568,10 +566,9 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl) // So that we put in FillItemSet() bCheck = true; } - return 0; } -IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) +IMPL_LINK_TYPED( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, Button *, pBox, void ) { bCheck = true; SvxTabAdjust eAdj; @@ -601,10 +598,9 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) aNewTabs.Remove( nPos ); aNewTabs.Insert( aAktTab ); } - return 0; } -IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox ) +IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, void ) { bCheck = true; sal_uInt8 cFill = ' '; @@ -630,7 +626,6 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox ) aNewTabs.Remove( nPos ); aNewTabs.Insert( aAktTab ); } - return 0; } IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit ) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index eb58430b65b1..0a5e83e47460 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -115,7 +115,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS m_pTsbAuto->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickAutoHdl_Impl ) ); m_pTsbPixel->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickPixelHdl_Impl ) ); - Link<> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) ); + Link<Button*,void> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) ); m_pBtnUp->SetClickHdl( aLink ); m_pBtnLeft->SetClickHdl( aLink ); m_pBtnRight->SetClickHdl( aLink ); @@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) return 0L; } -IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickEndlessHdl_Impl, Button*, void) { if( eAniKind != SDRTEXTANI_SLIDE ) @@ -542,10 +542,9 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl) m_pNumFldCount->SetValue( m_pNumFldCount->GetValue() ); } } - return 0L; } -IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickAutoHdl_Impl, Button*, void) { TriState eState = m_pTsbAuto->GetState(); if( eState != TRISTATE_FALSE ) @@ -558,11 +557,9 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl) m_pMtrFldDelay->Enable(); m_pMtrFldDelay->SetValue( m_pMtrFldDelay->GetValue() ); } - - return 0L; } -IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTextAnimationPage, ClickPixelHdl_Impl, Button*, void) { TriState eState = m_pTsbPixel->GetState(); if( eState == TRISTATE_TRUE ) @@ -597,18 +594,14 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl) m_pMtrFldAmount->SetValue( nValue ); } - - return 0L; } -IMPL_LINK( SvxTextAnimationPage, ClickDirectionHdl_Impl, ImageButton *, pBtn ) +IMPL_LINK_TYPED( SvxTextAnimationPage, ClickDirectionHdl_Impl, Button *, pBtn, void ) { m_pBtnUp->Check( pBtn == m_pBtnUp ); m_pBtnLeft->Check( pBtn == m_pBtnLeft ); m_pBtnRight->Check( pBtn == m_pBtnRight ); m_pBtnDown->Check( pBtn == m_pBtnDown ); - - return 0L; } void SvxTextAnimationPage::SelectDirection( SdrTextAniDirection nValue ) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index af1ac29d54b8..1fc0b48f3f73 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -87,7 +87,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr SetFieldUnit( *m_pMtrFldTop, eFUnit ); SetFieldUnit( *m_pMtrFldBottom, eFUnit ); - Link<> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) ); + Link<Button*,void> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) ); m_pTsbAutoGrowWidth->SetClickHdl( aLink ); m_pTsbAutoGrowHeight->SetClickHdl( aLink ); m_pTsbFitToSize->SetClickHdl( aLink ); @@ -582,7 +582,7 @@ void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP ) to be moved to a valid and adjacent position. This position depends on the current anchor position and the text writing direction. */ -IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickFullWidthHdl_Impl, Button*, void) { if( m_pTsbFullWidth->GetState() == TRISTATE_TRUE ) { @@ -631,7 +631,6 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) } } } - return 0L; } /************************************************************************* @@ -640,7 +639,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl) |* \************************************************************************/ -IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTextAttrPage, ClickHdl_Impl, Button*, void) { bool bAutoGrowWidth = m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE; bool bAutoGrowHeight = m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE; @@ -681,8 +680,6 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickHdl_Impl) // #83698# enable/disable text anchoring dependent of contour m_pFlPosition->Enable(!bContour && !bHorAndVer); - - return 0L; } diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index f2958cadf35d..96b8fa4d4b61 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -75,7 +75,7 @@ const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] = |* \************************************************************************/ -IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransOffHdl_Impl, Button*, void) { // disable all other controls ActivateLinear(false); @@ -88,11 +88,9 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl) m_pCtlBitmapPreview->SetAttributes( aXFillAttr.GetItemSet() ); InvalidatePreview( false ); - - return 0L; } -IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, Button*, void) { // enable linear, disable other ActivateLinear(true); @@ -101,11 +99,9 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl) // preview rXFSet.ClearItem (XATTR_FILLFLOATTRANSPARENCE); ModifyTransparentHdl_Impl (NULL); - - return 0L; } -IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, Button*, void) { // enable gradient, disable other ActivateLinear(false); @@ -114,8 +110,6 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl) // preview rXFSet.ClearItem (XATTR_FILLTRANSPARENCE); ModifiedTrgrHdl_Impl (NULL); - - return 0L; } SvxTransparenceTabPage::~SvxTransparenceTabPage() @@ -744,17 +738,18 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs m_pLbHatching->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyHatchingHdl_Impl ) ); m_pLbBitmap->SetSelectHdl( LINK( this, SvxAreaTabPage, ModifyBitmapHdl_Impl ) ); - m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) ); + m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountClickHdl_Impl ) ); m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) ); Link<> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) ); - m_pTsbTile->SetClickHdl( aLink ); - m_pTsbStretch->SetClickHdl( aLink ); - m_pTsbOriginal->SetClickHdl( aLink ); + Link<Button*,void> aClickLink( LINK( this, SvxAreaTabPage, ModifyTileClickHdl_Impl ) ); + m_pTsbTile->SetClickHdl( aClickLink ); + m_pTsbStretch->SetClickHdl( aClickLink ); + m_pTsbOriginal->SetClickHdl( aClickLink ); m_pMtrFldXSize->SetModifyHdl( aLink ); m_pMtrFldYSize->SetModifyHdl( aLink ); - m_pRbtRow->SetClickHdl( aLink ); - m_pRbtColumn->SetClickHdl( aLink ); + m_pRbtRow->SetClickHdl( aClickLink ); + m_pRbtColumn->SetClickHdl( aClickLink ); m_pMtrFldOffset->SetModifyHdl( aLink ); m_pMtrFldXOffset->SetModifyHdl( aLink ); m_pMtrFldYOffset->SetModifyHdl( aLink ); @@ -2163,6 +2158,10 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl) +IMPL_LINK_TYPED( SvxAreaTabPage, ModifyStepCountClickHdl_Impl, Button*, p, void ) +{ + ModifyStepCountHdl_Impl(p); +} IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) { if( p == m_pTsbStepCount ) @@ -2192,7 +2191,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) return 0L; } -IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl ) +IMPL_LINK_NOARG_TYPED( SvxAreaTabPage, ClickImportHdl_Impl, Button*, void ) { ResMgr& rMgr = CUI_MGR(); SvxOpenGraphicDialog aDlg("Import"); @@ -2228,12 +2227,14 @@ IMPL_LINK_NOARG( SvxAreaTabPage, ClickImportHdl_Impl ) ScopedVclPtrInstance<MessageDialog>::Create (this, OUString(ResId(RID_SVXSTR_READ_DATA_ERROR, rMgr)))->Execute(); } } - - return 0L; } //------------------------------------------------------------------------ +IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ModifyTileClickHdl_Impl, Button*, void) +{ + ModifyTileHdl_Impl(NULL); +} IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) { TriState eState = m_pTsbTile->GetState(); @@ -2387,7 +2388,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl) -IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxAreaTabPage, ClickScaleHdl_Impl, Button*, void) { if( m_pTsbScale->GetState() == TRISTATE_TRUE ) { @@ -2419,8 +2420,6 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) } ModifyTileHdl_Impl( NULL ); - - return 0L; } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 21afbd10b46e..b70fdd8ab171 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -459,13 +459,13 @@ long SvxBitmapTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( this ); + ClickModifyHdl_Impl( NULL ); } break; case RET_BTN_2: { - ClickAddHdl_Impl( this ); + ClickAddHdl_Impl( NULL ); } break; @@ -482,7 +482,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() -IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_BITMAP ) ); @@ -582,7 +582,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return 0L; } @@ -592,7 +591,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) -IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickImportHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); SvxOpenGraphicDialog aDlg( OUString("Import") ); @@ -670,13 +669,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) ,"NoLoadedFileDialog" ,"cui/ui/querynoloadedfiledialog.ui")->Execute(); } - - return 0L; } -IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -735,12 +732,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) } } } - return 0L; } -IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); @@ -769,12 +765,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; ResMgr& rMgr = CUI_MGR(); @@ -872,12 +867,11 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.sob" ); @@ -940,8 +934,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui")->Execute(); } } - - return 0L; } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 224c1af8f0bd..3d1391afa996 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -121,7 +121,7 @@ void SvxColorTabPage::UpdateTableName() -IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; bool bLoaded = false; @@ -189,8 +189,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl) } } Update( bLoaded ); - - return 0; } void SvxColorTabPage::EnableSave( bool bCanSave ) @@ -203,7 +201,7 @@ void SvxColorTabPage::EnableSave( bool bCanSave ) -IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -258,7 +256,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui")->Execute(); } } - return 0; } void SvxColorTabPage::Update(bool bLoaded) @@ -561,14 +558,14 @@ long SvxColorTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( this ); + ClickModifyHdl_Impl( NULL ); aColor = pColorList->GetColor( nPos )->GetColor(); } break; case RET_BTN_2: { - ClickAddHdl_Impl( this ); + ClickAddHdl_Impl( NULL ); nPos = m_pLbColor->GetSelectEntryPos(); aColor = pColorList->GetColor( nPos )->GetColor(); } @@ -690,7 +687,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) -IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_COLOR ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_COLOR ) ); @@ -771,13 +768,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) } UpdateModified(); - - return 0; } -IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -841,12 +836,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl) *pnColorListState |= ChangeType::MODIFIED; } } - return 0; } -IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void) { boost::scoped_ptr<SvColorDialog> pColorDlg(new SvColorDialog( GetParentDialog() )); @@ -881,13 +875,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl) m_pCtlPreviewNew->Invalidate(); } - - return 0; } -IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbColor->GetSelectEntryPos(); @@ -918,8 +910,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl) } } UpdateModified(); - - return 0; } diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index c84dc61042c4..0c4a25c39bc7 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -306,14 +306,14 @@ long SvxGradientTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( this ); + ClickModifyHdl_Impl( NULL ); aGradient = m_pGradientList->GetGradient( nPos )->GetGradient(); } break; case RET_BTN_2: { - ClickAddHdl_Impl( this ); + ClickAddHdl_Impl( NULL ); nPos = m_pLbGradients->GetSelectEntryPos(); aGradient = m_pGradientList->GetGradient( nPos )->GetGradient(); } @@ -430,7 +430,7 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl ) -IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_GRADIENT ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_GRADIENT ) ); @@ -528,12 +528,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return 0L; } -IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); @@ -596,12 +595,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl) } } - return 0L; } -IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbGradients->GetSelectEntryPos(); @@ -629,12 +627,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -735,12 +732,11 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -804,8 +800,6 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui")->Execute(); } } - - return 0L; } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index cc1934a84bf5..9a4b525fbaf1 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -276,13 +276,13 @@ long SvxHatchTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( this ); + ClickModifyHdl_Impl( NULL ); } break; case RET_BTN_2: { - ClickAddHdl_Impl( this ); + ClickAddHdl_Impl( NULL ); } break; @@ -473,7 +473,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl) -IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) { OUString aNewName( SVX_RES( RID_SVXSTR_HATCH ) ); OUString aDesc( CUI_RES( RID_SVXSTR_DESC_HATCH ) ); @@ -565,12 +565,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return 0L; } -IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); @@ -633,12 +632,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl) } } } - return 0L; } -IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbHatchings->GetSelectEntryPos(); @@ -666,12 +664,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); sal_uInt16 nReturn = RET_YES; @@ -762,12 +759,11 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.soh" ); @@ -830,8 +826,6 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui")->Execute(); } } - - return 0L; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 1c3266c32e0f..ce672bf4f25a 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -194,8 +194,8 @@ SvxLineTabPage::SvxLineTabPage m_pLbEndStyle->SetSelectHdl( aEnd ); m_pMtrStartWidth->SetModifyHdl( aStart ); m_pMtrEndWidth->SetModifyHdl( aEnd ); - m_pTsbCenterStart->SetClickHdl( aStart ); - m_pTsbCenterEnd->SetClickHdl( aEnd ); + m_pTsbCenterStart->SetClickHdl( LINK( this, SvxLineTabPage, ChangeStartClickHdl_Impl ) ); + m_pTsbCenterEnd->SetClickHdl( LINK( this, SvxLineTabPage, ChangeEndClickHdl_Impl ) ); // #116827# Link<> aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl ); @@ -1598,6 +1598,10 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl ) +IMPL_LINK_TYPED( SvxLineTabPage, ChangeStartClickHdl_Impl, Button*, p, void ) +{ + ChangeStartHdl_Impl(p); +} IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p ) { if( m_pCbxSynchronize->IsChecked() ) @@ -1674,6 +1678,10 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl) +IMPL_LINK_TYPED( SvxLineTabPage, ChangeEndClickHdl_Impl, Button*, p, void ) +{ + ChangeEndHdl_Impl(p); +} IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p ) { if( m_pCbxSynchronize->IsChecked() ) @@ -1789,16 +1797,15 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField) aSymbolLastSize=aSymbolSize; return 0; } -IMPL_LINK( SvxLineTabPage, RatioHdl_Impl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxLineTabPage, RatioHdl_Impl, Button*, pBox, void ) { - if (pBox->IsChecked()) + if (static_cast<CheckBox*>(pBox)->IsChecked()) { if (bLastWidthModified) SizeHdl_Impl(m_pSymbolWidthMF); else SizeHdl_Impl(m_pSymbolHeightMF); } - return 0; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 5e6c13124534..d6a48aa54112 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -259,13 +259,13 @@ void SvxLineDefTabPage::CheckChanges_Impl() { case RET_BTN_1: { - ClickModifyHdl_Impl( this ); + ClickModifyHdl_Impl( NULL ); } break; case RET_BTN_2: { - ClickAddHdl_Impl( this ); + ClickAddHdl_Impl( NULL ); } break; @@ -439,7 +439,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl) -IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) +IMPL_LINK_TYPED( SvxLineDefTabPage, ChangeMetricHdl_Impl, Button*, p, void ) { if( !m_pCbxSynchronize->IsChecked() && m_pMtrLength1->GetUnit() != eFUnit ) { @@ -503,8 +503,6 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p ) } SelectTypeHdl_Impl( NULL ); - - return 0L; } @@ -544,7 +542,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p ) -IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) { ResMgr& rMgr = CUI_MGR(); OUString aNewName( SVX_RES( RID_SVXSTR_LINESTYLE ) ); @@ -629,12 +627,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return 0L; } -IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -699,12 +696,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl) } } } - return 0L; } -IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); @@ -736,12 +732,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -818,12 +813,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.sod" ); @@ -873,8 +867,6 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui")->Execute(); } } - - return 0L; } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 30eeeaeb148c..22d88d359ecb 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -209,7 +209,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() ,"AskChangeLineEndDialog" ,"cui/ui/querychangelineenddialog.ui" ); if ( aQueryBox->Execute() == RET_YES ) - ClickModifyHdl_Impl( this ); + ClickModifyHdl_Impl( NULL ); } } nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -321,7 +321,7 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* ) -IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -397,12 +397,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl) } } } - return 0L; } -IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) { if( pPolyObj ) { @@ -423,10 +422,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( true, false ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) - return 0L; // cancel, additional safety, which + return; // cancel, additional safety, which // has no use for group objects though. } - else return 0L; // cancel + else return; // cancel } basegfx::B2DPolyPolygon aNewPolyPolygon(static_cast<const SdrPathObj*>(pNewObj)->GetPathPoly()); @@ -512,12 +511,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl) m_pBtnDelete->Enable(); m_pBtnSave->Enable(); } - return 0L; } -IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); @@ -548,12 +546,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -631,12 +628,11 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) m_pBtnDelete->Disable(); m_pBtnSave->Disable(); } - return 0L; } -IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.soe" ); @@ -686,7 +682,6 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) ,"cui/ui/querynosavefiledialog.ui")->Execute(); } } - return 0L; } void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 327f33c2211a..13f119f5eafa 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -492,7 +492,7 @@ VclPtr<SfxTabPage> SvxShadowTabPage::Create( vcl::Window* pWindow, -IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxShadowTabPage, ClickShadowHdl_Impl, Button*, void) { if( m_pTsbShowShadow->GetState() == TRISTATE_FALSE ) { @@ -505,8 +505,6 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl) m_pCtlPosition->Invalidate(); ModifyShadowHdl_Impl( NULL ); - - return 0L; } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 62199fd27bb8..aa75a5d56c51 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -953,7 +953,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) m_pCtlPos->Reset(); // #i2379# Disable controls for protected objects - ChangePosProtectHdl( this ); + ChangePosProtectHdl( NULL ); } { // #i75273# set width @@ -1018,7 +1018,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) ClickSizeProtectHdl( NULL ); // #i2379# Disable controls for protected objects - ChangeSizeProtectHdl( this ); + ChangeSizeProtectHdl( NULL ); } @@ -1068,12 +1068,11 @@ SfxTabPage::sfxpg SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl) +IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangePosProtectHdl, Button*, void) { // #106572# Remember user's last choice m_pTsbSizeProtect->SetState( m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState ); UpdateControlStates(); - return 0L; } @@ -1112,7 +1111,7 @@ void SvxPositionSizeTabPage::UpdateControlStates() -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) +IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ChangeSizeProtectHdl, Button*, void) { if( m_pTsbSizeProtect->IsEnabled() ) { @@ -1128,8 +1127,6 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl) } UpdateControlStates(); - - return 0L; } @@ -1498,23 +1495,20 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl) -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl) +IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickSizeProtectHdl, Button*, void) { UpdateControlStates(); - return 0L; } -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl) +IMPL_LINK_NOARG_TYPED(SvxPositionSizeTabPage, ClickAutoHdl, Button*, void) { if( m_pCbxScale->IsChecked() ) { mfOldWidth = std::max( (double)GetCoreValue( *m_pMtrWidth, mePoolUnit ), 1.0 ); mfOldHeight = std::max( (double)GetCoreValue( *m_pMtrHeight, mePoolUnit ), 1.0 ); } - - return 0L; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 6440a2c3b2bf..d2a95d8d6fb3 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -584,18 +584,18 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r } } -IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OFieldDescControl, FormatClickHdl, Button *, void ) { // Create temporary Column, which is used for data exchange with Dialog if( !pActFieldDescr ) - return 0; + return; sal_Int32 nOldFormatKey(pActFieldDescr->GetFormatKey()); SvxCellHorJustify rOldJustify = pActFieldDescr->GetHorJustify(); Reference< XNumberFormatsSupplier > xSupplier = GetFormatter()->getNumberFormatsSupplier(); SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); if (!pSupplierImpl) - return 0; + return; SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter(); if(::dbaui::callColumnFormatDialog(this,pFormatter,pActFieldDescr->GetType(),nOldFormatKey,rOldJustify,true)) @@ -618,7 +618,6 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ ) UpdateFormatSample(pActFieldDescr); } } - return 0; } void OFieldDescControl::SetModified(bool /*bModified*/) diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index e90f0fd153e9..57d42019cd78 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -107,11 +107,11 @@ void OCollectionView::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(OCollectionView, Save_Click) +IMPL_LINK_NOARG_TYPED(OCollectionView, Save_Click, Button*, void) { OUString sName = m_pName->GetText(); if ( sName.isEmpty() ) - return 0; + return; try { OUString sSubFolder = m_pView->GetCurrentURL(); @@ -170,7 +170,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) pRequest->addContinuation(pApprove); xHandler->handle(xRequest); - return 0; + return; } } } @@ -182,7 +182,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) ); if ( aBox->Execute() != RET_YES ) - return 0; + return; } m_pName->SetText(sName); EndDialog( RET_OK ); @@ -192,10 +192,9 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click) { DBG_UNHANDLED_EXCEPTION(); } - return 0; } -IMPL_LINK_NOARG(OCollectionView, NewFolder_Click) +IMPL_LINK_NOARG_TYPED(OCollectionView, NewFolder_Click, Button*, void) { try { @@ -211,10 +210,9 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click) { DBG_UNHANDLED_EXCEPTION(); } - return 0; } -IMPL_LINK_NOARG(OCollectionView, Up_Click) +IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void) { try { @@ -236,7 +234,6 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click) { DBG_UNHANDLED_EXCEPTION(); } - return 0; } IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 24d1ebd66871..a28fd3a9b402 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -164,7 +164,7 @@ namespace dbaui m_pAdminDialog->enableConfirmSettings( !getURLNoPrefix().isEmpty() ); } - IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnBrowseConnections, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType); @@ -185,7 +185,7 @@ namespace dbaui xFolderPicker->setDisplayDirectory(sOldPath); if (0 == xFolderPicker->execute()) // cancelled by the user - return 0L; + return; sOldPath = xFolderPicker->getDirectory(); switch (checkPathExistence(sOldPath)) @@ -194,7 +194,7 @@ namespace dbaui bDoBrowse = true; break; case RET_CANCEL: - return 0L; + return; default: break; } @@ -265,7 +265,7 @@ namespace dbaui callModifiedHdl(); } else - return 1L; + return; } break; #ifdef _ADO_DATALINK_BROWSE_ @@ -282,7 +282,7 @@ namespace dbaui callModifiedHdl(); } else - return 1L; + return; } break; #endif @@ -337,11 +337,9 @@ namespace dbaui } checkTestConnection(); - - return 0L; } - IMPL_LINK(OConnectionHelper, OnCreateDatabase, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OConnectionHelper, OnCreateDatabase, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType); @@ -363,8 +361,6 @@ namespace dbaui } checkTestConnection(); - - return 0L; } bool OConnectionHelper::checkTestConnection() diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 9fd69e7459c4..2f80e5d3c678 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -91,8 +91,8 @@ namespace dbaui virtual bool checkTestConnection(); private: - DECL_LINK(OnBrowseConnections, PushButton*); - DECL_LINK(OnCreateDatabase, PushButton*); + DECL_LINK_TYPED(OnBrowseConnections, Button*, void); + DECL_LINK_TYPED(OnCreateDatabase, Button*, void); OUString impl_getURL( bool _bPrefix ) const; void impl_setURL( const OUString& _rURL, bool _bPrefix ); void implUpdateURLDependentStates() const; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index b9c8fba68944..5d79776b5cca 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -104,7 +104,7 @@ namespace dbaui m_pJavaDriver->SetModifyHdl(getControlModifiedLink()); m_pJavaDriver->SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified)); m_pUserName->SetModifyHdl(getControlModifiedLink()); - m_pPasswordRequired->SetClickHdl(getControlModifiedLink()); + m_pPasswordRequired->SetClickHdl(getControlModifiedClickLink()); m_pTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl)); m_pTestJavaDriver->SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl)); @@ -288,7 +288,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK(OConnectionTabPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OConnectionTabPage, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -311,7 +311,6 @@ namespace dbaui const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); aMsg->Execute(); - return 0L; } bool OConnectionTabPage::checkTestConnection() { diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 6f373cc24426..e7f41afbda7e 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -52,7 +52,7 @@ namespace dbaui VclPtr<PushButton> m_pTestConnection; // called when the test connection button was clicked - DECL_LINK(OnTestJavaClickHdl, PushButton*); + DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified, Edit*); public: diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 4d3a5817fd77..54ae2b4e6138 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -373,11 +373,6 @@ using namespace ::com::sun::star; OnModified( NULL ); } - Link<> MySQLNativeSetupPage::getControlModifiedLink() - { - return LINK( this, MySQLNativeSetupPage, OnModified ); - } - IMPL_LINK( MySQLNativeSetupPage, OnModified, Edit*, _pEdit ) { SetRoadmapStateValue( m_aMySQLSettings->canAdvance() ); @@ -540,7 +535,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(bRoadmapState); } - IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); @@ -564,7 +559,6 @@ using namespace ::com::sun::star; const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); aMsg->Execute(); - return 0L; } IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit) @@ -664,7 +658,7 @@ using namespace ::com::sun::star; return bEnableTestConnection; } - IMPL_LINK(OJDBCConnectionPageSetup, OnTestJavaClickHdl, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OJDBCConnectionPageSetup, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -686,7 +680,6 @@ using namespace ::com::sun::star; sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString() ); aMsg->Execute(); - return 0L; } IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit) @@ -761,8 +754,8 @@ using namespace ::com::sun::star; get(m_pCBPasswordRequired, "passRequiredCheckbutton"); get(m_pPBTestConnection, "testConnectionButton"); m_pETUserName->SetModifyHdl(getControlModifiedLink()); - m_pCBPasswordRequired->SetClickHdl(getControlModifiedLink()); - m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl)); + m_pCBPasswordRequired->SetClickHdl(getControlModifiedClickLink()); + m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl)); LayoutHelper::fitSizeRightAligned( *m_pPBTestConnection ); } @@ -843,7 +836,7 @@ using namespace ::com::sun::star; get(m_pFTFinalText, "finishText"); m_pCBOpenAfterwards->SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected)); - m_pCBStartTableWizard->SetClickHdl(getControlModifiedLink()); + m_pCBStartTableWizard->SetClickHdl(getControlModifiedClickLink()); m_pRBRegisterDataSource->SetState(true); } @@ -911,12 +904,10 @@ using namespace ::com::sun::star; return true; } - IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox) + IMPL_LINK_TYPED(OFinalDBPageSetup, OnOpenSelected, Button*, _pBox, void) { - m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && _pBox->IsChecked() ); + m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && static_cast<CheckBox*>(_pBox)->IsChecked() ); callModifiedHdl(); - // outta here - return 0L; } } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 4cb177cceb82..2bdaef0aa384 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -127,7 +127,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual Link<> getControlModifiedLink() SAL_OVERRIDE; + virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK( this, MySQLNativeSetupPage, OnModified ); } private: DECL_LINK( OnModified, Edit* ); @@ -156,7 +156,7 @@ namespace dbaui virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); } - DECL_LINK(OnTestJavaClickHdl,PushButton*); + DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); VclPtr<FixedText> m_pHeaderText; VclPtr<FixedText> m_pFTHelpText; @@ -193,7 +193,7 @@ namespace dbaui virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - DECL_LINK(OnTestJavaClickHdl,PushButton*); + DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); VclPtr<FixedText> m_pFTDriverClass; VclPtr<Edit> m_pETDriverClass; @@ -286,7 +286,7 @@ namespace dbaui /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> Link<> getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OGenericAdministrationPage, OnControlModified); } - DECL_LINK(OnOpenSelected, CheckBox*); + DECL_LINK_TYPED(OnOpenSelected, Button*, void); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index a408c34b9786..7ce766d8c96f 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -152,7 +152,7 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD } } -IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ORelationDialog, OKClickHdl, Button*, void ) { // RadioButtons auslesen sal_uInt16 nAttrib = 0; @@ -197,7 +197,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) { m_pOrigConnData->CopyFrom( *m_pConnData ); EndDialog( RET_OK ); - return 0L; + return; } } catch( const SQLException& ) @@ -219,8 +219,6 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ ) Init(m_pConnData); m_xTableControl->Init( m_pConnData ); m_xTableControl->lateInit(); - - return 0; } short ORelationDialog::Execute() diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 5e9afea0f7ea..e4a7c8d46e9a 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -57,7 +57,7 @@ class OPasswordDialog : public ModalDialog VclPtr<Edit> m_pEDPasswordRepeat; VclPtr<OKButton> m_pOKBtn; - DECL_LINK( OKHdl_Impl, void * ); + DECL_LINK_TYPED( OKHdl_Impl, Button*, void ); DECL_LINK( ModifiedHdl, Edit * ); public: @@ -95,7 +95,7 @@ OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserNam m_pEDOldPassword->SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) ); } -IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(OPasswordDialog, OKHdl_Impl, Button*, void) { if( m_pEDPassword->GetText() == m_pEDPasswordRepeat->GetText() ) EndDialog( RET_OK ); @@ -108,7 +108,6 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl) m_pEDPasswordRepeat->SetText( OUString() ); m_pEDPassword->GrabFocus(); } - return 0; } IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit ) @@ -207,7 +206,7 @@ VclPtr<SfxTabPage> OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _ return VclPtr<OUserAdmin>::Create( pParent, *_rAttrSet ); } -IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) +IMPL_LINK_TYPED( OUserAdmin, UserHdl, Button *, pButton, void ) { try { @@ -270,14 +269,10 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton ) catch(const SQLException& e) { ::dbaui::showError(::dbtools::SQLExceptionInfo(e), this, m_xORB); - return 0; } catch(Exception& ) { - return 0; } - - return 0; } IMPL_LINK( OUserAdmin, ListDblClickHdl, ListBox *, /*pListBox*/ ) diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index d3084e220bc1..7aad1f80e3e9 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -57,7 +57,7 @@ protected: // methods DECL_LINK( ListDblClickHdl, ListBox * ); DECL_LINK( CloseHdl, PushButton * ); - DECL_LINK( UserHdl, PushButton * ); + DECL_LINK_TYPED( UserHdl, Button *, void ); void FillUserNames(); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 1b5dbba4fb9c..8e8b0f4a3080 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -102,10 +102,14 @@ namespace dbaui _rReadonly = !_rValid || (pReadonly && pReadonly->GetValue()); } - IMPL_LINK_NOARG(OGenericAdministrationPage, OnControlModified) + IMPL_LINK(OGenericAdministrationPage, OnControlModified, Button*, /*pCtrl*/) { callModifiedHdl(); - return 0L; + return 0; + } + IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void) + { + getControlModifiedLink().Call(pCtrl); } bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString& _sCurr) { @@ -209,7 +213,7 @@ namespace dbaui } } - IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OGenericAdministrationPage, OnTestConnectionClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); bool bSuccess = false; @@ -248,7 +252,6 @@ namespace dbaui if ( !bSuccess ) m_pAdminDialog->clearPassword(); } - return 0L; } // LayoutHelper diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index dfc47c8e11a7..a87342fed9bb 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -230,11 +230,15 @@ namespace dbaui /** This link be used for controls where the tabpage does not need to take any special action when the control is modified. The implementation just calls callModifiedHdl. */ - DECL_LINK(OnControlModified, void*); - DECL_LINK(OnTestConnectionClickHdl, PushButton*); + DECL_LINK(OnControlModified, Button*); + DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void); /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method> virtual Link<> getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); } + // calls via getControlModifiedLink() + Link<Button*,void> getControlModifiedClickLink() { return LINK(this, OGenericAdministrationPage, OnControlModifiedClick); } + private: + DECL_LINK_TYPED(OnControlModifiedClick, Button*, void); }; // ControlRelation diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index cd5e097f8165..575af56e9b00 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -417,10 +417,9 @@ void OAddTableDlg::impl_addTable() } } -IMPL_LINK( OAddTableDlg, AddClickHdl, Button*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void ) { TableListDoubleClickHdl(NULL); - return 0; } IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl ) @@ -442,18 +441,17 @@ IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl ) return 0; } -IMPL_LINK( OAddTableDlg, CloseClickHdl, Button*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void ) { - return int(Close()); + Close(); } -IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected ) +IMPL_LINK_NOARG_TYPED( OAddTableDlg, OnTypeSelected, Button*, void ) { if ( m_pCaseTables->IsChecked() ) impl_switchTo( Tables ); else impl_switchTo( Queries ); - return 0; } bool OAddTableDlg::Close() diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 45d57e73db2d..0f6e7bc6985f 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -100,7 +100,7 @@ namespace dbaui if ( rFeatures.has( nItemId ) ) { get(*setting->ppControl, setting->sControlId); - (*setting->ppControl)->SetClickHdl( getControlModifiedLink() ); + (*setting->ppControl)->SetClickHdl( getControlModifiedClickLink() ); (*setting->ppControl)->Show(); // check whether this must be a tristate check box @@ -336,7 +336,7 @@ namespace dbaui get(m_pAutoRetrievingLabel, "queryft"); get(m_pAutoRetrieving, "query"); - m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedLink() ); + m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedClickLink() ); m_pAutoIncrement->SetModifyHdl( getControlModifiedLink() ); m_pAutoRetrieving->SetModifyHdl( getControlModifiedLink() ); diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 7c08e920a687..accd6c301d95 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -91,6 +91,7 @@ namespace dbaui private: void impl_initBooleanSettings(); + DECL_LINK(ClickHdl, Button*); }; // GeneratedValuesPage diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 2ee6700967c4..6bea91f71364 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -188,7 +188,7 @@ void ODbaseIndexDialog::InsertTableIndex( const OUString& _rTableName, const OTa implInsertIndex(_rIndex, aTablePos->aIndexList, *m_pLB_TableIndexes); } -IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OKClickHdl, Button*, void ) { // let all tables write their INF file @@ -199,10 +199,9 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ ) aLoop->WriteInfFile(m_aDSN); EndDialog(); - return 0; } -IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddClickHdl, Button*, void ) { OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); @@ -210,10 +209,9 @@ IMPL_LINK( ODbaseIndexDialog, AddClickHdl, PushButton*, /*pButton*/ ) InsertTableIndex( aTableName, aIndex ); checkButtons(); - return 0; } -IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) { OUString aSelection = m_pLB_TableIndexes->GetSelectEntry(); OUString aTableName = m_pCB_Tables->GetText(); @@ -221,10 +219,9 @@ IMPL_LINK( ODbaseIndexDialog, RemoveClickHdl, PushButton*, /*pButton*/ ) InsertFreeIndex( aIndex ); checkButtons(); - return 0; } -IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, AddAllClickHdl, Button*, void ) { sal_uInt16 nCnt = m_pLB_FreeIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); @@ -233,10 +230,9 @@ IMPL_LINK( ODbaseIndexDialog, AddAllClickHdl, PushButton*, /*pButton*/ ) InsertTableIndex( aTableName, RemoveFreeIndex( m_pLB_FreeIndexes->GetEntry(0), true ) ); checkButtons(); - return 0; } -IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, RemoveAllClickHdl, Button*, void ) { sal_uInt16 nCnt = m_pLB_TableIndexes->GetEntryCount(); OUString aTableName = m_pCB_Tables->GetText(); @@ -245,7 +241,6 @@ IMPL_LINK( ODbaseIndexDialog, RemoveAllClickHdl, PushButton*, /*pButton*/ ) InsertFreeIndex( RemoveTableIndex( aTableName, m_pLB_TableIndexes->GetEntry(0), true ) ); checkButtons(); - return 0; } IMPL_LINK( ODbaseIndexDialog, OnListEntrySelected, ListBox*, /*NOTINTERESTEDIN*/ ) diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 8feeff259ca9..ef0c43a7dde4 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -85,11 +85,11 @@ protected: VclPtr<PushButton> m_pRemoveAll; DECL_LINK( TableSelectHdl, ComboBox* ); - DECL_LINK( AddClickHdl, PushButton* ); - DECL_LINK( RemoveClickHdl, PushButton* ); - DECL_LINK( AddAllClickHdl, PushButton* ); - DECL_LINK( RemoveAllClickHdl, PushButton* ); - DECL_LINK( OKClickHdl, PushButton* ); + DECL_LINK_TYPED( AddClickHdl, Button*, void ); + DECL_LINK_TYPED( RemoveClickHdl, Button*, void ); + DECL_LINK_TYPED( AddAllClickHdl, Button*, void ); + DECL_LINK_TYPED( RemoveAllClickHdl, Button*, void ); + DECL_LINK_TYPED( OKClickHdl, Button*, void ); DECL_LINK( OnListEntrySelected, ListBox* ); OUString m_aDSN; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index b090ddc8df06..d51829ca1655 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -243,7 +243,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK( ODbaseDetailsPage, OnButtonClicked, Button*, pButton ) + IMPL_LINK_TYPED( ODbaseDetailsPage, OnButtonClicked, Button*, pButton, void ) { if (m_pIndexes == pButton) { @@ -256,8 +256,6 @@ namespace dbaui // it was one of the checkboxes -> we count as modified from now on callModifiedHdl(); } - - return 0; } // OAdoDetailsPage @@ -516,7 +514,7 @@ namespace dbaui m_pEDDriverClass->SetModifyFlag(); } } - IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) + IMPL_LINK_NOARG_TYPED(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, Button*, void) { OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); OSL_ENSURE(m_bUseClass,"Who called me?"); @@ -541,7 +539,6 @@ namespace dbaui const OSQLMessageBox::MessageType mt = bSuccess ? OSQLMessageBox::Info : OSQLMessageBox::Error; ScopedVclPtrInstance< OSQLMessageBox > aMsg( this, OUString( ModuleRes( nMessage ) ), OUString(), WB_OK | WB_DEF_OK, mt ); aMsg->Execute(); - return 0L; } IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit) { @@ -704,7 +701,7 @@ namespace dbaui fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } - IMPL_LINK( OLDAPDetailsPage, OnCheckBoxClick, CheckBox*, pCheckBox ) + IMPL_LINK_TYPED( OLDAPDetailsPage, OnCheckBoxClick, Button*, pCheckBox, void ) { callModifiedHdl(); if ( pCheckBox == m_pCBUseSSL) @@ -720,7 +717,6 @@ namespace dbaui m_pNFPortNumber->SetValue(m_iNormalPort); } } - return 0; } void OLDAPDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 407a986c2c1c..7ab4d970a469 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -104,7 +104,7 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; private: - DECL_LINK( OnButtonClicked, Button * ); + DECL_LINK_TYPED( OnButtonClicked, Button *, void ); }; // OAdoDetailsPage @@ -174,7 +174,7 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - DECL_LINK(OnTestJavaClickHdl,PushButton*); + DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified,Edit*); VclPtr<Edit> m_pEDHostname; @@ -235,7 +235,7 @@ namespace dbaui sal_Int32 m_iSSLPort; sal_Int32 m_iNormalPort; - DECL_LINK( OnCheckBoxClick, CheckBox * ); + DECL_LINK_TYPED( OnCheckBoxClick, Button*, void ); }; // OMozillaDetailsPage Detail page for Mozilla and Thunderbird addressbook diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 120d075411f5..b97d8ed546cc 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -60,7 +60,7 @@ namespace dbaui m_pSQL->GrabFocus(); m_pExecute->SetClickHdl(LINK(this, DirectSQLDialog, OnExecute)); - m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnClose)); + m_pClose->SetClickHdl(LINK(this, DirectSQLDialog, OnCloseClick)); m_pSQLHistory->SetSelectHdl(LINK(this, DirectSQLDialog, OnListEntrySelected)); m_pSQLHistory->SetDropDownLineCount(10); @@ -314,16 +314,19 @@ namespace dbaui return 0L; } + IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnCloseClick, Button*, void ) + { + EndDialog( RET_OK ); + } IMPL_LINK_NOARG( DirectSQLDialog, OnClose ) { EndDialog( RET_OK ); return 0L; } - IMPL_LINK_NOARG( DirectSQLDialog, OnExecute ) + IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void ) { executeCurrent(); - return 0L; } IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected ) diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 39239d839d11..dbb78c608a93 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -293,7 +293,7 @@ void OSaveAsDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) +IMPL_LINK_TYPED(OSaveAsDlg, ButtonClickHdl, Button *, pButton, void) { if (pButton == m_pImpl->m_pPB_OK) { @@ -320,7 +320,6 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) showError( aNameError, this, m_xContext ); m_pImpl->m_pTitle->GrabFocus(); } - return 0; } IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit ) diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 6c254a494e84..eee8a4dd2097 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -76,9 +76,8 @@ sal_Int32 DlgSize::GetValue() return (sal_Int32)m_pMF_VALUE->GetValue( FUNIT_CM ); } -IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( DlgSize, CbClickHdl, Button *, pButton, void ) { - if( pButton == m_pCB_STANDARD ) { m_pMF_VALUE->Enable(!m_pCB_STANDARD->IsChecked()); @@ -93,7 +92,6 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) SetValue( m_nPrevValue ); } } - return 0; } } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 663f0e0a04af..08bc95202364 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -699,21 +699,19 @@ namespace dbaui return aDocument; } - IMPL_LINK( OGeneralPageWizard, OnCreateDatabaseModeSelected, RadioButton*, /*_pBox*/ ) + IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnCreateDatabaseModeSelected, Button*, void ) { if ( m_aCreationModeHandler.IsSet() ) m_aCreationModeHandler.Call( this ); OnEmbeddedDBTypeSelected( m_pEmbeddedDBType ); - return 1L; } - IMPL_LINK( OGeneralPageWizard, OnSetupModeSelected, RadioButton*, /*_pBox*/ ) + IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnSetupModeSelected, Button*, void ) { if ( m_aCreationModeHandler.IsSet() ) m_aCreationModeHandler.Call( this ); OnDatasourceTypeSelected(m_pDatasourceType); - return 1L; } IMPL_LINK( OGeneralPageWizard, OnDocumentSelected, ListBox*, /*_pBox*/ ) @@ -722,7 +720,7 @@ namespace dbaui return 0L; } - IMPL_LINK( OGeneralPageWizard, OnOpenDocument, PushButton*, /*_pBox*/ ) + IMPL_LINK_NOARG_TYPED( OGeneralPageWizard, OnOpenDocument, Button*, void ) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, @@ -742,15 +740,12 @@ namespace dbaui aError->Execute(); m_pRB_ConnectDatabase->Check(); OnSetupModeSelected( m_pRB_ConnectDatabase ); - return 0L; + return; } m_aBrowsedDocument.sURL = sPath; m_aBrowsedDocument.sFilter.clear(); m_aChooseDocumentHandler.Call( this ); - return 1L; } - - return 0L; } } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 30b012cb7031..320b619ecd3b 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -186,10 +186,10 @@ namespace dbaui protected: DECL_LINK( OnEmbeddedDBTypeSelected, ListBox* ); - DECL_LINK( OnCreateDatabaseModeSelected, RadioButton* ); - DECL_LINK( OnSetupModeSelected, RadioButton* ); + DECL_LINK_TYPED( OnCreateDatabaseModeSelected, Button*, void ); + DECL_LINK_TYPED( OnSetupModeSelected, Button*, void ); DECL_LINK( OnDocumentSelected, ListBox* ); - DECL_LINK( OnOpenDocument, PushButton* ); + DECL_LINK_TYPED( OnOpenDocument, Button*, void ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 9f0e584c2a4e..6fff7c236cd1 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -237,7 +237,7 @@ namespace dbaui fillIndexList(); - m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModified)); + m_pUnique->SetClickHdl(LINK(this, DbaIndexDialog, OnModifiedClick)); m_pFields->SetModifyHdl(LINK(this, DbaIndexDialog, OnModified)); m_pClose->SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog)); @@ -557,7 +557,7 @@ namespace dbaui OnResetIndex(); } - IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog ) + IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnCloseDialog, Button*, void ) { if (m_pIndexList->IsEditingActive()) { @@ -567,7 +567,7 @@ namespace dbaui m_pIndexList->EndEditing(); if (m_bEditAgain) // could not commit the new name (started a new - asynchronous - edit trial) - return 1L; + return; } // the currently selected entry @@ -592,17 +592,15 @@ namespace dbaui { case RET_YES: if (!implCommitPreviouslySelected()) - return 1L; + return; break; case RET_NO: break; default: - return 1L; + return; } EndDialog(RET_OK); - - return 0L; } IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) @@ -733,6 +731,10 @@ namespace dbaui return true; } + IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void ) + { + OnModified(NULL); + } IMPL_LINK_NOARG( DbaIndexDialog, OnModified ) { OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index e20d01c813c2..36766be76ca3 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -208,14 +208,14 @@ namespace dbaui return 0L; } - IMPL_LINK(OParameterDialog, OnButtonClicked, PushButton*, pButton) + IMPL_LINK_TYPED(OParameterDialog, OnButtonClicked, Button*, pButton, void) { if (m_pCancelBtn == pButton) { // no interpreting of the given values anymore .... m_pParam->SetLoseFocusHdl(Link<>()); // no direct call from the control anymore ... m_bNeedErrorOnCurrent = false; // in case of any indirect calls -> no error message - m_pCancelBtn->SetClickHdl(Link<>()); + m_pCancelBtn->SetClickHdl(Link<Button*,void>()); m_pCancelBtn->Click(); } else if (m_pOKBtn == pButton) @@ -227,7 +227,7 @@ namespace dbaui // we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now, // so the next time it is called we need an error message, again .... // (TODO : there surely are better solutions for this ...) - return 1L; + return; } if (m_xParams.is()) @@ -253,7 +253,7 @@ namespace dbaui } // to close the dialog (which is more code than a simple EndDialog) - m_pOKBtn->SetClickHdl(Link<>()); + m_pOKBtn->SetClickHdl(Link<Button*,void>()); m_pOKBtn->Click(); } else if (m_pTravelNext == pButton) @@ -278,8 +278,6 @@ namespace dbaui // so the next time it is called we need an error message, again .... // (TODO : there surely are better solutions for this ...) } - - return 0L; } IMPL_LINK(OParameterDialog, OnEntrySelected, ListBox*, /*pList*/) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 8fd564ba9e3a..1189f79f9a0c 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -710,11 +710,10 @@ void OSQLMessageBox::dispose() ButtonDialog::dispose(); } -IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OSQLMessageBox, ButtonClickHdl, Button *, void ) { ScopedVclPtrInstance< OExceptionChainDialog > aDlg( this, m_pImpl->aDisplayInfo ); aDlg->Execute(); - return 0; } // OSQLWarningBox diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index b20f6775d86b..6980f8042804 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -400,7 +400,7 @@ namespace dbaui } IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl ) { - return OnControlModified(_pControl); + return OnControlModified(static_cast<Button*>(_pControl)); } IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData ) { diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 9fa798b1b096..e52ca7aeec7f 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -67,17 +67,14 @@ namespace dbaui return ModalDialog::Execute(); } - IMPL_LINK( TextConnectionSettingsDialog, OnOK, PushButton*, /*_pButton*/ ) + IMPL_LINK_NOARG_TYPED( TextConnectionSettingsDialog, OnOK, Button*, void ) { if ( m_pTextConnectionHelper->prepareLeave() ) { bool bUnused = false; m_pTextConnectionHelper->FillItemSet( m_rItems, bUnused ); EndDialog( RET_OK ); - return 1L; } - - return 0L; } } // namespace dbaui diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 3b2ac64ec2f6..e90bd5d8ef29 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -44,9 +44,9 @@ namespace dbaui css::uno::Reference< css::uno::XComponentContext > m_xContext; bool m_bCreateForm; - DECL_LINK(Up_Click,void*); - DECL_LINK(NewFolder_Click,void*); - DECL_LINK(Save_Click,void*); + DECL_LINK_TYPED(Up_Click, Button*, void); + DECL_LINK_TYPED(NewFolder_Click, Button*, void); + DECL_LINK_TYPED(Save_Click, Button*, void); DECL_LINK(Dbl_Click_FileView,void*); /// sets the fixedtext to the right content diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 4d5cef55694a..e0c00701a589 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -116,7 +116,7 @@ namespace dbaui DECL_LINK( OnScroll, ScrollBar*); - DECL_LINK( FormatClickHdl, Button * ); + DECL_LINK_TYPED( FormatClickHdl, Button *, void ); DECL_LINK( ChangeHdl, ListBox * ); // used by ActivatePropertyField diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 877b56f8a117..91ce6c80bb3e 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -90,7 +90,7 @@ namespace dbaui void Init(const TTableConnectionData::value_type& _pConnectionData); private: - DECL_LINK( OKClickHdl, Button* ); + DECL_LINK_TYPED( OKClickHdl, Button*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 008a9376ce01..80256e7e0d7e 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -51,9 +51,9 @@ namespace dbaui bool m_bPKeyAllowed; bool m_bUseHeaderAllowed; - DECL_LINK( AppendDataClickHdl, Button* ); - DECL_LINK( RadioChangeHdl, Button* ); - DECL_LINK( KeyClickHdl, Button* ); + DECL_LINK_TYPED( AppendDataClickHdl, Button*, void ); + DECL_LINK_TYPED( RadioChangeHdl, Button*, void ); + DECL_LINK_TYPED( KeyClickHdl, Button*, void ); bool checkAppendData(); void SetAppendDataRadio(); diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 0c179f2367fb..a653d9e31950 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -42,7 +42,7 @@ namespace dbaui VclPtr<PushButton> m_pColumns_LH; VclPtr<ListBox> m_pNewColumnNames; // right side - DECL_LINK( ButtonClickHdl, Button * ); + DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); DECL_LINK( ListDoubleClickHdl, ListBox * ); static void clearListBox(ListBox& _rListBox); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 22a961341cef..711d9c145124 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -279,9 +279,9 @@ namespace dbaui bool m_bUseHeaderLine; private: - DECL_LINK( ImplPrevHdl , void* ); - DECL_LINK( ImplNextHdl , void* ); - DECL_LINK( ImplOKHdl , void* ); + DECL_LINK_TYPED( ImplPrevHdl, Button*, void ); + DECL_LINK_TYPED( ImplNextHdl, Button*, void); + DECL_LINK_TYPED( ImplOKHdl, Button*, void ); DECL_LINK( ImplActivateHdl, void* ); bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 61f71b56ce47..f4119bed01cd 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -65,9 +65,9 @@ namespace dbaui Image m_aImgUp; Image m_aImgDown; - DECL_LINK( ButtonClickHdl, Button * ); - DECL_LINK( RightButtonClickHdl, Button * ); - DECL_LINK( AllNoneClickHdl, Button * ); + DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); + DECL_LINK_TYPED( RightButtonClickHdl, Button *, void ); + DECL_LINK_TYPED( AllNoneClickHdl, Button *, void ); DECL_LINK( TableListClickHdl, void* ); DECL_LINK( TableListRightSelectHdl, void* ); diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index cc84c5bd3705..e8778521e50a 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -92,7 +92,7 @@ namespace dbaui friend class OWizTypeSelectList; DECL_LINK( ColumnSelectHdl, MultiListBox* ); - DECL_LINK( ButtonClickHdl, Button * ); + DECL_LINK_TYPED( ButtonClickHdl, Button *, void ); protected: VclPtr<OWizTypeSelectList> m_pColumnNames; VclPtr<FixedText> m_pColumns; diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 4de1c3398134..855853bd1d95 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -70,11 +70,11 @@ namespace dbaui IAddTableDialogContext& m_rContext; - DECL_LINK( AddClickHdl, Button* ); - DECL_LINK( CloseClickHdl, Button* ); + DECL_LINK_TYPED( AddClickHdl, Button*, void ); + DECL_LINK_TYPED( CloseClickHdl, Button*, void); DECL_LINK( TableListDoubleClickHdl, void* ); DECL_LINK( TableListSelectHdl, void* ); - DECL_LINK( OnTypeSelected, void* ); + DECL_LINK_TYPED( OnTypeSelected, Button*, void ); public: OAddTableDlg( diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 0d46a61465e5..df80ad6b8b31 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -85,8 +85,9 @@ namespace dbaui virtual void _disposing( const css::lang::EventObject& _rSource ) SAL_OVERRIDE; protected: - DECL_LINK( OnExecute, void* ); + DECL_LINK_TYPED( OnExecute, Button*, void ); DECL_LINK( OnClose, void* ); + DECL_LINK_TYPED( OnCloseClick, Button*, void ); DECL_LINK( OnListEntrySelected, void* ); DECL_LINK( OnStatementModified, void* ); diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index c53341dce924..9f883a3f7b68 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -72,7 +72,7 @@ namespace dbaui OUString getCatalog() const; OUString getSchema() const; private: - DECL_LINK(ButtonClickHdl, Button *); + DECL_LINK_TYPED(ButtonClickHdl, Button *, void); DECL_LINK(EditModifyHdl, Edit * ); void implInitOnlyTitle(const OUString& _rLabel); diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 1d51ed11a534..90f7092e428b 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -37,7 +37,7 @@ namespace dbaui void SetValue( sal_Int32 nVal ); protected: - DECL_LINK( CbClickHdl, Button * ); + DECL_LINK_TYPED( CbClickHdl, Button *, void ); VclPtr<MetricField> m_pMF_VALUE; VclPtr<CheckBox> m_pCB_STANDARD; diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 7e9733353644..50f46556e974 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -133,8 +133,9 @@ namespace dbaui DECL_LINK( OnIndexSelected, DbaIndexList* ); DECL_LINK_TYPED( OnIndexAction, ToolBox*, void ); DECL_LINK( OnEntryEdited, SvTreeListEntry* ); + DECL_LINK_TYPED( OnModifiedClick, Button*, void ); DECL_LINK( OnModified, void* ); - DECL_LINK( OnCloseDialog, void* ); + DECL_LINK_TYPED( OnCloseDialog, Button*, void ); DECL_LINK( OnEditIndexAgain, SvTreeListEntry* ); diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 6c52896a149e..44d3316dd61d 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -98,7 +98,7 @@ namespace dbaui DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void); DECL_LINK(OnValueModified, Control*); DECL_LINK(OnEntrySelected, ListBox*); - DECL_LINK(OnButtonClicked, PushButton*); + DECL_LINK_TYPED(OnButtonClicked, Button*, void); DECL_LINK(OnValueLoseFocus, Control*); }; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 0ae541b4794e..d8987a3b9026 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -95,7 +95,7 @@ public: private: void Construct( WinBits nStyle, MessageType eImage ); - DECL_LINK(ButtonClickHdl, Button* ); + DECL_LINK_TYPED(ButtonClickHdl, Button*, void ); private: void impl_positionControls(); diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 89bcfc354e9c..05ca314322be 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -54,7 +54,7 @@ namespace dbaui SfxItemSet& m_rItems; private: - DECL_LINK( OnOK, PushButton* ); + DECL_LINK_TYPED( OnOK, Button*, void ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 19d2af726eec..9b170b21f625 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -124,11 +124,9 @@ void OCopyTable::dispose() OWizardPage::dispose(); } -IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OCopyTable, AppendDataClickHdl, Button*, void ) { - SetAppendDataRadio(); - return 0; } void OCopyTable::SetAppendDataRadio() @@ -140,7 +138,7 @@ void OCopyTable::SetAppendDataRadio() m_pParent->setOperation(CopyTableOperation::AppendData); } -IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton ) +IMPL_LINK_TYPED( OCopyTable, RadioChangeHdl, Button*, pButton, void ) { m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,pButton != m_pRB_View); bool bKey = m_bPKeyAllowed && pButton != m_pRB_View; @@ -156,15 +154,12 @@ IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton ) m_pParent->setOperation( CopyTableOperation::CopyDefinitionOnly ); else if( IsOptionView() ) m_pParent->setOperation( CopyTableOperation::CreateAsView ); - - return 0; } -IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OCopyTable, KeyClickHdl, Button*, void ) { m_pEdKeyName->Enable(m_pCB_PrimaryColumn->IsChecked()); m_pFT_KeyName->Enable(m_pCB_PrimaryColumn->IsChecked()); - return 0; } bool OCopyTable::LeavePage() diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index d7ae174e4b65..b0b618882845 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -183,7 +183,7 @@ bool OWizColumnSelect::LeavePage() return true; } -IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) { ListBox *pLeft = NULL; ListBox *pRight = NULL; @@ -213,7 +213,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) } if (!pLeft || !pRight) - return 0; + return; Reference< XDatabaseMetaData > xMetaData( m_pParent->m_xDestConnection->getMetaData() ); OUString sExtraChars = xMetaData->getExtraNameCharacters(); @@ -244,8 +244,6 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) if(m_pOrgColumnNames->GetEntryCount()) m_pOrgColumnNames->SelectEntryPos(0); - - return 0; } IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox ) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 9e07344f49eb..2aca86e1c8d6 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -717,7 +717,7 @@ void OCopyTableWizard::dispose() WizardDialog::dispose(); } -IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl) +IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplPrevHdl, Button*, void) { m_ePressed = WIZARD_PREV; if ( GetCurLevel() ) @@ -732,10 +732,9 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl) else ShowPrevPage(); } - return 0; } -IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl) +IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplNextHdl, Button*, void) { m_ePressed = WIZARD_NEXT; if ( GetCurLevel() < MAX_PAGES ) @@ -750,7 +749,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl) else ShowNextPage(); } - return 0; } bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) @@ -836,7 +834,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) return bRet; } -IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) +IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplOKHdl, Button*, void) { m_ePressed = WIZARD_FINISH; bool bFinish = DeactivatePage(); @@ -868,7 +866,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) m_mNameMapping.clear(); pPage->setDisplayRow(nBreakPos); ShowPage(3); - return 0; + return; } } if ( m_xDestConnection.is() ) @@ -906,7 +904,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) else if ( xAbort->wasSelected() ) { ShowPage(3); - return 0; + return; } } } @@ -924,7 +922,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) EndDialog(RET_OK); } - return bFinish ? 1 : 0; } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index fbf71a00a916..f007eda758ff 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -204,7 +204,7 @@ bool OWizNameMatching::LeavePage() OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATCHING_TITEL); } -IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( OWizNameMatching, ButtonClickHdl, Button *, pButton, void ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if ( pEntry ) @@ -229,11 +229,9 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton ) TableListClickHdl(m_pCTRL_LEFT); } - - return 0; } -IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if ( pEntry ) @@ -254,7 +252,6 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) m_pCTRL_RIGHT->GetVScroll()->DoScrollAction(SCROLL_LINEDOWN); TableListRightSelectHdl(m_pCTRL_RIGHT); } - return 0; } IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl ) @@ -325,7 +322,7 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl ) return 0; } -IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void ) { bool bAll = pButton == m_pAll; SvTreeListEntry* pEntry = m_pCTRL_LEFT->First(); @@ -334,8 +331,6 @@ IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton ) m_pCTRL_LEFT->SetCheckButtonState( pEntry, bAll ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED); pEntry = m_pCTRL_LEFT->Next(pEntry); } - - return 0; } // class OColumnString diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index f631f99cf95f..f6d06c99711a 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -351,15 +351,13 @@ void OWizTypeSelect::EnableAuto(bool bEnable) m_pAutoType->Show(bEnable); } -IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( OWizTypeSelect, ButtonClickHdl, Button *, void ) { sal_Int32 nBreakPos; m_pParent->CheckColumns(nBreakPos); fillColumnList(m_pAutoEt->GetText().toInt32()); ActivatePage(); - - return 0; } OWizTypeSelectList::~OWizTypeSelectList() diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 798fcaef3d80..cb9dff43fee2 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -241,14 +241,12 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) return 1; } -IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void ) { - m_pConnData->Update(); m_pOrigConnData->CopyFrom( *m_pConnData ); EndDialog(RET_OK); - return 1; } IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 02009b20bf31..c90d13b812d6 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -54,7 +54,7 @@ namespace dbaui css::uno::Reference< css::sdbc::XConnection > m_xConnection; - DECL_LINK( OKClickHdl, Button* ); + DECL_LINK_TYPED( OKClickHdl, Button*, void ); DECL_LINK( LBChangeHdl, ListBox* ); DECL_LINK( NaturalToggleHdl, CheckBox* ); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 767500d8eb41..cd2176a559d7 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -131,9 +131,9 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); - DECL_DLLPRIVATE_LINK( HandleOptionsBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleEnableBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleRemoveBtn, void * ); + DECL_DLLPRIVATE_LINK_TYPED( HandleOptionsBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleEnableBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleRemoveBtn, Button*, void ); public: explicit ExtBoxWithBtns_Impl(vcl::Window* pParent); @@ -486,7 +486,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar ) } -IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) +IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void) { const sal_Int32 nActive = getSelIndex(); @@ -502,12 +502,10 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) pDlg->Execute(); } } - - return 1; } -IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn) +IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void) { const sal_Int32 nActive = getSelIndex(); @@ -523,12 +521,10 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn) m_pParent->enablePackage( pEntry->m_xPackage, bEnable ); } } - - return 1; } -IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn) +IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleRemoveBtn, Button*, void) { const sal_Int32 nActive = getSelIndex(); @@ -537,8 +533,6 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn) TEntry_Impl pEntry = GetEntryData( nActive ); m_pParent->removePackage( pEntry->m_xPackage ); } - - return 1; } @@ -951,7 +945,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() } -IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn) +IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCancelBtn, Button*, void) { if ( m_xAbortChannel.is() ) { @@ -964,13 +958,11 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn) OSL_FAIL( "### unexpected RuntimeException!" ); } } - return 1; } -IMPL_LINK_NOARG(ExtMgrDialog, HandleCloseBtn) +IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void) { Close(); - return 1; } @@ -1056,7 +1048,7 @@ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage } -IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn) +IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleAddBtn, Button*, void) { setBusy( true ); @@ -1068,23 +1060,20 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn) } setBusy( false ); - return 1; } -IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx) +IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleExtTypeCbx, Button*, void) { // re-creates the list of packages with addEntry selecting the packages m_pManager->createPackageList(); - return 1; } -IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn) +IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleUpdateBtn, Button*, void) { #if ENABLE_EXTENSION_UPDATE m_pManager->checkUpdates( false, true ); #endif - return 1; } @@ -1282,7 +1271,7 @@ bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac } -IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn) +IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void) { if ( m_xAbortChannel.is() ) { @@ -1295,7 +1284,6 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn) OSL_FAIL( "### unexpected RuntimeException!" ); } } - return 1; } @@ -1388,7 +1376,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment:: } -IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn) +IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleUpdateBtn, Button*, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -1404,12 +1392,10 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn) aGuard.clear(); m_pManager->getCmdQueue()->checkForUpdates( vUpdateEntries ); - - return 1; } -IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn) +IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCloseBtn, Button*, void) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1422,8 +1408,6 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn) else EndDialog(); } - - return 1; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 234435116364..df227bd726c6 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -131,11 +131,11 @@ class ExtMgrDialog : public ModelessDialog, bool removeExtensionWarn( const OUString &rExtensionTitle ) const; - DECL_DLLPRIVATE_LINK( HandleAddBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleExtTypeCbx, void * ); + DECL_DLLPRIVATE_LINK_TYPED( HandleAddBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleUpdateBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleExtTypeCbx, Button*, void ); DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * ); DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); DECL_DLLPRIVATE_LINK( startProgress, void * ); @@ -197,9 +197,9 @@ class UpdateRequiredDialog : public ModalDialog, ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > m_xAbortChannel; - DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * ); - DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * ); + DECL_DLLPRIVATE_LINK_TYPED( HandleUpdateBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleCloseBtn, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HandleCancelBtn, Button*, void ); DECL_DLLPRIVATE_LINK_TYPED(TimeOutHdl, Idle *, void); DECL_DLLPRIVATE_LINK( startProgress, void * ); DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * ); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 7a6e2e319208..d6619adb2c40 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1291,7 +1291,7 @@ IMPL_LINK_NOARG(UpdateDialog, allHandler) return 0; } -IMPL_LINK_NOARG(UpdateDialog, okHandler) +IMPL_LINK_NOARG_TYPED(UpdateDialog, okHandler, Button*, void) { //If users are going to update a shared extension then we need //to warn them @@ -1314,13 +1314,12 @@ IMPL_LINK_NOARG(UpdateDialog, okHandler) } EndDialog(RET_OK); - return 0; } -IMPL_LINK_NOARG(UpdateDialog, closeHandler) { +IMPL_LINK_NOARG_TYPED(UpdateDialog, closeHandler, Button*, void) +{ m_thread->stop(); EndDialog(); - return 0; } IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index c3e7acf41b54..610497fd1721 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -161,8 +161,8 @@ private: DECL_LINK(selectionHandler, void *); DECL_LINK(allHandler, void *); - DECL_LINK(okHandler, void *); - DECL_LINK(closeHandler, void *); + DECL_LINK_TYPED(okHandler, Button*, void); + DECL_LINK_TYPED(closeHandler, Button*, void); DECL_LINK(hyperlink_clicked, FixedHyperlink *); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 849942b0006a..3d94cb18b5c7 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -323,11 +323,10 @@ void UpdateInstallDialog::setError(OUString const & exceptionMessage) m_pMle_info->SetText(m_pMle_info->GetText() + exceptionMessage + "\n"); } -IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler) +IMPL_LINK_NOARG_TYPED(UpdateInstallDialog, cancelHandler, Button*, void) { m_thread->stop(); EndDialog(); - return 0; } void UpdateInstallDialog::Thread::downloadExtensions() diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 9c05abd36358..00e289a564c5 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -73,7 +73,7 @@ private: friend class Thread; friend class UpdateCommandEnv; - DECL_LINK(cancelHandler, void *); + DECL_LINK_TYPED(cancelHandler, Button*, void); //signals in the dialog that we have finished. void updateDone(); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 2118c57a415c..531d84d8524b 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -85,11 +85,11 @@ struct LicenseDialogImpl : public ModalDialog VclPtr<PushButton> m_pAcceptButton; VclPtr<PushButton> m_pDeclineButton; - DECL_LINK(PageDownHdl, void *); + DECL_LINK_TYPED(PageDownHdl, Button*, void); DECL_LINK(ScrolledHdl, void *); DECL_LINK(EndReachedHdl, void *); - DECL_LINK(CancelHdl, void *); - DECL_LINK(AcceptHdl, void *); + DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK_TYPED(AcceptHdl, Button*, void); bool m_bLicenseRead; @@ -241,16 +241,14 @@ LicenseDialogImpl::LicenseDialogImpl( m_pDown->SetStyle( aStyle ); } -IMPL_LINK_NOARG(LicenseDialogImpl, AcceptHdl) +IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, AcceptHdl, Button*, void) { EndDialog(RET_OK); - return 0; } -IMPL_LINK_NOARG(LicenseDialogImpl, CancelHdl) +IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, CancelHdl, Button*, void) { EndDialog(); - return 0; } void LicenseDialogImpl::Activate() @@ -284,10 +282,9 @@ IMPL_LINK_NOARG(LicenseDialogImpl, ScrolledHdl) return 0; } -IMPL_LINK_NOARG(LicenseDialogImpl, PageDownHdl) +IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, PageDownHdl, Button*, void) { m_pLicense->ScrollDown( SCROLL_PAGEDOWN ); - return 0; } IMPL_LINK_NOARG(LicenseDialogImpl, EndReachedHdl) diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 5ff05a1719dd..735eb6168001 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -153,13 +153,13 @@ namespace editeng private: DECL_LINK( OnOptionsChanged, void* ); - DECL_LINK( OnIgnore, void* ); - DECL_LINK( OnIgnoreAll, void* ); - DECL_LINK( OnChange, void* ); - DECL_LINK( OnChangeAll, void* ); + DECL_LINK_TYPED( OnIgnore, Button*, void ); + DECL_LINK_TYPED( OnIgnoreAll, Button*, void ); + DECL_LINK_TYPED( OnChange, Button*, void ); + DECL_LINK_TYPED( OnChangeAll, Button*, void ); DECL_LINK( OnByCharClicked, CheckBox* ); - DECL_LINK( OnConversionTypeChanged, void* ); - DECL_LINK( OnFind, void* ); + DECL_LINK_TYPED( OnConversionTypeChanged, Button*, void ); + DECL_LINK_TYPED( OnFind, Button*, void ); /** proceed, after the current convertible has been handled @@ -819,14 +819,13 @@ namespace editeng return 0L; } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnore) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnore, Button*, void) { // simply ignore, and proceed implProceed( false ); - return 0L; } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnoreAll) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnoreAll, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnIgnoreAll: no dialog! How this?" ); @@ -842,11 +841,9 @@ namespace editeng // and proceed implProceed( false ); } - - return 0L; } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChange) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnChange, Button*, void) { // change DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); @@ -854,11 +851,9 @@ namespace editeng implChange( m_pConversionDialog->GetCurrentSuggestion( ) ); // and proceed implProceed( false ); - - return 0L; } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChangeAll) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnChangeAll, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); if ( m_pConversionDialog ) @@ -878,8 +873,6 @@ namespace editeng // and proceed implProceed( false ); } - - return 0L; } IMPL_LINK( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox ) @@ -891,15 +884,14 @@ namespace editeng return 0L; } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnConversionTypeChanged, Button*, void) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); if( m_pConversionDialog ) m_eConversionFormat = m_pConversionDialog->GetConversionFormat( ); - return 0L; } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnFind) + IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnFind, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnFind: where did this come from?" ); if ( m_pConversionDialog ) @@ -955,7 +947,6 @@ namespace editeng OSL_FAIL( "HangulHanjaConversion_Impl::OnFind: caught an exception!" ); } } - return 0L; } bool HangulHanjaConversion::m_bUseSavedValues = false; diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 6c85546e8b5d..3226768e847a 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -218,22 +218,20 @@ namespace abp } - IMPL_LINK_NOARG(FinalPage, OnRegister) + IMPL_LINK_NOARG_TYPED(FinalPage, OnRegister, Button*, void) { bool bEnable = m_pRegisterName->IsChecked(); m_pNameLabel->Enable(bEnable); m_pName->Enable(bEnable); implCheckName(); - return 0L; } - IMPL_LINK_NOARG(FinalPage, OnEmbed) + IMPL_LINK_NOARG_TYPED(FinalPage, OnEmbed, Button*, void) { bool bEmbed = m_pEmbed->IsChecked(); m_pLocationLabel->Enable(!bEmbed); m_pLocation->Enable(!bEmbed); m_pBrowse->Enable(!bEmbed); - return 0L; } } // namespace abp diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index ceb1d0b66353..1a876545a814 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -68,8 +68,8 @@ namespace abp private: DECL_LINK( OnNameModified, Edit* ); - DECL_LINK(OnRegister, void *); - DECL_LINK(OnEmbed, void *); + DECL_LINK_TYPED(OnRegister, Button*, void); + DECL_LINK_TYPED(OnEmbed, Button*, void); bool isValidName() const; void implCheckName(); diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 1ef0ebe0331c..7254eb8f8505 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -179,17 +179,15 @@ namespace abp } - IMPL_LINK_NOARG( OAddessBookSourcePilot, OnCancelClicked ) + IMPL_LINK_NOARG_TYPED( OAddessBookSourcePilot, OnCancelClicked, Button*, void ) { // do cleanups implCleanup(); // reset the click hdl - m_pCancel->SetClickHdl( Link<>() ); + m_pCancel->SetClickHdl( Link<Button*, void>() ); // simulate the click again - this time, the default handling of the button will strike .... m_pCancel->Click(); - - return 0L; } diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 28deb987b8de..93ed19897841 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -74,7 +74,7 @@ namespace abp virtual bool Close() SAL_OVERRIDE; private: - DECL_LINK( OnCancelClicked, void* ); + DECL_LINK_TYPED( OnCancelClicked, Button*, void ); /** creates a new data source of the type indicated by m_aSettings <p>If another data source has been created before, this one is deleted.</p> diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index 39c0bde0f6e8..b89c33123574 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -82,7 +82,7 @@ namespace abp return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected(); } - IMPL_LINK_NOARG( AdminDialogInvokationPage, OnInvokeAdminDialog ) + IMPL_LINK_NOARG_TYPED( AdminDialogInvokationPage, OnInvokeAdminDialog, Button*, void ) { OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() ); if ( aInvokation.invokeAdministration( AST_LDAP == getSettings().eType ) ) @@ -90,8 +90,6 @@ namespace abp // try to connect to this data source implTryConnect(); } - - return 0L; } } // namespace abp diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index 39d255d4ed78..36153d07f94a 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.hxx @@ -46,7 +46,7 @@ namespace abp virtual bool canAdvance() const SAL_OVERRIDE; private: - DECL_LINK( OnInvokeAdminDialog, void* ); + DECL_LINK_TYPED( OnInvokeAdminDialog, Button*, void ); void implTryConnect(); void implUpdateErrorMessage(); diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index 515c4f4a464d..64180983d3b8 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -78,7 +78,7 @@ namespace abp } - IMPL_LINK_NOARG( FieldMappingPage, OnInvokeDialog ) + IMPL_LINK_NOARG_TYPED( FieldMappingPage, OnInvokeDialog, Button*, void ) { AddressSettings& rSettings = getSettings(); @@ -90,8 +90,6 @@ namespace abp else implUpdateHint(); } - - return 0L; } diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx index 9a4c81a2b7dd..5244ddb9d62d 100644 --- a/extensions/source/abpilot/fieldmappingpage.hxx +++ b/extensions/source/abpilot/fieldmappingpage.hxx @@ -46,7 +46,7 @@ namespace abp virtual void DeactivatePage() SAL_OVERRIDE; private: - DECL_LINK( OnInvokeDialog, void* ); + DECL_LINK_TYPED( OnInvokeDialog, Button*, void ); void implUpdateHint(); }; diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 90bdf31a0ce7..bf2e9b2e02ea 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -133,7 +133,7 @@ namespace abp m_aAllTypes.push_back( ButtonItem( m_pOE, AST_OE, bWithMozilla ) ); m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) ); - Link<> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); + Link<Button*,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { @@ -262,11 +262,10 @@ namespace abp } - IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected ) + IMPL_LINK_NOARG_TYPED( TypeSelectionPage, OnTypeSelected, Button*, void ) { getDialog()->typeSelectionChanged( getSelectedType() ); updateDialogTravelUI(); - return 0L; } diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index b5d4dad096cb..d5f13a880aed 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -81,7 +81,7 @@ namespace abp virtual bool canAdvance() const SAL_OVERRIDE; private: - DECL_LINK( OnTypeSelected, void* ); + DECL_LINK_TYPED( OnTypeSelected, Button*, void ); void selectType( AddressSourceType _eType ); }; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 44c8c9a84745..6a6e44d6d273 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -236,7 +236,7 @@ class MappingDialog_Impl : public ModalDialog - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK(ListBoxSelectHdl, ListBox*); public: @@ -437,7 +437,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox) return 0; } -IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl) +IMPL_LINK_NOARG_TYPED(MappingDialog_Impl, OkHdl, Button*, void) { if(bModified) { @@ -465,7 +465,6 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl) pConfig->SetMapping(aDesc, &aNew); } EndDialog(bModified ? RET_OK : RET_CANCEL); - return 0; } class DBChangeDialog_Impl : public ModalDialog diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 48a27d87348a..3cd5c75fb8e8 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -193,7 +193,7 @@ namespace dbp } - IMPL_LINK( OTableSelectionPage, OnSearchClicked, PushButton*, /*_pButton*/ ) + IMPL_LINK_NOARG_TYPED( OTableSelectionPage, OnSearchClicked, Button*, void ) { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0); @@ -215,7 +215,6 @@ namespace dbp m_pDatasource->SelectEntry(sDataSourceName); LINK(this, OTableSelectionPage, OnListboxSelection).Call(m_pDatasource); } - return 0L; } IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox*, _pBox ) @@ -232,9 +231,6 @@ namespace dbp { // new data source selected implFillTables(); } - else - { - } updateDialogTravelUI(); @@ -416,10 +412,9 @@ namespace dbp implEnableWindows(); } - IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG_TYPED( OMaybeListSelectionPage, OnRadioSelected, Button*, void ) { implEnableWindows(); - return 0L; } diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index d8f3383fb86b..7b8131fb1f00 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -56,7 +56,7 @@ namespace dbp protected: DECL_LINK( OnListboxSelection, ListBox* ); DECL_LINK( OnListboxDoubleClicked, ListBox* ); - DECL_LINK( OnSearchClicked, PushButton* ); + DECL_LINK_TYPED( OnSearchClicked, Button*, void ); void implCollectDatasource(); void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& @@ -79,7 +79,7 @@ namespace dbp virtual void dispose() SAL_OVERRIDE; protected: - DECL_LINK( OnRadioSelected, RadioButton* ); + DECL_LINK_TYPED( OnRadioSelected, Button*, void ); // TabPage overridables void ActivatePage() SAL_OVERRIDE; diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 9b550424c2e2..480b9ec283b6 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -395,7 +395,10 @@ namespace dbp { PushButton* pSimulateButton = m_pExistFields == _pList ? m_pSelectOne : m_pDeselectOne; if (pSimulateButton->IsEnabled()) - return OnMoveOneEntry( pSimulateButton ); + { + OnMoveOneEntry( pSimulateButton ); + return 0; + } else return 1L; } @@ -408,7 +411,7 @@ namespace dbp } - IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, PushButton*, _pButton) + IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveOneEntry, Button*, _pButton, void) { bool bMoveRight = (m_pSelectOne == _pButton); ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields; @@ -459,11 +462,10 @@ namespace dbp } implCheckButtons(); - return 0; } - IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, PushButton*, _pButton) + IMPL_LINK_TYPED(OGridFieldsSelection, OnMoveAllEntries, Button*, _pButton, void) { bool bMoveRight = (m_pSelectAll == _pButton); m_pExistFields->Clear(); @@ -471,7 +473,6 @@ namespace dbp fillListBox(bMoveRight ? *m_pSelFields : *m_pExistFields, getContext().aFieldNames); implCheckButtons(); - return 0; } diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index 1cbb7ebd23cf..89f311b268cc 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -94,8 +94,8 @@ namespace dbp virtual bool canAdvance() const SAL_OVERRIDE; protected: - DECL_LINK(OnMoveOneEntry, PushButton*); - DECL_LINK(OnMoveAllEntries, PushButton*); + DECL_LINK_TYPED(OnMoveOneEntry, Button*, void); + DECL_LINK_TYPED(OnMoveAllEntries, Button*, void); DECL_LINK(OnEntrySelected, ListBox*); DECL_LINK(OnEntryDoubleClicked, ListBox*); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 8cfd5cfd49fd..5faaa92a04b4 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -261,7 +261,7 @@ namespace dbp } - IMPL_LINK( ORadioSelectionPage, OnMoveEntry, PushButton*, _pButton ) + IMPL_LINK_TYPED( ORadioSelectionPage, OnMoveEntry, Button*, _pButton, void ) { bool bMoveLeft = (m_pMoveLeft == _pButton); if (bMoveLeft) @@ -282,7 +282,6 @@ namespace dbp m_pExistingRadios->GrabFocus(); else m_pRadioName->GrabFocus(); - return 0L; } diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index aeae81d10899..453a93dd141a 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -100,7 +100,7 @@ namespace dbp virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; virtual bool canAdvance() const SAL_OVERRIDE; - DECL_LINK( OnMoveEntry, PushButton* ); + DECL_LINK_TYPED( OnMoveEntry, Button*, void ); DECL_LINK( OnEntrySelected, ListBox* ); DECL_LINK( OnNameModified, Edit* ); diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ba8b190b9c15..37bf731a357a 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -478,12 +478,10 @@ namespace pcr } - IMPL_LINK( OBrowserLine, OnButtonClicked, PushButton*, _pButton ) + IMPL_LINK_TYPED( OBrowserLine, OnButtonClicked, Button*, _pButton, void ) { if ( m_pClickListener ) m_pClickListener->buttonClicked( this, _pButton == m_pBrowseButton ); - - return 0L; } diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 35c26523d1bb..c28c7861a775 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -114,7 +114,7 @@ namespace pcr void IndentTitle( bool _bIndent ); private: - DECL_LINK( OnButtonClicked, PushButton* ); + DECL_LINK_TYPED( OnButtonClicked, Button*, void ); DECL_LINK( OnButtonFocus, PushButton* ); void implHideBrowseButton( bool _bPrimary, bool _bReLayout ); diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 7101fe6fee12..1028a0e2cede 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -660,10 +660,9 @@ namespace pcr } - IMPL_LINK_NOARG( FormLinkDialog, OnSuggest ) + IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnSuggest, Button*, void ) { initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns ); - return 0L; } diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 9ce65e8377ce..044432c2bed0 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -86,7 +86,7 @@ namespace pcr virtual short Execute() SAL_OVERRIDE; private: - DECL_LINK( OnSuggest, void* ); + DECL_LINK_TYPED( OnSuggest, Button*, void ); DECL_LINK( OnFieldChanged, FieldLinkRow* ); DECL_LINK( OnInitialize, void* ); diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index cc842f9bca9e..02dbf3b2f17b 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -250,7 +250,7 @@ namespace pcr if (pData) m_xSelectedControl = Reference< XPropertySet > (*static_cast<Reference< XPropertySet > *>(pData)); - m_pNoAssignment->SetClickHdl(Link<>()); + m_pNoAssignment->SetClickHdl(Link<Button*,void>()); m_pNoAssignment->Check(pData == NULL); m_pNoAssignment->SetClickHdl(LINK(this, OSelectLabelDialog, OnNoAssignmentClicked)); @@ -258,7 +258,7 @@ namespace pcr } - IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton) + IMPL_LINK_TYPED(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton, void) { DBG_ASSERT(pButton == m_pNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?"); (void)pButton; @@ -292,8 +292,6 @@ namespace pcr m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); } - - return 0L; } diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 45144c646738..146381112358 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -66,7 +66,7 @@ namespace pcr sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); DECL_LINK(OnEntrySelected, SvTreeListBox*); - DECL_LINK(OnNoAssignmentClicked, Button*); + DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void); }; diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index bdd97c67464c..94d3ee4cd57c 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -1322,10 +1322,9 @@ namespace pcr } - IMPL_LINK( DropDownEditControl, DropDownHdl, PushButton*, /*pPb*/ ) + IMPL_LINK_NOARG_TYPED( DropDownEditControl, DropDownHdl, Button*, void ) { ShowDropDown(!m_bDropdown); - return 0; } diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index c85ef521935c..22edd9703358 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -407,7 +407,7 @@ namespace pcr private: DECL_LINK( ReturnHdl, OMultilineFloatingEdit* ); - DECL_LINK( DropDownHdl, PushButton* ); + DECL_LINK_TYPED( DropDownHdl, Button*, void ); bool ShowDropDown( bool bShow ); }; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index ec114bd3ba4c..c3342d1e36e5 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -224,21 +224,19 @@ namespace pcr } - IMPL_LINK( TabOrderDialog, MoveUpClickHdl, Button*, /*pButton*/ ) + IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveUpClickHdl, Button*, void ) { m_pLB_Controls->MoveSelection( -1 ); - return 0; } - IMPL_LINK( TabOrderDialog, MoveDownClickHdl, Button*, /*pButton*/ ) + IMPL_LINK_NOARG_TYPED( TabOrderDialog, MoveDownClickHdl, Button*, void ) { m_pLB_Controls->MoveSelection( 1 ); - return 0; } - IMPL_LINK( TabOrderDialog, AutoOrderClickHdl, Button*, /*pButton*/ ) + IMPL_LINK_NOARG_TYPED( TabOrderDialog, AutoOrderClickHdl, Button*, void ) { try { @@ -257,12 +255,10 @@ namespace pcr { OSL_FAIL( "TabOrderDialog::AutoOrderClickHdl: caught an exception!" ); } - - return 0; } - IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ ) + IMPL_LINK_NOARG_TYPED( TabOrderDialog, OKClickHdl, Button*, void ) { sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount(); Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount ); @@ -289,7 +285,6 @@ namespace pcr m_xModel->setControlModels( aSortedControlModelSeq ); EndDialog( RET_OK ); - return 0; } diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index f56d4b45bc01..4c6724587b6a 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -83,10 +83,10 @@ namespace pcr ImageList* pImageList; - DECL_LINK( MoveUpClickHdl, Button* ); - DECL_LINK( MoveDownClickHdl, Button* ); - DECL_LINK( AutoOrderClickHdl, Button* ); - DECL_LINK( OKClickHdl, Button* ); + DECL_LINK_TYPED( MoveUpClickHdl, Button*, void ); + DECL_LINK_TYPED( MoveDownClickHdl, Button*, void ); + DECL_LINK_TYPED( AutoOrderClickHdl, Button*, void ); + DECL_LINK_TYPED( OKClickHdl, Button*, void ); void FillList(); Image GetImage( diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 67a47a6e9394..e5d8af874cdd 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -705,14 +705,13 @@ void GridWindow::ChangeMode(int nType) Invalidate(); } -IMPL_LINK( GridDialog, ClickButtonHdl, Button*, pButton ) +IMPL_LINK_TYPED( GridDialog, ClickButtonHdl, Button*, pButton, void ) { if (pButton == m_pResetButton) { int nType = m_pResetTypeBox->GetSelectEntryPos(); m_pGridWindow->ChangeMode(nType); } - return 0; } double* GridDialog::getNewYValues() diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 940dec60097e..be4e239e4dd0 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -44,7 +44,7 @@ class GridDialog : public ModalDialog VclPtr<GridWindow> m_pGridWindow; - DECL_LINK( ClickButtonHdl, Button* ); + DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); public: GridDialog(double* pXValues, double* pYValues, int nValues, diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index f17bbe8b63d1..4895bd7cbfcf 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -607,7 +607,7 @@ void SaneDlg::InitFields() } } -IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) +IMPL_LINK_TYPED( SaneDlg, ClickBtnHdl, Button*, pButton, void ) { if( mrSane.IsOpen() ) { @@ -679,7 +679,6 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton ) mrSane.Close(); EndDialog(); } - return 0; } IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox ) diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 7e689221f037..602bace9bea9 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -80,7 +80,7 @@ private: bool doScan; - DECL_LINK( ClickBtnHdl, Button* ); + DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( ModifyHdl, Edit* ); DECL_LINK( ReloadSaneOptionsHdl, Sane* ); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 43dbec842cfc..8ff8bcf00321 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -303,10 +303,9 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const return NULL; } -IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabDialog, CancelHdl, Button*, void) { EndDialog(); - return 0; } @@ -1291,7 +1290,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen ImplPDFASecurityControl(!pGeneralPage->IsPdfaSelected()); } -IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, Button*, void) { ScopedVclPtrInstance< SfxPasswordDialog > aPwdDialog( this, &msUserPwdTitle ); aPwdDialog->SetMinLen( 0 ); @@ -1318,7 +1317,6 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl) maPreparedOwnerPassword = Sequence< NamedValue >(); } enablePermissionControls(); - return 0; } void ImpPDFTabSecurityPage::enablePermissionControls() @@ -1532,23 +1530,21 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch ) // reset the memory of Launch action present // when PDF/A-1 was requested -IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, Button*, void) { mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked(); mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked(); mbOpnLnksBrowserUserState = m_pRbOpnLnksBrowser->IsChecked(); - return 0; } // reset the memory of a launch action present // when PDF/A-1 was requested -IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl) +IMPL_LINK_NOARG_TYPED(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, Button*, void) { mbOpnLnksDefaultUserState = m_pRbOpnLnksDefault->IsChecked(); mbOpnLnksLaunchUserState = m_pRbOpnLnksLaunch->IsChecked(); mbOpnLnksBrowserUserState = m_pRbOpnLnksBrowser->IsChecked(); - return 0; } ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rErrors) @@ -1683,7 +1679,7 @@ void ImpPDFTabSigningPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect ) +IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertSelect, Button*, void ) { Reference< security::XDocumentDigitalSignatures > xSigner( @@ -1719,11 +1715,9 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertSelect ) if (mpLBSignTSA->GetEntryCount() > 1) mpLBSignTSA->Enable(); } - - return 0; } -IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) +IMPL_LINK_NOARG_TYPED( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void ) { mpEdSignCert->SetText(OUString("")); maSignCertificate.clear(); @@ -1733,8 +1727,6 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) mpEdSignContactInfo->Enable( false ); mpEdSignReason->Enable( false ); mpLBSignTSA->Enable( false ); - - return 0; } diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index ffc8acc10b9d..39f9e78011e0 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -80,7 +80,7 @@ private: Any maSelection; - DECL_LINK(CancelHdl, void *); + DECL_LINK_TYPED(CancelHdl, Button*, void); sal_uInt16 mnSigningPageId; sal_uInt16 mnSecurityPageId; @@ -331,7 +331,7 @@ public: class ImpPDFTabSecurityPage : public SfxTabPage { VclPtr<PushButton> mpPbSetPwd; - OUString msStrSetPwd; + OUString msStrSetPwd; VclPtr<VclContainer> mpUserPwdSet; VclPtr<VclContainer> mpUserPwdUnset; @@ -366,7 +366,7 @@ class ImpPDFTabSecurityPage : public SfxTabPage com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords; - DECL_LINK( ClickmaPbSetPwdHdl, void* ); + DECL_LINK_TYPED( ClickmaPbSetPwdHdl, Button*, void ); void enablePermissionControls(); @@ -388,19 +388,19 @@ public: //class to implement the relative link stuff class ImpPDFTabLinksPage : public SfxTabPage { - VclPtr<CheckBox> m_pCbExprtBmkrToNmDst; - VclPtr<CheckBox> m_pCbOOoToPDFTargets; - VclPtr<CheckBox> m_pCbExportRelativeFsysLinks; + VclPtr<CheckBox> m_pCbExprtBmkrToNmDst; + VclPtr<CheckBox> m_pCbOOoToPDFTargets; + VclPtr<CheckBox> m_pCbExportRelativeFsysLinks; - VclPtr<RadioButton> m_pRbOpnLnksDefault; + VclPtr<RadioButton> m_pRbOpnLnksDefault; bool mbOpnLnksDefaultUserState; - VclPtr<RadioButton> m_pRbOpnLnksLaunch; + VclPtr<RadioButton> m_pRbOpnLnksLaunch; bool mbOpnLnksLaunchUserState; - VclPtr<RadioButton> m_pRbOpnLnksBrowser; + VclPtr<RadioButton> m_pRbOpnLnksBrowser; bool mbOpnLnksBrowserUserState; - DECL_LINK( ClickRbOpnLnksDefaultHdl, void* ); - DECL_LINK( ClickRbOpnLnksBrowserHdl, void* ); + DECL_LINK_TYPED( ClickRbOpnLnksDefaultHdl, Button*, void ); + DECL_LINK_TYPED( ClickRbOpnLnksBrowserHdl, Button*, void ); public: ImpPDFTabLinksPage( vcl::Window* pParent, @@ -430,8 +430,8 @@ class ImpPDFTabSigningPage : public SfxTabPage VclPtr<ListBox> mpLBSignTSA; com::sun::star::uno::Reference< com::sun::star::security::XCertificate > maSignCertificate; - DECL_LINK( ClickmaPbSignCertSelect, void* ); - DECL_LINK( ClickmaPbSignCertClear, void* ); + DECL_LINK_TYPED( ClickmaPbSignCertSelect, Button*, void ); + DECL_LINK_TYPED( ClickmaPbSignCertClear, Button*, void ); public: ImpPDFTabSigningPage( vcl::Window* pParent, diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index c937e3f4029a..8ab238461a80 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -124,7 +124,7 @@ void XMLFilterSettingsDialog::dispose() ModelessDialog::dispose(); } -IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton ) +IMPL_LINK_TYPED(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void ) { m_bIsClosable = false; @@ -158,7 +158,6 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton ) } m_bIsClosable = true; - return 0; } IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl) diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 0e40a14a24f3..c102cf5d79cb 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -91,7 +91,7 @@ public: virtual ~XMLFilterSettingsDialog(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK(ClickHdl_Impl, PushButton * ); + DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); DECL_LINK(SelectionChangedHdl_Impl, void * ); DECL_LINK(DoubleClickHdl_Impl, void * ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 1511f12ba39f..0f63a5858967 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -284,12 +284,10 @@ bool XMLFilterTabDialog::onOk() -IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl) +IMPL_LINK_NOARG_TYPED(XMLFilterTabDialog, OkHdl, Button*, void) { if( onOk() ) EndDialog(1); - - return 0; } diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index a3501e1ceac0..616ec5485816 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -46,7 +46,7 @@ private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl * ); - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); ResMgr& mrResMgr; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index dfcf3afb9736..693e37f27d48 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -154,7 +154,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox* rURLBox ) return aURL; } -IMPL_LINK ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, PushButton *, pButton ) +IMPL_LINK_TYPED ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton, void ) { SvtURLBox* pURLBox; @@ -183,8 +183,6 @@ IMPL_LINK ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, PushButton *, pButton ) SetURL( pURLBox, aURL ); } - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 110ddca6bf7a..6ec26deffedf 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -40,7 +40,7 @@ public: bool FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); - DECL_LINK( ClickBrowseHdl_Impl, PushButton * ); + DECL_LINK_TYPED( ClickBrowseHdl_Impl, Button *, void ); VclPtr<Edit> m_pEDDocType; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 34990328a91c..6ad0844b935d 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -657,7 +657,7 @@ void XMLFilterTestDialog::import( const OUString& rURL ) } } -IMPL_LINK(XMLFilterTestDialog, ClickHdl_Impl, PushButton *, pButton ) +IMPL_LINK_TYPED(XMLFilterTestDialog, ClickHdl_Impl, Button *, pButton, void ) { if (m_pPBExportBrowse == pButton) { @@ -679,8 +679,6 @@ IMPL_LINK(XMLFilterTestDialog, ClickHdl_Impl, PushButton *, pButton ) { Close(); } - - return 0; } /** returns the front most open component that supports the given service */ diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 5f1d86ef8569..56f99483175f 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -44,7 +44,7 @@ public: void updateCurrentDocumentButtonState( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > * pRef = NULL ); private: - DECL_LINK(ClickHdl_Impl, PushButton * ); + DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); void onExportBrowse(); void onExportCurrentDocument(); diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index d6c1e797bc92..0788de46a203 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -100,8 +100,8 @@ private: VclPtr<ArgEdit> pEdArg; VclPtr<RefButton> pRefBtn; - DECL_LINK( FxBtnClickHdl, ImageButton* ); - DECL_LINK( RefBtnClickHdl,RefButton* ); + DECL_LINK_TYPED( FxBtnClickHdl, Button*, void ); + DECL_LINK_TYPED( RefBtnClickHdl,Button*, void ); DECL_LINK( FxBtnFocusHdl, ImageButton* ); DECL_LINK( RefBtnFocusHdl,RefButton* ); DECL_LINK( EdFocusHdl, ArgEdit* ); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 95d112c6b438..6d043230898f 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -125,10 +125,10 @@ public: DECL_LINK( ModifyHdl, ParaWin* ); DECL_LINK( FxHdl, ParaWin* ); - DECL_LINK(MatrixHdl, void *); + DECL_LINK_TYPED(MatrixHdl, Button*, void); DECL_LINK(FormulaHdl, void *); DECL_LINK(FormulaCursorHdl, void *); - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK(DblClkHdl, void *); DECL_LINK(FuncSelHdl, void *); DECL_LINK(StructSelHdl, void *); @@ -1035,7 +1035,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk) } -IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnCancel ) { @@ -1065,9 +1065,6 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) m_pMEFormula->Invalidate(); m_pMEFormula->Update(); } - - - return 0; } @@ -1597,10 +1594,9 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, StructSelHdl) bStructUpdate=true; return 0; } -IMPL_LINK_NOARG(FormulaDlg_Impl, MatrixHdl) +IMPL_LINK_NOARG_TYPED(FormulaDlg_Impl, MatrixHdl, Button*, void) { bUserMatrixFlag=true; - return 0; } IMPL_LINK_NOARG(FormulaDlg_Impl, FuncSelHdl) diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index dc2c1603a314..8763389da9cc 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -294,20 +294,16 @@ void ArgInput::EdModify() aEdModifyLink.Call(this); } -IMPL_LINK( ArgInput, FxBtnClickHdl, ImageButton*, pBtn ) +IMPL_LINK_TYPED( ArgInput, FxBtnClickHdl, Button*, pBtn, void ) { if(pBtn == pBtnFx) FxClick(); - - return 0; } -IMPL_LINK( ArgInput, RefBtnClickHdl,RefButton*, pBtn ) +IMPL_LINK_TYPED( ArgInput, RefBtnClickHdl, Button*, pBtn, void ) { if(pRefBtn == pBtn) RefClick(); - - return 0; } IMPL_LINK( ArgInput, FxBtnFocusHdl, ImageButton*, pBtn ) diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 5b6d33416f85..6d5f8c7479a2 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -140,12 +140,12 @@ void PlacesListBox::RemoveSelectedPlace() { RemovePlace(mpImpl->GetCurrRow()); } -void PlacesListBox::SetAddHdl( const Link<>& rHdl ) +void PlacesListBox::SetAddHdl( const Link<Button*,void>& rHdl ) { mpAddBtn->SetClickHdl( rHdl ); } -void PlacesListBox::SetDelHdl( const Link<>& rHdl ) +void PlacesListBox::SetDelHdl( const Link<Button*,void>& rHdl ) { mpDelBtn->SetClickHdl( rHdl ); } diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 0d2a4742a958..a3f6c0c620ce 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -60,8 +60,8 @@ class PlacesListBox : public Control bool IsUpdated(); const std::vector<PlacePtr>& GetPlaces() { return maPlaces;} - void SetAddHdl( const Link<>& rHdl ); - void SetDelHdl( const Link<>& rHdl ); + void SetAddHdl( const Link<Button*,void>& rHdl ); + void SetDelHdl( const Link<Button*,void>& rHdl ); void SetDelEnabled( bool enabled ); void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; void updateView( ); diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index cf864aff88ef..d448f354b3a1 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -32,7 +32,7 @@ private: VclPtr<VclFrame> m_pNameLine; VclPtr<OKButton> m_pOKBtn; - DECL_LINK( OKHdl, void * ); + DECL_LINK_TYPED( OKHdl, Button*, void ); DECL_LINK( NameHdl, void * ); public: diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 7f2600d8a64e..c0f3a491d786 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -671,7 +671,7 @@ void RemoteFilesDialog::SavePassword( const OUString& rURL, const OUString& rUse {} } -IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl ) +IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void ) { ScopedVclPtrInstance< PlaceEditDialog > aDlg( this ); aDlg->ShowPasswordControl(); @@ -711,8 +711,6 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl ) // Do Nothing break; }; - - return 1; } IMPL_LINK_NOARG ( RemoteFilesDialog, SelectServiceHdl ) @@ -982,7 +980,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, voi OpenURL( pPtr->GetHdlURL() ); } -IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl ) +IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, NewFolderHdl, Button*, void ) { m_pFileView->EndInplaceEditing( false ); @@ -1006,11 +1004,9 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl ) else bHandled = true; } - - return 1; } -IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl ) +IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void ) { OUString sNameNoExt = m_pName_ed->GetText(); OUString sPathNoExt; @@ -1067,7 +1063,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl ) sMsg = sMsg.replaceFirst( "$filename$", sName ); ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO ); if( aBox->Execute() != RET_YES ) - return 0; + return; } } else @@ -1077,18 +1073,17 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl ) OpenURL( sPathNoExt ); m_pName_ed->SetText( "" ); - return 0; + return; } if( m_eMode == REMOTEDLG_MODE_OPEN ) - return 0; + return; } EndDialog( RET_OK ); - return 1; } -IMPL_LINK_NOARG ( RemoteFilesDialog, CancelHdl ) +IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, CancelHdl, Button*, void ) { if( m_pCurrentAsyncAction.is() ) { @@ -1099,7 +1094,6 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, CancelHdl ) { EndDialog(); } - return 1; } // SvtFileDialog_Base diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 223ba5bcf55e..4fef385593cd 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -180,7 +180,7 @@ private: void SavePassword( const OUString& rURL, const OUString& rUser, const OUString& rPassword ); - DECL_LINK ( AddServiceHdl, void * ); + DECL_LINK_TYPED ( AddServiceHdl, Button*, void ); DECL_LINK ( SelectServiceHdl, void * ); DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void ); @@ -198,10 +198,10 @@ private: DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void ); - DECL_LINK( NewFolderHdl, void * ); + DECL_LINK_TYPED( NewFolderHdl, Button*, void ); - DECL_LINK( OkHdl, void * ); - DECL_LINK( CancelHdl, void * ); + DECL_LINK_TYPED( OkHdl, Button*, void ); + DECL_LINK_TYPED( CancelHdl, Button*, void ); }; #endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 65c0d444786d..6b875793a8e9 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -614,7 +614,7 @@ void SvtFileDialog::Init_Impl // Setting preferences of the control elements. _pImp->_pBtnNewFolder->SetClickHdl( LINK( this, SvtFileDialog, NewFolderHdl_Impl ) ); - _pImp->_pBtnFileOpen->SetClickHdl( LINK( this, SvtFileDialog, OpenHdl_Impl ) ); + _pImp->_pBtnFileOpen->SetClickHdl( LINK( this, SvtFileDialog, OpenClickHdl_Impl ) ); _pImp->_pBtnCancel->SetClickHdl( LINK( this, SvtFileDialog, CancelHdl_Impl ) ); _pImp->SetFilterListSelectHdl( LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) ); _pImp->_pEdFileName->SetGetFocusHdl( LINK( this, SvtFileDialog, FileNameGetFocusHdl_Impl ) ); @@ -674,7 +674,7 @@ void SvtFileDialog::Init_Impl Resize(); } -IMPL_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, ) +IMPL_LINK_NOARG_TYPED( SvtFileDialog, NewFolderHdl_Impl, Button*, void) { _pFileView->EndInplaceEditing( false ); @@ -698,8 +698,6 @@ IMPL_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, ) else bHandled = true; } - - return 0; } bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter, bool _bAllowUserDefExt ) @@ -816,7 +814,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter ) } -IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvtFileDialog, CancelHdl_Impl, Button*, void) { if ( m_pCurrentAsyncAction.is() ) { @@ -827,10 +825,13 @@ IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl) { EndDialog(); } - return 1L; } +IMPL_LINK_TYPED( SvtFileDialog, OpenClickHdl_Impl, Button*, pVoid, void ) +{ + OpenHdl_Impl(pVoid); +} IMPL_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) { if ( _pImp->_bMultiSelection && _pFileView->GetSelectionCount() > 1 ) @@ -1253,7 +1254,7 @@ IMPL_LINK_NOARG( SvtFileDialog, URLBoxModifiedHdl_Impl ) -IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl ) +IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void ) { _pFileView->EndInplaceEditing( false ); @@ -1273,13 +1274,11 @@ IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl ) // Do Nothing break; }; - - return 0; } -IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl ) +IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void ) { // Maybe open the PlacesDialog would have been a better idea // there is an ux choice to make we did not make... @@ -1288,15 +1287,13 @@ IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl ) new Place( aURLObj.GetLastName(INetURLObject::DECODE_WITH_CHARSET), OUString(_pFileView->GetViewURL()), true)); _pImp->_pPlaces->AppendPlace(newPlace); - return 0; } -IMPL_LINK_NOARG ( SvtFileDialog, RemovePlacePressed_Hdl ) +IMPL_LINK_NOARG_TYPED ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void ) { _pImp->_pPlaces->RemoveSelectedPlace(); - return 0; } @@ -1549,7 +1546,7 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView ) -IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void) { if ( _pFileNotifier ) _pFileNotifier->notify( CTRL_STATE_CHANGED, @@ -1557,16 +1554,14 @@ IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl) // update the extension of the current file if necessary lcl_autoUpdateFileExtension( this, _pImp->GetCurFilter()->GetExtension() ); - - return 0; } -IMPL_LINK( SvtFileDialog, ClickHdl_Impl, CheckBox*, pCheckBox ) +IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void ) { if ( ! _pFileNotifier ) - return 0; + return; sal_Int16 nId = -1; @@ -1585,19 +1580,15 @@ IMPL_LINK( SvtFileDialog, ClickHdl_Impl, CheckBox*, pCheckBox ) if ( nId != -1 ) _pFileNotifier->notify( CTRL_STATE_CHANGED, nId ); - - return 0; } -IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) { if ( _pFileNotifier ) _pFileNotifier->notify( CTRL_STATE_CHANGED, PUSHBUTTON_PLAY ); - - return 0; } @@ -2860,12 +2851,11 @@ void QueryFolderNameDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl) +IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, OKHdl, Button*, void) { // trim the strings m_pNameEdit->SetText(comphelper::string::strip(m_pNameEdit->GetText(), ' ')); EndDialog( RET_OK ); - return 1; } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 385613926d26..f9950a0c05ea 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -92,18 +92,19 @@ private: DECL_LINK( FilterSelectHdl_Impl, void* ); DECL_LINK_TYPED( FilterSelectTimerHdl_Impl, Timer*, void ); - DECL_LINK( NewFolderHdl_Impl, PushButton* ); + DECL_LINK_TYPED( NewFolderHdl_Impl, Button*, void ); DECL_LINK( OpenHdl_Impl, void* ); - DECL_LINK ( CancelHdl_Impl, void* ); + DECL_LINK_TYPED( OpenClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( CancelHdl_Impl, Button*, void ); DECL_LINK( FileNameGetFocusHdl_Impl, void* ); DECL_LINK( FileNameModifiedHdl_Impl, void* ); DECL_LINK( URLBoxModifiedHdl_Impl, void* ); - DECL_LINK( ConnectToServerPressed_Hdl, void* ); + DECL_LINK_TYPED( ConnectToServerPressed_Hdl, Button*, void ); - DECL_LINK ( AddPlacePressed_Hdl, void* ); - DECL_LINK ( RemovePlacePressed_Hdl, void* ); - DECL_LINK ( Split_Hdl, void* ); + DECL_LINK_TYPED( AddPlacePressed_Hdl, Button*, void ); + DECL_LINK_TYPED( RemovePlacePressed_Hdl, Button*, void ); + DECL_LINK ( Split_Hdl, void* ); void Init_Impl( WinBits nBits ); /** find a filter with the given wildcard @@ -128,9 +129,9 @@ private: DECL_LINK(DblClickHdl_Impl, void *); DECL_LINK(EntrySelectHdl_Impl, void *); DECL_LINK( OpenDoneHdl_Impl, SvtFileView* ); - DECL_LINK(AutoExtensionHdl_Impl, void *); - DECL_LINK( ClickHdl_Impl, CheckBox* ); - DECL_LINK(PlayButtonHdl_Impl, void *); + DECL_LINK_TYPED(AutoExtensionHdl_Impl, Button*, void); + DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED(PlayButtonHdl_Impl, Button*, void); // removes a filter with wildcards from the path and returns it diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 6dc82f44756e..8081dc7f1d98 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -36,6 +36,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 namespace vcl { class Window; } class ResId; class SvxSpellWrapper; +class Button; class AbstractThesaurusDialog : public VclAbstractDialog { @@ -57,13 +58,13 @@ class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog virtual void SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) = 0; virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) = 0; virtual void SetOptionsChangedHdl( const Link<>& _rHdl ) = 0; - virtual void SetIgnoreHdl( const Link<>& _rHdl ) = 0; - virtual void SetIgnoreAllHdl( const Link<>& _rHdl ) = 0; - virtual void SetChangeHdl( const Link<>& _rHdl ) = 0; - virtual void SetChangeAllHdl( const Link<>& _rHdl ) = 0; + virtual void SetIgnoreHdl( const Link<Button*,void>& _rHdl ) = 0; + virtual void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ) = 0; + virtual void SetChangeHdl( const Link<Button*,void>& _rHdl ) = 0; + virtual void SetChangeAllHdl( const Link<Button*,void>& _rHdl ) = 0; virtual void SetClickByCharacterHdl( const Link<>& _rHdl ) = 0; - virtual void SetConversionFormatChangedHdl( const Link<>& _rHdl ) = 0; - virtual void SetFindHdl( const Link<>& _rHdl ) = 0; + virtual void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ) = 0; + virtual void SetFindHdl( const Link<Button*,void>& _rHdl ) = 0; virtual bool GetUseBothDirections() const= 0; virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const = 0; diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 20ca10173822..4287d1df9a2a 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -200,7 +200,7 @@ protected: SingleTabDlgImpl* pImpl; - DECL_DLLPRIVATE_LINK(OKHdl_Impl, void *); + DECL_DLLPRIVATE_LINK_TYPED(OKHdl_Impl, Button*, void); }; #endif diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index 54d2dffa2174..76608286a3fc 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -21,7 +21,7 @@ class SfxCheckinDialog : public ModalDialog VclPtr<OKButton> m_pOKBtn; - DECL_DLLPRIVATE_LINK(OKHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(OKHdl, Button*, void); public: SfxCheckinDialog( vcl::Window* pParent ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 055aa3a0bfb2..2d8ba49c809c 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -207,9 +207,9 @@ private: bool bEnableUseUserData : 1, bHandleDelete : 1; - DECL_LINK(DeleteHdl, void *); - DECL_LINK(SignatureHdl, void *); - DECL_STATIC_LINK(SfxDocumentPage, ChangePassHdl, void *); + DECL_LINK_TYPED(DeleteHdl, Button*, void); + DECL_LINK_TYPED(SignatureHdl, Button*, void); + DECL_STATIC_LINK_TYPED(SfxDocumentPage, ChangePassHdl, Button*, void); void ImplUpdateSignatures(); void ImplCheckPasswordState(); @@ -338,7 +338,7 @@ class CustomPropertiesEditButton : public PushButton public: CustomPropertiesEditButton(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine); - DECL_LINK(ClickHdl, void *); + DECL_LINK_TYPED(ClickHdl, Button*, void); }; class CustomPropertiesRemoveButton : public ImageButton @@ -427,7 +427,7 @@ private: Link<void*,void> m_aRemovedHdl; DECL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox* ); - DECL_LINK( RemoveHdl, CustomPropertiesRemoveButton* ); + DECL_LINK_TYPED( RemoveHdl, Button*, void ); DECL_LINK( EditLoseFocusHdl, CustomPropertiesEdit* ); DECL_LINK( BoxLoseFocusHdl, CustomPropertiesTypeBox* ); //add lose focus handlers of Date/TimeField? @@ -500,7 +500,7 @@ class SfxCustomPropertiesPage : public SfxTabPage private: VclPtr<CustomPropertiesControl> m_pPropertiesCtrl; - DECL_LINK(AddHdl, void *); + DECL_LINK_TYPED(AddHdl, Button*, void); using TabPage::DeactivatePage; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index f42319020d4c..f4bd188e63da 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -63,7 +63,7 @@ class SfxInfoBarWindow : public vcl::Window void addButton(PushButton* pButton); private: - DECL_LINK( CloseHandler, void* ); + DECL_LINK_TYPED( CloseHandler, Button*, void ); }; class SfxInfoBarContainerWindow : public vcl::Window diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index f8f4b5556be6..607833f66af8 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -72,9 +72,9 @@ friend class SfxStyleDialog; DECL_LINK( GetFocusHdl, Edit * ); DECL_LINK( LoseFocusHdl, Edit * ); DECL_LINK( EditStyleSelectHdl_Impl, void * ); - DECL_LINK( EditStyleHdl_Impl, void * ); + DECL_LINK_TYPED( EditStyleHdl_Impl, Button*, void ); DECL_LINK( EditLinkStyleSelectHdl_Impl, void * ); - DECL_LINK( EditLinkStyleHdl_Impl, void * ); + DECL_LINK_TYPED( EditLinkStyleHdl_Impl, Button*, void ); void UpdateName_Impl(ListBox *, const OUString &rNew); void SetDescriptionText_Impl(); diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 1a23a8d78683..61724dfc52aa 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -40,6 +40,7 @@ private: SfxStyleSheetBasePool& rPool; DECL_DLLPRIVATE_LINK( OKHdl, Control * ); + DECL_DLLPRIVATE_LINK_TYPED( OKClickHdl, Button *, void ); DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * ); public: diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 647776241eaa..0998ab06546b 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -77,7 +77,7 @@ private: bool mbAsciiOnly; DECL_DLLPRIVATE_LINK(EditModifyHdl, Edit*); - DECL_DLLPRIVATE_LINK(OKHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(OKHdl, Button *, void); void SetPasswdText(); diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index f969b5ff645f..b876bc4bf480 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -76,9 +76,9 @@ private: DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl, RadioButton* pButton ); DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl, RadioButton* pButton ); - DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl, CheckBox* pBox ); - DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl, CheckBox* pBox ); - DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl, CheckBox* pBox ); + DECL_DLLPRIVATE_LINK_TYPED( ClickReduceTransparencyCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( ClickReduceGradientsCBHdl, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( ClickReduceBitmapsCBHdl, Button*, void ); DECL_DLLPRIVATE_LINK( ToggleReduceGradientsStripesRBHdl, RadioButton* pButton ); DECL_DLLPRIVATE_LINK( ToggleReduceBitmapsResolutionRBHdl, RadioButton* pButton ); diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index 7b5ca737e450..93955c11900b 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -194,13 +194,7 @@ private: SAL_DLLPRIVATE SfxViewFrame& GetViewFrame_Impl() const; SAL_DLLPRIVATE void ShowInfoBars( ); - DECL_LINK( CheckOutHandler, void * ); - - -// private variables - - -private: + DECL_LINK_TYPED( CheckOutHandler, Button*, void ); IMPL_SfxBaseController_DataContainer* m_pData ; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 3dcf7910e464..036f149d8637 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -98,9 +98,9 @@ private: class Item { public: - DECL_LINK(HandleClick, Button*); + DECL_LINK_TYPED(HandleClick, Button*, void); VclPtr<RadioButton> mpButton; - ::rtl::OUString msDeckId; + OUString msDeckId; ::std::function<void (const ::rtl::OUString&rsDeckId)> maDeckActivationFunctor; bool mbIsHidden; bool mbIsHiddenByDefault; @@ -116,7 +116,7 @@ private: void Layout(); void UpdateButtonIcons(); - DECL_LINK(OnToolboxClicked, void*); + DECL_LINK_TYPED(OnToolboxClicked, Button*, void); SidebarController* pParentSidebarController; diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index e837c87d6ae1..5e43ceffb86b 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -31,7 +31,7 @@ class SFX2_DLLPUBLIC SfxStyleDialog: public SfxTabDialog { private: SfxStyleSheetBase* pStyle; - DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); + DECL_DLLPRIVATE_LINK_TYPED( CancelHdl, Button *, void ); sal_uInt16 m_nOrganizerId; protected: virtual void RefreshInputSet() SAL_OVERRIDE; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 719a5995dddd..3f5fa9949501 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -89,13 +89,13 @@ friend class SfxTabDialogController; bool bItemsReset; bool bStandardPushed; - DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * ); - DECL_DLLPRIVATE_LINK_TYPED( DeactivatePageHdl, TabControl *, bool ); - DECL_DLLPRIVATE_LINK(OkHdl, void *); - DECL_DLLPRIVATE_LINK(ResetHdl, void *); - DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *); - DECL_DLLPRIVATE_LINK(UserHdl, void *); - DECL_DLLPRIVATE_LINK(CancelHdl, void *); + DECL_DLLPRIVATE_LINK(ActivatePageHdl, TabControl * ); + DECL_DLLPRIVATE_LINK_TYPED(DeactivatePageHdl, TabControl *, bool ); + DECL_DLLPRIVATE_LINK_TYPED(OkHdl, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(ResetHdl, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(BaseFmtHdl, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(UserHdl, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(CancelHdl, Button*, void); SAL_DLLPRIVATE void Init_Impl(bool bFmtFlag); protected: @@ -201,7 +201,7 @@ public: const SfxItemSet* GetExampleSet() const { return pExampleSet; } SfxItemSet* GetExampleSet() { return pExampleSet; } - void SetApplyHandler(const Link<>& _rHdl); + void SetApplyHandler(const Link<Button*,void>& _rHdl); SAL_DLLPRIVATE void Start_Impl(); diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 026868b6faf9..d1c365ad6bc0 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -127,7 +127,7 @@ public: protected: - DECL_LINK(ShowRootRegionHdl, void*); + DECL_LINK_TYPED(ShowRootRegionHdl, Button*, void); virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx index 97a711c58028..3f665a6cc6e3 100644 --- a/include/sfx2/templateinfodlg.hxx +++ b/include/sfx2/templateinfodlg.hxx @@ -34,7 +34,7 @@ public: protected: - DECL_LINK (CloseHdl, void*); + DECL_LINK_TYPED(CloseHdl, Button*, void); private: diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index c5e844ac31b1..8a70bcafc6a9 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -78,7 +78,7 @@ private: protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - DECL_LINK( SwitchReadOnlyHandler, void * ); + DECL_LINK_TYPED( SwitchReadOnlyHandler, Button*, void ); SAL_DLLPRIVATE void KillDispatcher_Impl(); virtual ~SfxViewFrame(); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 066689ed211e..992c5e8afb45 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -81,8 +81,8 @@ private: void InitDetails( ); void UpdateLabel( ); - DECL_LINK ( OKHdl, Button * ); - DECL_LINK ( DelHdl, Button * ); + DECL_LINK_TYPED ( OKHdl, Button *, void ); + DECL_LINK_TYPED ( DelHdl, Button *, void ); DECL_LINK_TYPED ( EditHdl, DetailsContainer*, void ); DECL_LINK ( ModifyHdl, void* ); DECL_LINK ( SelectTypeHdl, void * ); diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index de35aa7ea68c..6fe3363a0dcb 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -146,7 +146,7 @@ class CmisDetailsContainer : public DetailsContainer private: void selectRepository( ); - DECL_LINK ( RefreshReposHdl, void * ); + DECL_LINK_TYPED ( RefreshReposHdl, Button*, void ); DECL_LINK ( SelectRepoHdl, void * ); }; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 815d57d36468..f7fa977f7a2f 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -127,11 +127,11 @@ namespace svt DECL_LINK(OnFieldScroll, ScrollBar*); DECL_LINK(OnFieldSelect, ListBox*); - DECL_LINK(OnAdministrateDatasources, void*); + DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void); DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*); DECL_LINK(OnComboLoseFocus, ComboBox*); DECL_LINK(OnComboSelect, ComboBox*); - DECL_LINK(OnOkClicked, void*); + DECL_LINK_TYPED(OnOkClicked, Button*, void); DECL_LINK(OnDelayedInitialize, void*); }; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index ef4e48bf4eed..a9546b529a3b 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -37,6 +37,7 @@ class DataChangedEvent; class FloatingWindow; class PushButton; class ImplCFieldFloatWin; +class Button; /************************************************************************* @@ -358,7 +359,7 @@ private: bool mbNone; DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, Calendar*, void ); - DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button*, void ); DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); public: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 262d9c180f4c..62d0aeabbb93 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -302,7 +302,7 @@ namespace svt CheckBox& GetBox() {return *pBox;}; private: - DECL_LINK( OnClick, void* ); + DECL_LINK_TYPED( OnClick, Button*, void ); }; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index f82f67b5155d..c3b58a6c0c76 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -71,7 +71,7 @@ protected: SVT_DLLPRIVATE void GetFocus() SAL_OVERRIDE; SVT_DLLPRIVATE void StateChanged( StateChangedType nType ) SAL_OVERRIDE; SVT_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ButtonHdl, Button*, void ); public: FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = FileControlMode::NONE ); diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index e1ca5db312c6..3c7c5848a788 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -53,7 +53,7 @@ private: SVT_DLLPRIVATE void ImplSetInfo(); - DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplPropertiesHdl, Button*, void ); DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void ); @@ -70,7 +70,7 @@ public: virtual short Execute() SAL_OVERRIDE; - void SetOptionsHdl( const Link<>& rLink ); + void SetOptionsHdl( const Link<Button*,void>& rLink ); }; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 664738fbc857..99539e054ad6 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -260,6 +260,7 @@ carried out over an item resp. over which item the mouse click has been carried out. */ +class Button; // - WinBits - @@ -370,9 +371,9 @@ private: SVT_DLLPRIVATE void ImplPrePaint(vcl::RenderContext& rRenderContext); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); - DECL_DLLPRIVATE_LINK(ImplClickHdl, ImplTabButton*); + DECL_DLLPRIVATE_LINK_TYPED(ImplClickHdl, Button*, void); - DECL_DLLPRIVATE_LINK(ImplAddClickHandler, void*); + DECL_DLLPRIVATE_LINK_TYPED(ImplAddClickHandler, Button*, void); ImplTabBarItem* seek( size_t i ); ImplTabBarItem* prev(); diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 673f3f8717d6..7f6f35992222 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -350,9 +350,9 @@ namespace svt TabPage* GetOrCreatePage( const WizardState i_nState ); private: - DECL_DLLPRIVATE_LINK(OnNextPage, void*); - DECL_DLLPRIVATE_LINK(OnPrevPage, void*); - DECL_DLLPRIVATE_LINK(OnFinish, void*); + DECL_DLLPRIVATE_LINK_TYPED(OnNextPage, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(OnPrevPage, Button*, void); + DECL_DLLPRIVATE_LINK_TYPED(OnFinish, Button*, void); SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index d933405411ad..1d3f33c3f8c8 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -69,7 +69,7 @@ private: DECL_LINK( ToggleCompressionRB, void* ); DECL_LINK( ToggleReduceResolutionRB, void* ); - DECL_LINK( CalculateClickHdl, void* ); + DECL_LINK_TYPED( CalculateClickHdl, Button*, void ); void Update(); void UpdateNewWidthMF(); diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 9a00f6f92801..9bcf102a0365 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -200,11 +200,11 @@ private: bool bModified; DECL_LINK( SelDateHdl, ListBox* ); - DECL_LINK( RowEnableHdl, CheckBox* ); - DECL_LINK( TimeHdl, ImageButton* ); + DECL_LINK_TYPED( RowEnableHdl, Button*, void ); + DECL_LINK_TYPED( TimeHdl, Button*, void ); DECL_LINK( ModifyHdl, void* ); DECL_LINK( ModifyDate, void* ); - DECL_LINK( RefHandle, PushButton* ); + DECL_LINK_TYPED( RefHandle, Button*, void ); protected: @@ -299,7 +299,7 @@ private: bool bEnableRejectAll; bool bEnableUndo; - DECL_LINK( PbClickHdl, PushButton* ); + DECL_LINK_TYPED( PbClickHdl, Button*, void ); public: SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel); diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 669154bdbcb5..80e442ea62de 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -178,7 +178,7 @@ protected: DECL_LINK( InternalInteractiveChange, void*); DECL_LINK( InternalSelectionChange, void*); DECL_LINK( ScrollBarMove, void*); - DECL_LINK( ButtonPress, void*); + DECL_LINK_TYPED( ButtonPress, Button*, void); // initialize local parameters void Init(); diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 778327099501..9d0a688ecf84 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -189,11 +189,11 @@ private: bool bOnly3DChanged; - DECL_LINK( ClickViewTypeHdl, void * ); - DECL_LINK( ClickUpdateHdl, void * ); - DECL_LINK( ClickAssignHdl, void * ); - DECL_LINK( ClickHdl, PushButton * ); - DECL_LINK( ClickColorHdl, PushButton * ); + DECL_LINK_TYPED( ClickViewTypeHdl, Button*, void ); + DECL_LINK_TYPED( ClickUpdateHdl, Button*, void ); + DECL_LINK_TYPED( ClickAssignHdl, Button*, void ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK_TYPED( ClickColorHdl, Button*, void ); DECL_LINK( SelectHdl, void * ); DECL_LINK( ModifyHdl, void * ); void ClickLight(PushButton &rBtn); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index f570f82ea7a7..7ecd2a075801 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -70,7 +70,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog SdrView* mpSdrView; DECL_LINK( DoubleClickFavoriteHdl, void * ); - DECL_LINK( ClickOKHdl, void * ); + DECL_LINK_TYPED( ClickOKHdl, Button*, void ); SdrObject** mppSdrObject; SdrModel* mpDestModel; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 1600c45a5bad..6ff1dfeec8da 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -199,7 +199,7 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: - DECL_LINK(OnClick, Button*); + DECL_LINK_TYPED(OnClick, Button*, void); sal_uInt16 ArrangeControls(); void PositionDataSource(sal_Int32 nRecord); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 78f3b9ef3e9c..7e0b45d31dac 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -94,11 +94,11 @@ protected: bool mbEnableDrawingLayerFillStyles : 1; void InitHandler(); - DECL_LINK( TurnOnHdl, CheckBox*); + DECL_LINK_TYPED( TurnOnHdl, Button*, void); DECL_LINK(DistModify, void *); DECL_LINK(HeightModify, void *); DECL_LINK(BorderModify, void *); - DECL_LINK(BackgroundHdl, void *); + DECL_LINK_TYPED(BackgroundHdl, Button*, void); void UpdateExample(); DECL_LINK(RangeHdl, void *); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 68b8072ebfa0..010e022c9858 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -141,9 +141,9 @@ protected: private: bool bAttrModified; - DECL_LINK( ClickRotateHdl_Impl, void * ); + DECL_LINK_TYPED( ClickRotateHdl_Impl, Button*, void ); DECL_LINK( ChangeDrawHdl_Impl, MetricField * ); - DECL_LINK( ChangeGridsnapHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeGridsnapHdl_Impl, Button*, void ); DECL_LINK( ChangeDivisionHdl_Impl, NumericField * ); }; diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index daeb5928d091..469f0db0b154 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -47,7 +47,7 @@ private: bool bEmpty; - DECL_LINK(ButtonHdl, void *); + DECL_LINK_TYPED(ButtonHdl, Button*, void); DECL_LINK(EditModifyHdl, void *); public: diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 7729ab54449f..3a7cbdbbfbab 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -128,9 +128,9 @@ class SvxRubyDialog : public SfxModelessDialog SfxBindings* pBindings; SvxRubyData_Impl* pImpl; - DECL_LINK(ApplyHdl_Impl, void *); - DECL_LINK(CloseHdl_Impl, void *); - DECL_LINK(StylistHdl_Impl, void *); + DECL_LINK_TYPED(ApplyHdl_Impl, Button*, void); + DECL_LINK_TYPED(CloseHdl_Impl, Button*, void); + DECL_LINK_TYPED(StylistHdl_Impl, Button*, void); DECL_LINK(ScrollHdl_Impl, ScrollBar*); DECL_LINK(PositionHdl_Impl, ListBox*); DECL_LINK(AdjustHdl_Impl, ListBox*); diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 7ddfbf60c3c6..3de80404ff45 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -231,15 +231,17 @@ private: mutable sal_Int32 nTransliterationFlags; DECL_LINK( ModifyHdl_Impl, ComboBox* ); - DECL_LINK( FlagHdl_Impl, Control* ); - DECL_LINK( CommandHdl_Impl, Button* ); - DECL_LINK(TemplateHdl_Impl, void *); + DECL_LINK_TYPED( FlagHdl_Impl, Button*, void ); + DECL_LINK_TYPED( CommandHdl_Impl, Button*, void ); + DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void); DECL_LINK( FocusHdl_Impl, Control* ); + DECL_LINK( LBSelectHdl_Impl, Control* ); DECL_LINK(LoseFocusHdl_Impl, void *); - DECL_LINK(FormatHdl_Impl, void *); - DECL_LINK(NoFormatHdl_Impl, void *); - DECL_LINK(AttributeHdl_Impl, void *); + DECL_LINK_TYPED(FormatHdl_Impl, Button*, void); + DECL_LINK_TYPED(NoFormatHdl_Impl, Button*, void); + DECL_LINK_TYPED(AttributeHdl_Impl, Button*, void); DECL_LINK_TYPED( TimeoutHdl_Impl, Timer*, void ); + void ClickHdl_Impl(void* pCtrl); void Construct_Impl(); void InitControls_Impl(); diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 33b86e93396f..5ab5a50382da 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -29,6 +29,7 @@ struct ImplBtnDlgItem; class PushButton; +class Button; #define BUTTONDIALOG_BUTTON_NOTFOUND ((sal_uInt16)0xFFFF) @@ -95,7 +96,7 @@ private: SAL_DLLPRIVATE void ImplInitButtonDialogData(); SAL_DLLPRIVATE VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags ); SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( sal_uInt16 nId ) const; - DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* pBtn ); + DECL_DLLPRIVATE_LINK_TYPED( ImplClickHdl, Button* pBtn, void ); SAL_DLLPRIVATE void ImplPosControls(); }; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 2c485e4ee508..6dc7a32932d8 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -39,7 +39,7 @@ class VCL_DLLPUBLIC Button : public Control { private: std::unique_ptr<ImplCommonButtonData> mpButtonData; - Link<> maClickHdl; + Link<Button*,void> maClickHdl; /// Command URL (like .uno:Save) in case the button should handle it. OUString maCommand; @@ -69,8 +69,8 @@ public: virtual void Click(); - void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } - const Link<>& GetClickHdl() const { return maClickHdl; } + void SetClickHdl( const Link<Button*,void>& rLink ) { maClickHdl = rLink; } + const Link<Button*,void>& GetClickHdl() const { return maClickHdl; } /// Setup handler for UNO commands so that commands like .uno:Something are handled automagically by this button. void SetCommandHandler(const OUString& aCommand); @@ -94,7 +94,7 @@ public: protected: /// Handler for click, in case we want the button to handle uno commands (.uno:Something). - static sal_IntPtr dispatchCommandHandler(void *, void *pCaller); + DECL_STATIC_LINK_TYPED(Button, dispatchCommandHandler, Button*, void); }; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index b8472efc19e8..d9a643f8f5cd 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -679,7 +679,7 @@ private: std::map< VclPtr<const vcl::Window>, short> m_aResponses; OUString m_sPrimaryString; OUString m_sSecondaryString; - DECL_DLLPRIVATE_LINK(ButtonHdl, Button *); + DECL_DLLPRIVATE_LINK_TYPED(ButtonHdl, Button *, void); void setButtonHandlers(VclButtonBox *pButtonBox); short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 7fcf3598927e..2fceb7b71335 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -187,7 +187,7 @@ OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent m_pListBox->Show(); const OUString sTitle(ModuleRes(RID_STR_INSERT)); m_aInsertButton->SetText(sTitle); - m_aInsertButton->SetClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) ); + m_aInsertButton->SetClickHdl(LINK( this, OAddFieldWindow, OnClickHdl ) ); m_aInsertButton->Show(); m_aFixedLine->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() ); @@ -501,6 +501,11 @@ IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl ) return 0L; } +IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void ) +{ + OnDoubleClickHdl(NULL); +} + IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl ) { if ( m_aCreateLink.IsSet() ) diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 0339327b5b70..d5b04a130688 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -67,7 +67,7 @@ ConditionField::ConditionField(Condition* pParent, Edit* pSubEdit, PushButton *p m_pFormula->SetClickHdl( LINK( this, ConditionField, OnFormula ) ); } -IMPL_LINK( ConditionField, OnFormula, Button*, _pClickedButton ) +IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void ) { OUString sFormula(m_pSubEdit->GetText()); const sal_Int32 nLen = sFormula.getLength(); @@ -83,7 +83,6 @@ IMPL_LINK( ConditionField, OnFormula, Button*, _pClickedButton ) ReportFormula aFormula( sFormula ); m_pSubEdit->SetText(aFormula.getUndecoratedContent()); } - return 0L; } // class SvxColorWindow_Impl -------------------------------------------------- @@ -363,7 +362,7 @@ IMPL_LINK_NOARG_TYPED( Condition, OnFormatAction, ToolBox*, void ) ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),aCol); } -IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton ) +IMPL_LINK_TYPED( Condition, OnConditionAction, Button*, _pClickedButton, void ) { if ( _pClickedButton == m_pMoveUp ) m_rAction.moveConditionUp( getConditionIndex() ); @@ -373,7 +372,6 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton ) m_rAction.addCondition( getConditionIndex() ); else if ( _pClickedButton == m_pRemoveCondition ) m_rAction.deleteCondition( getConditionIndex() ); - return 0L; } void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor) diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index bd2f64036b88..294fd18d1799 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -53,7 +53,7 @@ namespace rptui VclPtr<Edit> m_pSubEdit; VclPtr<PushButton> m_pFormula; - DECL_LINK( OnFormula, Button* ); + DECL_LINK_TYPED( OnFormula, Button*, void ); public: ConditionField(Condition* pParent, Edit* pSubEdit, PushButton *pFormula); void GrabFocus() { m_pSubEdit->GrabFocus(); } @@ -102,7 +102,7 @@ namespace rptui DECL_LINK_TYPED( OnFormatAction, ToolBox*, void ); DECL_LINK_TYPED( DropdownClick, ToolBox*, void ); - DECL_LINK( OnConditionAction, Button* ); + DECL_LINK_TYPED( OnConditionAction, Button*, void ); public: Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ); diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index caad1e3bf1aa..e4a6ba0689fe 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -205,13 +205,11 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,sal_True); } -IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox ) +IMPL_LINK_TYPED( ODateTimeDialog, CBClickHdl, Button*, _pBox, void ) { - (void)_pBox; - - if ( _pBox == m_pDate || _pBox == m_pTime) - { - bool bDate = m_pDate->IsChecked(); + if ( _pBox == m_pDate || _pBox == m_pTime) + { + bool bDate = m_pDate->IsChecked(); bool bTime = m_pTime->IsChecked(); if (!bDate && !bTime) { @@ -222,7 +220,6 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox ) m_pPB_OK->Enable(); } } - return 1L; } sal_Int32 ODateTimeDialog::getFormatKey(bool _bDate) const diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 4fab22fc611c..aeb046382bd4 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -69,7 +69,8 @@ class OAddFieldWindow :public FloatingWindow ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> m_pChangeListener; ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; - DECL_LINK( OnDoubleClickHdl, void* ); + DECL_LINK_TYPED( OnClickHdl, Button*, void ); + DECL_LINK( OnDoubleClickHdl, void* ); DECL_LINK( OnSelectHdl, void* ); DECL_LINK_TYPED( OnSortAction, ToolBox*, void ); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 56c2a1a22eb1..84e3127f8784 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -70,7 +70,7 @@ class ODateTimeDialog : public ModalDialog */ sal_Int32 getFormatKey(bool _bDate) const; - DECL_LINK( CBClickHdl, CheckBox* ); + DECL_LINK_TYPED( CBClickHdl, Button*, void ); ODateTimeDialog(const ODateTimeDialog&) SAL_DELETED_FUNCTION; void operator =(const ODateTimeDialog&) SAL_DELETED_FUNCTION; diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index c49944920c6d..ff9b751c9590 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -326,23 +326,20 @@ void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const pDocShell->PostPaint( maInputRange, PAINT_GRID ); } -IMPL_LINK( ScRandomNumberGeneratorDialog, OkClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, OkClicked, Button*, void ) { ApplyClicked(NULL); CloseClicked(NULL); - return 0; } -IMPL_LINK( ScRandomNumberGeneratorDialog, ApplyClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, ApplyClicked, Button*, void ) { SelectGeneratorAndGenerateNumbers(); - return 0; } -IMPL_LINK( ScRandomNumberGeneratorDialog, CloseClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScRandomNumberGeneratorDialog, CloseClicked, Button*, void ) { Close(); - return 0; } IMPL_LINK( ScRandomNumberGeneratorDialog, GetFocusHandler, Control*, pCtrl ) diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 529e9a91e65e..4afc721cd27d 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -288,11 +288,10 @@ void ScSamplingDialog::PerformSampling() pDocShell->PostPaint(aModifiedRange, PAINT_GRID); } -IMPL_LINK( ScSamplingDialog, OkClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScSamplingDialog, OkClicked, Button*, void ) { PerformSampling(); Close(); - return 0; } IMPL_LINK( ScSamplingDialog, GetFocusHandler, Control*, pCtrl ) diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index 52241feded99..536bdc42a0f6 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -192,11 +192,10 @@ void ScStatisticsInputOutputDialog::SetReference( const ScRange& rReferenceRange mpButtonOk->Disable(); } -IMPL_LINK( ScStatisticsInputOutputDialog, OkClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScStatisticsInputOutputDialog, OkClicked, Button*, void ) { CalculateInputAndWriteToOutput(); Close(); - return 0; } IMPL_LINK( ScStatisticsInputOutputDialog, GetFocusHandler, Control*, pCtrl ) diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index 109fda90d6cc..9b629cfd6245 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -205,11 +205,10 @@ void ScStatisticsTwoVariableDialog::SetReference( const ScRange& rReferenceRange mpButtonOk->Disable(); } -IMPL_LINK( ScStatisticsTwoVariableDialog, OkClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScStatisticsTwoVariableDialog, OkClicked, Button*, void ) { CalculateInputAndWriteToOutput(); Close(); - return 0; } IMPL_LINK( ScStatisticsTwoVariableDialog, GetFocusHandler, Control*, pCtrl ) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 2d50b0b901dc..9601a748b7b5 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1070,7 +1070,7 @@ void ScInputBarGroup::DecrementVerticalSize() } } -IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) +IMPL_LINK_NOARG_TYPED(ScInputBarGroup, ClickHdl, Button*, void) { vcl::Window* w = GetParent(); ScInputWindow* pParent; @@ -1079,7 +1079,7 @@ IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) if (pParent == NULL) { OSL_FAIL("The parent window pointer pParent is null"); - return 1; + return; } if (aMultiTextWnd->GetNumLines() > 1) { @@ -1094,7 +1094,6 @@ IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) // Restore focus to input line(s) if necessary if ( SC_MOD()->GetInputHdl()->IsTopMode() ) aMultiTextWnd->GrabFocus(); - return 0; } void ScInputBarGroup::TriggerToolboxLayout() diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index d75a976303a9..ba339e42ab85 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -159,9 +159,9 @@ SfxTabPage::sfxpg ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } -IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) +IMPL_LINK_TYPED( ScTabPageProtection, ButtonClickHdl, Button*, pBox, void ) { - TriState eState = pBox->GetState(); + TriState eState = static_cast<TriStateBox*>(pBox)->GetState(); if ( eState == TRISTATE_INDET ) bDontCare = true; // everything combined at DontCare else @@ -184,8 +184,6 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) } UpdateButtons(); // TriState and Logic-Enable - - return 0; } void ScTabPageProtection::UpdateButtons() diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index a9fa128d92e5..ba1a7ad6c6a2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1177,7 +1177,7 @@ void ScCheckListMenuWindow::cycleFocus(bool bReverse) maTabStopCtrls[mnCurTabStop]->GrabFocus(); } -IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn ) +IMPL_LINK_TYPED( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void ) { if (pBtn == maBtnOk.get()) close(true); @@ -1191,10 +1191,9 @@ IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn ) selectCurrentMemberOnly(false); CheckHdl(maChecks.get()); } - return 0; } -IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl) +IMPL_LINK_NOARG_TYPED(ScCheckListMenuWindow, TriStateHdl, Button*, void) { switch (mePrevToggleAllState) { @@ -1214,7 +1213,6 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl) } mePrevToggleAllState = maChkToggleAll->GetState(); - return 0; } IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl) diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index cfae7b79c872..348ea068c4eb 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -244,7 +244,7 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData() return pData; } -IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) +IMPL_LINK_NOARG_TYPED( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) { //check that min < max bool bWarn = false; @@ -295,7 +295,6 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl ) { EndDialog(RET_OK); } - return 0; } IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl ) diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 059aaf9df2b4..66b3bf589a8a 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -362,7 +362,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, ListBox*, pBox) return 0; } -IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) +IMPL_LINK_NOARG_TYPED( ScCondFormatList, AddBtnHdl, Button*, void ) { VclPtr<ScCondFrmtEntry> pNewEntry = VclPtr<ScConditionFrmtEntry>::Create(this, mpDoc, mpDialogParent, maPos); maEntries.push_back( pNewEntry ); @@ -373,10 +373,9 @@ IMPL_LINK_NOARG( ScCondFormatList, AddBtnHdl ) mpDialogParent->InvalidateRefData(); pNewEntry->SetActive(); RecalcAll(); - return 0; } -IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl ) +IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void ) { for(EntryContainer::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr) { @@ -389,7 +388,6 @@ IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl ) } mpDialogParent->InvalidateRefData(); RecalcAll(); - return 0; } IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry ) @@ -798,13 +796,12 @@ IMPL_LINK( ScCondFormatDlg, RangeGetFocusHdl, formula::RefEdit*, pEdit ) // ------------------------------------------------------ // Conditional Format Dialog button click event handler. // -IMPL_LINK( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn) +IMPL_LINK_TYPED( ScCondFormatDlg, BtnPressedHdl, Button*, pBtn, void) { if (pBtn == mpBtnOk) OkPressed(); else if (pBtn == mpBtnCancel) CancelPressed(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 4365f946938e..7785c0dd81a0 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1286,7 +1286,7 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl ) return 0; } -IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) +IMPL_LINK_NOARG_TYPED( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void ) { SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(), *maEdDataBarMin.get(), mpDoc, maPos, true); SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc, maPos, true); @@ -1298,7 +1298,6 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc); DataBarTypeSelectHdl(NULL); } - return 0; } ScDateFrmtEntry::ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat ): diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 4b36a95378d1..0b0ab2ed1d80 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -119,7 +119,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* get(m_pBtnEdit, "edit"); m_pBtnRemove->SetClickHdl(LINK(this, ScCondFormatManagerDlg, RemoveBtnHdl)); - m_pBtnEdit->SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); + m_pBtnEdit->SetClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnClickHdl)); m_pBtnAdd->SetClickHdl(LINK(this, ScCondFormatManagerDlg, AddBtnHdl)); m_pCtrlManager->SetDoubleClickHdl(LINK(this, ScCondFormatManagerDlg, EditBtnHdl)); } @@ -155,13 +155,16 @@ ScConditionalFormat* ScCondFormatManagerDlg::GetCondFormatSelected() return m_pCtrlManager->GetSelection(); } -IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, RemoveBtnHdl, Button*, void) { m_pCtrlManager->DeleteSelection(); mbModified = true; - return 0; } +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) +{ + EditBtnHdl(nullptr); +} IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) { ScConditionalFormat* pFormat = m_pCtrlManager->GetSelection(); @@ -174,11 +177,9 @@ IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) return 0; } -IMPL_LINK_NOARG(ScCondFormatManagerDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) { EndDialog( DLG_RET_ADD ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 0512a142a3c5..72589c51c7b4 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -644,17 +644,15 @@ bool ScPivotLayoutDialog::Close() return DoClose( ScPivotLayoutWrapper::GetChildWindowId() ); } -IMPL_LINK( ScPivotLayoutDialog, OKClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, OKClicked, Button*, void ) { ApplyChanges(); Close(); - return 0; } -IMPL_LINK( ScPivotLayoutDialog, CancelClicked, PushButton*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( ScPivotLayoutDialog, CancelClicked, Button*, void ) { Close(); - return 0; } IMPL_LINK(ScPivotLayoutDialog, GetFocusHandler, Control*, pCtrl) diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 17092f568f88..c2cafd34d345 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -363,7 +363,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) return 0; } -IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(ScConsolidateDlg, OkHdl, Button*, void) { sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount(); @@ -419,10 +419,9 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) } else Close(); // no area defined -> Cancel - return 0; } -IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) { if ( pBtn == pBtnCancel ) Close(); @@ -484,7 +483,6 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectEntryPos() ); pBtnRemove->Disable(); } - return 0; } IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 35407ade36b8..b920e3a0a9a0 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -98,10 +98,9 @@ void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName) } } -IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScDataPilotSourceTypeDlg, RadioClickHdl, Button*, pBtn, void ) { m_pLbNamedRange->Enable(pBtn == m_pBtnNamedRange); - return 0; } ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent, diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 8854ecdd082c..4ebe1d0e89e7 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -394,7 +394,7 @@ bool ScDbNameDlg::IsRefInputMode() const // Handler: -IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScDbNameDlg, OkBtnHdl, Button*, void) { AddBtnHdl( 0 ); @@ -408,16 +408,14 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) } Close(); - return 0; } -IMPL_LINK_NOARG(ScDbNameDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScDbNameDlg, CancelBtnHdl, Button*, void) { Close(); - return 0; } -IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScDbNameDlg, AddBtnHdl, Button*, void) { OUString aNewName = comphelper::string::strip(m_pEdName->GetText(), ' '); OUString aNewArea = m_pEdAssign->GetText(); @@ -499,7 +497,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) m_pEdName->GrabFocus(); } } - return 0; } namespace { @@ -517,7 +514,7 @@ public: } -IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) +IMPL_LINK_NOARG_TYPED(ScDbNameDlg, RemoveBtnHdl, Button*, void) { OUString aStrEntry = m_pEdName->GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); @@ -566,7 +563,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) NameModifyHdl( 0 ); } } - return 0; } IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 7bbb0fd80985..0c1a9cefd906 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -92,7 +92,7 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue ) ImplSetValue( fValue ); } -IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton ) +IMPL_LINK_TYPED( ScDPGroupEditHelper, ClickHdl, Button*, pButton, void ) { if( pButton == mpRbAuto ) { @@ -105,7 +105,6 @@ IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton ) mpEdValue->Enable(); mpEdValue->GrabFocus(); } - return 0; } ScDPNumGroupEditHelper::ScDPNumGroupEditHelper( @@ -332,7 +331,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const return nDatePart; } -IMPL_LINK( ScDPDateGroupDlg, ClickHdl, RadioButton*, pButton ) +IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) { if( pButton == mpRbNumDays ) { @@ -351,7 +350,6 @@ IMPL_LINK( ScDPDateGroupDlg, ClickHdl, RadioButton*, pButton ) // disable OK button if no date part selected CheckHdl( mpLbUnits ); } - return 0; } IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox ) diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 3a3cf7a53e6a..23d2a08e6df9 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -707,7 +707,7 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: -IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) +IMPL_LINK_TYPED( ScFilterDlg, EndDlgHdl, Button*, pBtn, void ) { if ( pBtn == pBtnOk ) { @@ -740,8 +740,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { Close(); } - - return 0; } IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) @@ -1023,7 +1021,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } -IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) { // Column headers: // Field list: Columnxx <-> column header string @@ -1057,8 +1055,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) UpdateValueList( 3 ); UpdateValueList( 4 ); } - - return 0; } IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 18f2072731e2..42d25e6dc9ea 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -523,7 +523,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } -IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, void ) { // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren @@ -542,8 +542,6 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) m_pEdVal2->SetText( aCurVal2 ); m_pEdVal3->SetText( aCurVal3 ); } - - return 0; } IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index d728f83b5d5b..3e9c012db054 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -523,10 +523,9 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) ); } -IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScDPSubtotalDlg, RadioClickHdl, Button*, pBtn, void ) { mpLbFunc->Enable( pBtn == mpRbUser ); - return 0; } IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl) @@ -535,7 +534,7 @@ IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl) return 0; } -IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, void ) { if (pBtn == mpBtnOptions) { @@ -543,7 +542,6 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) if( pDlg->Execute() == RET_OK ) pDlg->FillLabelData( maLabelData ); } - return 0; } ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj, @@ -795,13 +793,12 @@ sal_Int32 ScDPSubtotalOptDlg::FindListBoxEntry( return bFound ? nPos : LISTBOX_ENTRY_NOTFOUND; } -IMPL_LINK( ScDPSubtotalOptDlg, RadioClickHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScDPSubtotalOptDlg, RadioClickHdl, Button*, pBtn, void ) { m_pLbSortBy->Enable( pBtn != m_pRbSortMan ); - return 0; } -IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, CheckBox*, pCBox ) +IMPL_LINK_TYPED( ScDPSubtotalOptDlg, CheckHdl, Button*, pCBox, void ) { if (pCBox == m_pCbShow) { @@ -815,7 +812,6 @@ IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, CheckBox*, pCBox ) m_pFtShowUsing->Enable(bEnableUsing); m_pLbShowUsing->Enable(bEnableUsing); } - return 0; } IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 6f1381c8ef18..fe3514d932bd 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -162,7 +162,7 @@ void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& r m_pCbProtect->Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 ); } -IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(ScNewScenarioDlg, OkHdl, Button*, void) { OUString aName = comphelper::string::strip(m_pEdName->GetText(), ' '); ScDocument* pDoc = static_cast<ScTabViewShell*>(SfxViewShell::Current())->GetViewData().GetDocument(); @@ -181,16 +181,14 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) } else EndDialog( RET_OK ); - return 0; //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } -IMPL_LINK( ScNewScenarioDlg, EnableHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( ScNewScenarioDlg, EnableHdl, Button*, pBox, void ) { if (pBox == m_pCbShowFrame) m_pLbColor->Enable( m_pCbShowFrame->IsChecked() ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 3f348769af9d..b45b5d467f6d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -371,16 +371,17 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa pCbTextSep->SetText( sTextSeparators ); Link<> aSeparatorHdl =LINK( this, ScImportAsciiDlg, SeparatorHdl ); + Link<Button*,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); pCbTextSep->SetSelectHdl( aSeparatorHdl ); pCbTextSep->SetModifyHdl( aSeparatorHdl ); - pCkbTab->SetClickHdl( aSeparatorHdl ); - pCkbSemicolon->SetClickHdl( aSeparatorHdl ); - pCkbComma->SetClickHdl( aSeparatorHdl ); - pCkbAsOnce->SetClickHdl( aSeparatorHdl ); - pCkbQuotedAsText->SetClickHdl( aSeparatorHdl ); - pCkbDetectNumber->SetClickHdl( aSeparatorHdl ); - pCkbSpace->SetClickHdl( aSeparatorHdl ); - pCkbOther->SetClickHdl( aSeparatorHdl ); + pCkbTab->SetClickHdl( aSeparatorClickHdl ); + pCkbSemicolon->SetClickHdl( aSeparatorClickHdl ); + pCkbComma->SetClickHdl( aSeparatorClickHdl ); + pCkbAsOnce->SetClickHdl( aSeparatorClickHdl ); + pCkbQuotedAsText->SetClickHdl( aSeparatorClickHdl ); + pCkbDetectNumber->SetClickHdl( aSeparatorClickHdl ); + pCkbSpace->SetClickHdl( aSeparatorClickHdl ); + pCkbOther->SetClickHdl( aSeparatorClickHdl ); pEdOther->SetModifyHdl( aSeparatorHdl ); // *** text encoding ListBox *** @@ -658,7 +659,7 @@ void ScImportAsciiDlg::UpdateVertical() mpDatStream->SetStreamCharSet(meCharSet); } -IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton ) +IMPL_LINK_TYPED( ScImportAsciiDlg, RbSepFixHdl, Button*, pButton, void ) { OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" ); @@ -673,9 +674,12 @@ IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton ) SetupSeparatorCtrls(); } - return 0; } +IMPL_LINK_TYPED( ScImportAsciiDlg, SeparatorClickHdl, Button*, pCtrl, void ) +{ + SeparatorHdl(pCtrl); +} IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl ) { OSL_ENSURE( pCtrl, "ScImportAsciiDlg::SeparatorHdl - missing sender" ); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 8d75619fe006..06d8fea36cd7 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -302,7 +302,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const return nCode; } -IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox ) +IMPL_LINK_TYPED( ScImportOptionsDlg, FixedWidthHdl, Button*, pCheckBox, void ) { if (pCheckBox == m_pCbFixed) { @@ -314,7 +314,6 @@ IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox ) m_pCbShown->Enable( bEnable ); m_pCbQuoteAll->Enable( bEnable ); } - return 0; } IMPL_LINK( ScImportOptionsDlg, DoubleClickHdl, ListBox*, pLb ) diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 08e62128c496..a15b9a670802 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -285,7 +285,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: -IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) +IMPL_LINK_TYPED( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn, void ) { OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" ); @@ -398,7 +398,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { Close(); } - return 0; } IMPL_LINK_TYPED( ScSpecialFilterDlg, TimeOutHdl, Idle*, _pIdle, void ) diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 35848bfdbe23..a5a6d567698f 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -63,7 +63,7 @@ void ScSortWarningDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSortWarningDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == aBtnExtSort ) { @@ -73,7 +73,6 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) { EndDialog( BTN_CURRENT_SELECTION ); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index 9e34ba7e35ae..42593d0e31ac 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -47,13 +47,12 @@ void ScSubTotalDlg::dispose() SfxTabDialog::dispose(); } -IMPL_LINK( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) +IMPL_LINK_TYPED( ScSubTotalDlg, RemoveHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnRemove) { EndDialog( SCRET_REMOVE ); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 9971bb8bc129..900eb07cb22a 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -72,7 +72,7 @@ bool ScTextImportOptionsDlg::isDateConversionSet() const void ScTextImportOptionsDlg::init() { - Link<> aLink = LINK( this, ScTextImportOptionsDlg, OKHdl ); + Link<Button*,void> aLink = LINK( this, ScTextImportOptionsDlg, OKHdl ); m_pBtnOk->SetClickHdl(aLink); aLink = LINK( this, ScTextImportOptionsDlg, RadioHdl ); m_pRbAutomatic->SetClickHdl(aLink); @@ -88,13 +88,12 @@ void ScTextImportOptionsDlg::init() m_pLbCustomLang->Disable(); } -IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScTextImportOptionsDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } -IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScTextImportOptionsDlg, RadioHdl, Button*, pBtn, void ) { if (pBtn == m_pRbAutomatic) { @@ -104,7 +103,6 @@ IMPL_LINK( ScTextImportOptionsDlg, RadioHdl, RadioButton*, pBtn ) { m_pLbCustomLang->Enable(); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index c5336a7c2fd7..176651486f3d 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -847,8 +847,9 @@ void ScTabPageSortOptions::FillUserSortListBox() // Handler: -IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( ScTabPageSortOptions, EnableHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); if (pBox == m_pBtnCopyResult) { if ( pBox->IsChecked() ) @@ -873,7 +874,6 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) else m_pLbSortUser->Disable(); } - return 0; } IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) @@ -891,7 +891,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) return 0; } -IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) +IMPL_LINK_TYPED( ScTabPageSortOptions, SortDirHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnTopDown) { @@ -901,7 +901,6 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) { m_pBtnHeader->SetText( aStrRowLabel ); } - return 0; } void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 25d3ad90d39e..65fb0590005b 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -564,7 +564,7 @@ void ScTpSubTotalOptions::FillUserSortListBox() // Handler: -IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( ScTpSubTotalOptions, CheckHdl, Button*, pBox, void ) { if ( pBox == pBtnSort ) { @@ -599,8 +599,6 @@ IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) else pLbUserDef->Disable(); } - - return 0; } ScTpSubTotalGroup1::~ScTpSubTotalGroup1() diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 40be7f26f420..196223bbca1d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -663,10 +663,9 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) return 0; } -IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) +IMPL_LINK_NOARG_TYPED(ScTPValidationValue, CheckHdl, Button*, void) { m_pCbSort->Enable( m_pCbShow->IsChecked() ); - return 0; } // Input Help Page @@ -841,7 +840,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) return 0L; } -IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) +IMPL_LINK_NOARG_TYPED(ScTPValidationError, ClickSearchHdl, Button*, void) { vcl::Window* pOld = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); @@ -856,8 +855,6 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { m_pEdtTitle->SetText( aScriptURL ); } - - return 0L; } bool ScValidationDlg::EnterRefStatus() diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 0b4d4971206d..5eb86cf9eedf 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -132,7 +132,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, Link<> a2Link=LINK( this, ScFunctionDockWin, SetSelectionHdl); aFuncList->SetDoubleClickHdl(a2Link); aDDFuncList->SetSelectHdl(aLink); - aInsertButton->SetClickHdl(a2Link); + aInsertButton->SetClickHdl(LINK( this, ScFunctionDockWin, SetSelectionClickHdl)); Link<> a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl); aPrivatSplit->SetCtrModifiedHdl(a3Link); @@ -955,6 +955,10 @@ IMPL_LINK( ScFunctionDockWin, SelHdl, ListBox*, pLb ) #* #************************************************************************/ +IMPL_LINK_TYPED( ScFunctionDockWin, SetSelectionClickHdl, Button*, pCtrl, void ) +{ + SetSelectionHdl(pCtrl); +} IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) { if (static_cast<ImageButton *>(pCtrl) == aInsertButton.get() || diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 2449d65b1047..839119f5ad89 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -88,8 +88,8 @@ private: ScAddress::Details maAddressDetails; bool mbDialogLostFocus; - DECL_LINK(CancelClicked, PushButton*); - DECL_LINK(OKClicked, PushButton*); + DECL_LINK_TYPED(CancelClicked, Button*, void); + DECL_LINK_TYPED(OKClicked, Button*, void); DECL_LINK(GetFocusHandler, Control*); DECL_LINK(LoseFocusHandler, void*); DECL_LINK(ToggleSource, void*); diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 045a5726b771..dc751e490431 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -70,9 +70,9 @@ private: void SelectGeneratorAndGenerateNumbers(); - DECL_LINK( OkClicked, PushButton* ); - DECL_LINK( CloseClicked, PushButton* ); - DECL_LINK( ApplyClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); + DECL_LINK_TYPED( CloseClicked, Button*, void ); + DECL_LINK_TYPED( ApplyClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index c98fd7725e20..544475f25a0a 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -72,7 +72,7 @@ private: ScRange PerformRandomSampling(ScDocShell* pDocShell); ScRange PerformPeriodicSampling(ScDocShell* pDocShell); - DECL_LINK( OkClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); DECL_LINK( SamplingSizeValueModified, void* ); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index e41ac800ee80..22a41d751fbb 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -80,7 +80,7 @@ private: void GetRangeFromSelection(); DECL_LINK( GroupByChanged, void* ); - DECL_LINK( OkClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); DECL_LINK( RefInputModifyHandler, void* ); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index ebe8b19ac82a..d02a54e9b00f 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -83,7 +83,7 @@ private: void GetRangeFromSelection(); DECL_LINK( GroupByChanged, void* ); - DECL_LINK( OkClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); DECL_LINK( RefInputModifyHandler, void* ); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index dbc09faa4467..b48233e4e4c4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -75,7 +75,7 @@ private: // Handler: DECL_LINK( Impl_SelectHdl, ListBox* ); DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); - DECL_LINK( Impl_BtnHdl, PushButton* ); + DECL_LINK_TYPED( Impl_BtnHdl, Button*, void ); DECL_LINK( Impl_GetFocusHdl, Control* ); }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 123ca41c9485..ceffe378bc69 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -328,8 +328,8 @@ private: void selectCurrentMemberOnly(bool bSet); void cycleFocus(bool bReverse = false); - DECL_LINK( ButtonHdl, Button* ); - DECL_LINK( TriStateHdl, void* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK_TYPED( TriStateHdl, Button*, void ); DECL_LINK( CheckHdl, SvTreeListBox* ); DECL_LINK( EdModifyHdl, void* ); diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index dd65562828b2..4c125f9689f2 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -48,7 +48,7 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK(OkBtnHdl, void*); + DECL_LINK_TYPED(OkBtnHdl, Button*, void); DECL_LINK(TypeSelectHdl, void*); DECL_LINK(PosSelectHdl, void*); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 531b8c19a3ba..5a6faed4f9da 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -86,8 +86,8 @@ public: ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); - DECL_LINK( AddBtnHdl, void* ); - DECL_LINK( RemoveBtnHdl, void* ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( ScrollHdl, void* ); DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* ); @@ -147,7 +147,7 @@ public: void InvalidateRefData(); - DECL_LINK( BtnPressedHdl, Button* ); + DECL_LINK_TYPED( BtnPressedHdl, Button*, void ); DECL_LINK( RangeGetFocusHdl, formula::RefEdit* ); }; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 5bb04e32721c..814e366f9598 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -242,7 +242,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); - DECL_LINK( OptionBtnHdl, void* ); + DECL_LINK_TYPED( OptionBtnHdl, Button*, void ); DECL_LINK( DataBarTypeSelectHdl, void* ); public: ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index d713383a6ece..a72e6a20c852 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -67,9 +67,10 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK(RemoveBtnHdl, void*); + DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); + DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); + DECL_LINK_TYPED(AddBtnHdl, Button*, void); DECL_LINK(EditBtnHdl, void*); - DECL_LINK(AddBtnHdl, void*); bool mbModified; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 03e6e831b271..0ccea7822fa7 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -152,10 +152,10 @@ private: DECL_LINK( SelectHandle, void* ); DECL_LINK( DeselectHandle, void* ); DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK( KeepMineHandle, void* ); - DECL_LINK( KeepOtherHandle, void* ); - DECL_LINK( KeepAllMineHandle, void* ); - DECL_LINK( KeepAllOthersHandle, void* ); + DECL_LINK_TYPED( KeepMineHandle, Button*, void ); + DECL_LINK_TYPED( KeepOtherHandle, Button*, void ); + DECL_LINK_TYPED( KeepAllMineHandle, Button*, void ); + DECL_LINK_TYPED( KeepAllOthersHandle, Button*, void ); public: ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 0c09811eb3dd..ec532f370422 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -91,8 +91,8 @@ private: void FillAreaLists (); bool VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK( OkHdl, void* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK_TYPED( OkHdl, Button*, void ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( ModifyHdl, formula::RefEdit* ); DECL_LINK( SelectHdl, ListBox* ); diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index cc0b941e7da2..a3969d775612 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> m_pBtnCols; VclPtr<OKButton> m_pBtnOk; - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index f23f5dd51d7e..a8f4a7174460 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -77,14 +77,14 @@ private: void UpdateRangeData ( const ScRange& rRange, bool bColName ); void SetColRowData( const ScRange& rLabelRange, bool bRef=false); void AdjustColRowData( const ScRange& rDataRange, bool bRef=false); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( OkBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void * ); - DECL_LINK( RemoveBtnHdl, void * ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( Range1SelectHdl, void * ); DECL_LINK( Range1DataModifyHdl, void * ); - DECL_LINK( ColClickHdl, void * ); - DECL_LINK( RowClickHdl, void * ); + DECL_LINK_TYPED( ColClickHdl, Button*, void ); + DECL_LINK_TYPED( RowClickHdl, Button*, void ); DECL_LINK( Range2DataModifyHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index fb85f0e47687..2d5047c75bc4 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -47,7 +47,7 @@ public: void AppendNamedRange(const OUString& rNames); private: - DECL_LINK( RadioClickHdl, RadioButton * ); + DECL_LINK_TYPED( RadioClickHdl, Button *, void ); }; class ScDataPilotServiceDlg : public ModalDialog diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 762b0cd5d761..7bd344a63334 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -63,13 +63,13 @@ private: void SetButtonState(); // Handler: - DECL_LINK(Impl_NewHdl, void *); - DECL_LINK(Impl_PrevHdl, void *); - DECL_LINK(Impl_NextHdl, void *); + DECL_LINK_TYPED(Impl_NewHdl, Button*, void); + DECL_LINK_TYPED(Impl_PrevHdl, Button*, void); + DECL_LINK_TYPED(Impl_NextHdl, Button*, void); - DECL_LINK(Impl_RestoreHdl, void *); - DECL_LINK(Impl_DeleteHdl, void *); - DECL_LINK(Impl_CloseHdl, void *); + DECL_LINK_TYPED(Impl_RestoreHdl, Button*, void); + DECL_LINK_TYPED(Impl_DeleteHdl, Button*, void); + DECL_LINK_TYPED(Impl_CloseHdl, Button*, void); DECL_LINK(Impl_ScrollHdl, void *); DECL_LINK( Impl_DataModifyHdl, Edit* ); diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index 0b8bf8c38966..a81dbd18ed5b 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -46,8 +46,9 @@ class DataStreamDlg : public ModalDialog VclPtr<VclFrame> m_pVclFrameLimit; VclPtr<VclFrame> m_pVclFrameMove; + DECL_LINK_TYPED(UpdateClickHdl, Button*, void); DECL_LINK(UpdateHdl, void *); - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); void UpdateEnable(); ScRange GetStartRange(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 68154228fb02..3476cd18caf4 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -91,10 +91,10 @@ private: void UpdateDBData( const OUString& rStrName ); void SetInfoStrings( const ScDBData* pDBData ); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( OkBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void * ); - DECL_LINK( RemoveBtnHdl, void * ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( NameModifyHdl, void * ); DECL_LINK( AssModifyHdl, void * ); }; diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index a2741a6448a5..ea1bf0cbd2ab 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -43,7 +43,7 @@ private: static InsertDeleteFlags nPreviousChecks; void DisableChecks( bool bDelAllChecked = true ); - DECL_LINK( DelAllHdl, void * ); + DECL_LINK_TYPED( DelAllHdl, Button*, void ); public: ScDeleteContentsDlg( vcl::Window* pParent, diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 3ba0db194083..21d48bb6aebe 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -46,7 +46,7 @@ private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; - DECL_LINK( ClickHdl, RadioButton* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbAuto; @@ -119,7 +119,7 @@ public: sal_Int32 GetDatePart() const; private: - DECL_LINK( ClickHdl, RadioButton* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK( CheckHdl, SvxCheckListBox* ); private: diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index a3450cfc4133..f2ca572b2888 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -82,6 +82,7 @@ private: void UseSplitterInitPos(); DECL_LINK( SetSelectionHdl, void* ); + DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void ); DECL_LINK( SelHdl, ListBox* ); DECL_LINK(SetSplitHdl,ScPrivatSplit*); DECL_LINK_TYPED( TimerHdl, Idle*, void ); diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 70a2d086bb45..96d3b5961631 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -101,8 +101,8 @@ private: bool CheckIncrementVal(); bool CheckEndVal(); - DECL_LINK( OKHdl, void * ); - DECL_LINK( DisableHdl, Button * ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( DisableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILLDLG_HXX diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index ceb6b0a60b49..af30de6f8803 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -148,8 +148,8 @@ private: // Handler: DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); + DECL_LINK_TYPED( EndDlgHdl, Button*, void ); DECL_LINK( ScrollHdl, void* ); DECL_LINK( MoreExpandedHdl, void* ); @@ -216,7 +216,7 @@ private: // Handler DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK_TYPED( EndDlgHdl, Button*, void ); // Hack: RefInput control DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index b867d251f96e..2192e60f7717 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -61,8 +61,8 @@ private: void Init(); DECL_LINK( RefHandle, SvxTPFilter* ); - DECL_LINK(HighlightHandle, CheckBox*); - DECL_LINK(OKBtnHdl, PushButton*); + DECL_LINK_TYPED(HighlightHandle, Button*, void); + DECL_LINK_TYPED(OKBtnHdl, Button*, void); protected: diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index a09ddba9aaad..05ce58b5794e 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -226,7 +226,7 @@ private: VclPtr<ImageButton> aButton; VclPtr<ScrollBar> aScrollBar; long nVertOffset; - DECL_LINK( ClickHdl, void* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK( Impl_ScrollHdl, void* ); }; diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 65ea1d9d5f6f..4c68cb053243 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -100,9 +100,9 @@ private: void TestModes(); // Handler - DECL_LINK( InsAllHdl, void* ); - DECL_LINK( LinkBtnHdl, void* ); - DECL_LINK( ShortCutHdl, PushButton* ); + DECL_LINK_TYPED( InsAllHdl, Button*, void ); + DECL_LINK_TYPED( LinkBtnHdl, Button*, void ); + DECL_LINK_TYPED( ShortCutHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index f80a634d2c21..647512aa07d7 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -91,11 +91,11 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK(BrowseHdl_Impl, void *); - DECL_LINK(ChoiceHdl_Impl, void *); + DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); + DECL_LINK_TYPED(ChoiceHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(CountHdl_Impl, void *); - DECL_LINK(DoEnterHdl, void *); + DECL_LINK_TYPED(DoEnterHdl, Button*, void); DECL_LINK_TYPED(BrowseTimeoutHdl, Timer *, void); DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index c985d4ddce8c..610ea8c3d8d7 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -51,9 +51,9 @@ private: SfxObjectShellRef aSourceRef; DECL_LINK(FileHdl, void *); - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); DECL_LINK(RangeHdl, void *); - DECL_LINK(ReloadHdl, void *); + DECL_LINK_TYPED(ReloadHdl, Button*, void); DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); void UpdateSourceRanges(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 72b106fd3504..bb15971e2282 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -49,7 +49,7 @@ private: long nDefaultValue; long nCurrentValue; - DECL_LINK(SetDefValHdl, void *); + DECL_LINK_TYPED(SetDefValHdl, Button*, void); DECL_LINK(ModifyHdl, void *); }; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index fa3e5ed2a051..1512f9db2778 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -75,7 +75,7 @@ private: void Init (); void InitDocListBox (); - DECL_LINK( OkHdl, void * ); + DECL_LINK_TYPED( OkHdl, Button*, void ); DECL_LINK( SelHdl, ListBox * ); DECL_LINK( CheckBtnHdl, void * ); DECL_LINK( CheckNameHdl, Edit * ); diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index acdb9ed31e52..94c3bfc55d9a 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -64,8 +64,8 @@ private: bool IsNameValid(); bool IsFormulaValid(); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void* ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); DECL_LINK( NameModifyHdl, void* ); DECL_LINK( AssignGetFocusHdl, void * ); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 5b6edb18fec1..dd125914360b 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -100,10 +100,10 @@ private: void SelectionChanged(); // Handler: - DECL_LINK( OkBtnHdl, void * ); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void * ); - DECL_LINK( RemoveBtnHdl, void * ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( EdModifyHdl, void * ); DECL_LINK( AssignGetFocusHdl, void * ); DECL_LINK( SelectionChangedHdl_Impl, void* ); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index a71a95b23e9c..3e22bcb9add9 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -34,7 +34,7 @@ class ScDocShell; class ScNamePasteDlg : public ModalDialog { - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); private: VclPtr<PushButton> m_pBtnPasteAll; diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index d48d78da49a2..8f452cd650b7 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -189,11 +189,11 @@ private: bool FindTimeout( sal_Int32& rTimeout ); void ShowError( bool bCondition, formula::RefEdit* pFocus ); - DECL_LINK( BtnHdl, PushButton* ); - DECL_LINK( DelBtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK_TYPED( DelBtnHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); - DECL_LINK(ScrollHdl, void *); + DECL_LINK( ScrollHdl, void *); DECL_LINK( CursorUpHdl, ScCursorRefEdit* ); DECL_LINK( CursorDownHdl, ScCursorRefEdit* ); DECL_LINK( CondModifyHdl, void* ); @@ -230,7 +230,7 @@ class ScSolverSuccessDialog : public ModalDialog VclPtr<PushButton> m_pBtnOk; VclPtr<PushButton> m_pBtnCancel; - DECL_LINK(ClickHdl, PushButton*); + DECL_LINK_TYPED(ClickHdl, Button*, void); public: ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index c2272b311c76..07480b3d3187 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -92,7 +92,7 @@ private: // Handler: DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 32a0b724c466..145704a3c974 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -64,8 +64,8 @@ private: OUString m_aSelectLockedCells; OUString m_aSelectUnlockedCells; - DECL_LINK( OKHdl, void* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK( PasswordModifyHdl, void* ); }; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index bfebea6b8439..06710d492bdd 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -112,8 +112,8 @@ private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); DECL_LINK(DblClickHdl, void *); - DECL_LINK( RadioClickHdl, RadioButton* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK_TYPED( RadioClickHdl, Button* , void); + DECL_LINK_TYPED( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbNone; @@ -151,8 +151,8 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindListBoxEntry( const ListBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK( RadioClickHdl, RadioButton* ); - DECL_LINK( CheckHdl, CheckBox* ); + DECL_LINK_TYPED( RadioClickHdl, Button*, void ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); DECL_LINK( SelectHdl, ListBox* ); private: diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 8c746c1438f0..19cc33ebec57 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -85,8 +85,8 @@ private: OUString maTextHashGood; OUString maTextHashRegen; - DECL_LINK( OKHdl, void* ); - DECL_LINK( RetypeBtnHdl, PushButton* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( RetypeBtnHdl, Button*, void ); struct TableItem { @@ -131,9 +131,9 @@ private: VclPtr<RadioButton> m_pBtnRemovePassword; - DECL_LINK( OKHdl, void* ); - DECL_LINK( RadioBtnHdl, RadioButton* ); - DECL_LINK( CheckBoxHdl, void* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( RadioBtnHdl, Button*, void ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK( PasswordModifyHdl, void* ); ScPassHashProtectable* mpProtected; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 96bc48d9add2..ce5779f4b8e1 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -51,8 +51,8 @@ private: const OUString aDefScenarioName; bool bIsEdit; - DECL_LINK(OkHdl, void *); - DECL_LINK( EnableHdl, CheckBox * ); + DECL_LINK_TYPED( OkHdl, Button*, void); + DECL_LINK_TYPED( EnableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index c05237a49984..e86785f782aa 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -102,8 +102,9 @@ private: DECL_LINK( CharSetHdl, SvxTextEncodingBox* ); DECL_LINK( FirstRowHdl, NumericField* ); - DECL_LINK( RbSepFixHdl, RadioButton* ); + DECL_LINK_TYPED( RbSepFixHdl, Button*, void ); DECL_LINK( SeparatorHdl, Control* ); + DECL_LINK_TYPED( SeparatorClickHdl, Button*, void ); DECL_LINK( LbColTypeHdl, ListBox* ); DECL_LINK(UpdateTextHdl, void *); DECL_LINK( ColTypeHdl, ScCsvTableBox* ); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 10bfe1f98752..ac0c8ca0dbc4 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -62,13 +62,13 @@ private: void Init (); void UpdateChecks (); - DECL_LINK( CheckHdl, Button * ); - DECL_LINK( AddHdl, void * ); - DECL_LINK( RemoveHdl, void * ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK_TYPED( AddHdl, Button*, void ); + DECL_LINK_TYPED( RemoveHdl, Button*, void ); DECL_LINK( SelFmtHdl, void * ); - DECL_LINK( CloseHdl, PushButton * ); + DECL_LINK_TYPED( CloseHdl, Button *, void ); DECL_LINK( DblClkHdl, void * ); - DECL_LINK( RenameHdl, void *); + DECL_LINK_TYPED( RenameHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 348d27878dae..890d84da0e2c 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -61,7 +61,7 @@ private: private: sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; - DECL_LINK( FixedWidthHdl, CheckBox* ); + DECL_LINK_TYPED( FixedWidthHdl, Button*, void ); DECL_LINK( DoubleClickHdl, ListBox* ); }; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 3fddc293ddad..127767f531f3 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -98,7 +98,7 @@ private: static bool IsDateEntry(EditTextObject* pTextObj); static bool IsExtFileNameEntry(EditTextObject* pTextObj); DECL_LINK( ListHdl_Impl, ListBox* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton* ); }; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index ca290c49de56..47c320217c35 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -56,8 +56,8 @@ private: void Init(); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( OkBtnHdl, void * ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 28e557e08b3f..db7926f9afab 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -48,7 +48,7 @@ class ScSolverOptionsDialog : public ModalDialog DECL_LINK( EngineSelectHdl, void* ); DECL_LINK( SettingsSelHdl, void* ); DECL_LINK( SettingsDoubleClickHdl, void* ); - DECL_LINK( ButtonHdl, PushButton* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); void ReadFromComponent(); void FillListBox(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 253067a20d95..f937d8fecaf3 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -80,7 +80,7 @@ private: bool CheckTargetValue( const OUString& rStrVal ); void RaiseError( ScSolverErr eError ); - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); }; diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index c514aaffd8e9..65492a0b0e84 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -47,7 +47,7 @@ public: ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); virtual ~ScSortWarningDlg(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); private: VclPtr<FixedText> aFtText; VclPtr<PushButton> aBtnExtSort; diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 749e9d94dfcb..2dd41dcb4291 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -32,7 +32,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: VclPtr<PushButton> m_pBtnRemove; - DECL_LINK( RemoveHdl, PushButton * ); + DECL_LINK_TYPED( RemoveHdl, Button *, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SUBTDLG_HXX diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 122f112c068b..b0576cac3332 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -64,7 +64,7 @@ private: void FillColorValueSets_Impl(); DECL_LINK(TabBgColorDblClickHdl_Impl, void *); - DECL_LINK(TabBgColorOKHdl_Impl, void *); + DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 33c247f7cfcd..fb1e1d2081a4 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -87,7 +87,7 @@ private: void Init(); void RaiseError( ScTabOpErr eError ); - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); }; diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 999c52a0b0bf..7ab302b7abac 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -59,7 +59,7 @@ private: bool bHidePrint; // Handler: - DECL_LINK( ButtonClickHdl, TriStateBox* ); + DECL_LINK_TYPED( ButtonClickHdl, Button*, void ); void UpdateButtons(); }; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index d7c8a5dec970..4eda9235c23f 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -50,9 +50,9 @@ private: VclPtr<CheckBox> m_pBtnConvertDate; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK( RadioHdl, RadioButton* ); + DECL_LINK_TYPED( RadioHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 0b27e75b27b6..9a51172ec4f1 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -67,16 +67,16 @@ private: VclPtr<FixedText> m_pFtPrec; VclPtr<NumericField> m_pEdPrec; - ScDocOptions* pOldOptions; - ScDocOptions* pLocalOptions; - sal_uInt16 nWhichCalc; + ScDocOptions* pOldOptions; + ScDocOptions* pLocalOptions; + sal_uInt16 nWhichCalc; private: void Init(); // Handler: - DECL_LINK( RadioClickHdl, RadioButton* ); - DECL_LINK( CheckClickHdl, CheckBox* ); + DECL_LINK_TYPED( RadioClickHdl, Button*, void ); + DECL_LINK_TYPED( CheckClickHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index a3175b8ee1fd..1024c7dcb878 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -52,7 +52,7 @@ private: bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; - DECL_LINK( ButtonHdl, Button* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); DECL_LINK( SepModifyHdl, Edit* ); DECL_LINK( SepEditOnFocusHdl, Edit* ); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 9f5c8a599a23..9933947fb837 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -53,9 +53,9 @@ private: sal_uInt16 nPageUsage; VclPtr<ScStyleDlg> pStyleDlg; - DECL_LINK(BtnHdl, void *); + DECL_LINK_TYPED(BtnHdl, Button*, void); DECL_LINK( HFEditHdl, void* ); - DECL_LINK(TurnOnHdl, void *); + DECL_LINK_TYPED(TurnOnHdl, Button*, void); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 0aa944192ba9..d642b2bea328 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -164,10 +164,10 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK( EnableHdl, CheckBox * ); + DECL_LINK_TYPED( EnableHdl, Button*, void ); DECL_LINK( SelOutPosHdl, ListBox * ); void EdOutPosModHdl ( Edit* pEd ); - DECL_LINK( SortDirHdl, RadioButton * ); + DECL_LINK_TYPED( SortDirHdl, Button *, void ); DECL_LINK( FillAlgorHdl, void * ); }; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 3295262e33b2..f31b635b51e5 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -158,7 +158,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK( CheckHdl, CheckBox * ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 46042b854896..a7babb368e2a 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -73,8 +73,8 @@ private: private: // Handler: - DECL_LINK(PageDirHdl, void *); - DECL_LINK( PageNoHdl, CheckBox* ); + DECL_LINK_TYPED(PageDirHdl, Button*, void); + DECL_LINK_TYPED( PageNoHdl, Button*, void ); DECL_LINK(ScaleHdl, void *); }; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 2a4c28ffc77f..8195c7d45c23 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -96,7 +96,7 @@ private: // Handler: DECL_LINK( LbSelectHdl, ListBox* ); - DECL_LINK( BtnClickHdl, PushButton* ); + DECL_LINK_TYPED( BtnClickHdl, Button*, void ); DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* ); }; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 2dc3667ae9ab..96d1e1b7acbe 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -63,7 +63,7 @@ class ScTpContentOptions : public SfxTabPage void InitGridOpt(); DECL_LINK( GridHdl, ListBox* ); DECL_LINK( SelLbObjHdl, ListBox* ); - DECL_LINK( CBHdl, CheckBox* ); + DECL_LINK_TYPED( CBHdl, Button*, void ); ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); @@ -107,7 +107,7 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; DECL_LINK(MetricHdl, void *); - DECL_LINK( AlignHdl, CheckBox* ); + DECL_LINK_TYPED( AlignHdl, Button*, void ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index d050942fb8bb..00a66ac50927 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -101,7 +101,7 @@ private: void SetSecondFormula( const OUString& rFmlaStr ); DECL_LINK(SelectHdl, void *); - DECL_LINK(CheckHdl, void *); + DECL_LINK_TYPED(CheckHdl, Button*, void); VclPtr<ListBox> m_pLbAllow; VclPtr<CheckBox> m_pCbAllow; /// Allow blank cells. @@ -299,7 +299,7 @@ private: // Handler ------------------------ DECL_LINK(SelectActionHdl, void *); - DECL_LINK(ClickSearchHdl, void *); + DECL_LINK_TYPED(ClickSearchHdl, Button*, void); public: ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 1bc0c375c936..44c6d7ebc3c1 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -95,7 +95,7 @@ private: void RefEditModified(); DECL_LINK(GetFocusHdl, Control*); - DECL_LINK(BtnPressedHdl, Button*); + DECL_LINK_TYPED(BtnPressedHdl, Button*, void); DECL_LINK(TreeItemSelectHdl, void*); DECL_LINK(RefModifiedHdl, void*); }; diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 23704b345a29..907938dc27db 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -653,32 +653,24 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) EndDialog( RET_OK ); } -IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepMineHandle, Button*, void) { KeepHandler( true ); - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepOtherHandle, Button*, void) { KeepHandler( false ); - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllMineHandle, Button*, void) { KeepAllHandler( true ); - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, KeepAllOthersHandle, Button*, void) { KeepAllHandler( false ); - - return 0; } void ScConflictsDlg::UpdateView() diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index f4dbff4623f5..2fc9fe903231 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -59,10 +59,9 @@ void ScColOrRowDlg::dispose() } -IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(ScColOrRowDlg, OkHdl, Button*, void) { EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 8d7c3f7fe52e..fa24392796b8 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -500,7 +500,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const // handler called when OK is clicked, calls the add button handler before // passing the range lists to the document -IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, OkBtnHdl, Button*, void) { AddBtnHdl( 0 ); @@ -514,17 +514,15 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) pDocShell->SetDocumentModified(); Close(); - return 0; } -IMPL_LINK_NOARG(ScColRowNameRangesDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, CancelBtnHdl, Button*, void) { Close(); - return 0; } // handler called when add button clicked: set ranges and add to listbox -IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) { OUString aNewArea( pEdAssign->GetText() ); OUString aNewData( pEdAssign2->GetText() ); @@ -577,10 +575,9 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) pEdAssign2->GrabFocus(); } } - return 0; } -IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { OUString aRangeStr = pLbRange->GetSelectEntry(); sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos(); @@ -588,7 +585,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) (reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol); NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); if (itr == aRangeMap.end()) - return 0; + return; const ScRange& rRange = itr->second; ScRangePair* pPair = NULL; @@ -638,7 +635,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) Range1SelectHdl( 0 ); } } - return 0; } // handler called when a row in the listbox is selected, updates form input fields @@ -768,7 +764,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) } // handler for the radio button for columns, adjust ranges -IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, ColClickHdl, Button*, void) { if ( !pBtnColHead->GetSavedValue() ) { @@ -785,11 +781,10 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) aRange.aEnd.SetRow( MAXROW ); AdjustColRowData( aRange ); } - return 0; } // handler for the radio button for columns, adjust range -IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) +IMPL_LINK_NOARG_TYPED(ScColRowNameRangesDlg, RowClickHdl, Button*, void) { if ( !pBtnRowHead->GetSavedValue() ) { @@ -806,7 +801,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) aRange.aEnd.SetCol( MAXCOL ); AdjustColRowData( aRange ); } - return 0; } IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 5b1d6c8f2d6f..4eb2c94bb2ec 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -258,7 +258,7 @@ IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NewHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -289,10 +289,9 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl) pDocSh->PostPaintGridAll(); } } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_PrevHdl, Button*, void) { if (pDoc) { @@ -302,10 +301,9 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl) SetButtonState(); FillCtrls(nCurrentRow); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_NextHdl, Button*, void) { if (pDoc) { @@ -315,19 +313,17 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl) SetButtonState(); FillCtrls(nCurrentRow); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_RestoreHdl, Button*, void) { if (pDoc) { FillCtrls(nCurrentRow); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_DeleteHdl, Button*, void) { ScViewData& rViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -344,13 +340,11 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl) pDocSh->SetDocumentModified(); pDocSh->PostPaintGridAll(); } - return 0; } -IMPL_LINK_NOARG(ScDataFormDlg, Impl_CloseHdl) +IMPL_LINK_NOARG_TYPED(ScDataFormDlg, Impl_CloseHdl, Button*, void) { EndDialog( ); - return 0; } IMPL_LINK_NOARG(ScDataFormDlg, Impl_ScrollHdl) diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 7f6c826a46de..5ba0bd1b6af0 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -40,13 +40,13 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent) get(m_pVclFrameMove, "framemove"); m_pCbUrl->SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); - m_pRBAddressValue->SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); + m_pRBAddressValue->SetClickHdl( LINK( this, DataStreamDlg, UpdateClickHdl ) ); m_pRBAddressValue->Enable(false); m_pRBScriptData->Enable(false); m_pRBDirectData->Hide(); m_pRBScriptData->Hide(); m_pRBNoMove->Hide(); - m_pRBValuesInLine->SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); + m_pRBValuesInLine->SetClickHdl( LINK( this, DataStreamDlg, UpdateClickHdl ) ); m_pEdRange->SetModifyHdl( LINK( this, DataStreamDlg, UpdateHdl ) ); m_pBtnBrowse->SetClickHdl( LINK( this, DataStreamDlg, BrowseHdl ) ); UpdateEnable(); @@ -79,17 +79,20 @@ void DataStreamDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(DataStreamDlg, BrowseHdl) +IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void) { sfx2::FileDialogHelper aFileDialog(0, 0); if ( aFileDialog.Execute() != ERRCODE_NONE ) - return 0; + return; m_pCbUrl->SetText( aFileDialog.GetPath() ); UpdateEnable(); - return 0; } +IMPL_LINK_NOARG_TYPED(DataStreamDlg, UpdateClickHdl, Button*, void) +{ + UpdateEnable(); +} IMPL_LINK_NOARG(DataStreamDlg, UpdateHdl) { UpdateEnable(); diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 3ebd534f0e86..3ab1ecb854f4 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -150,11 +150,9 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } -IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl) +IMPL_LINK_NOARG_TYPED(ScDeleteContentsDlg, DelAllHdl, Button*, void) { DisableChecks( aBtnDelAll->IsChecked() ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 73244b6304e8..a254a0ee8aa8 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -251,7 +251,7 @@ bool ScFillSeriesDlg::CheckEndVal() // Handler: -IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) +IMPL_LINK_TYPED( ScFillSeriesDlg, DisableHdl, Button *, pBtn, void ) { if ( pBtn == m_pBtnDate ) { @@ -284,10 +284,9 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) m_pFtEndVal->Disable(); m_pEdEndVal->Disable(); } - return 0; } -IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScFillSeriesDlg, OKHdl, Button*, void) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; else if ( m_pBtnRight->IsChecked() ) theFillDir = FILL_TO_RIGHT; @@ -328,8 +327,6 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) ScopedVclPtr<MessageDialog>::Create(this, aErrMsgInvalidVal)->Execute(); pEdWrong->GrabFocus(); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index b9d893f301f4..d59aec06a6cb 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -183,7 +183,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const return m_pEdAssign->IsVisible(); } -IMPL_LINK( ScHighlightChgDlg, HighlightHandle, CheckBox*, pCb ) +IMPL_LINK_TYPED( ScHighlightChgDlg, HighlightHandle, Button*, pCb, void ) { if(pCb!=NULL) { @@ -200,7 +200,6 @@ IMPL_LINK( ScHighlightChgDlg, HighlightHandle, CheckBox*, pCb ) m_pCbReject->Disable(); } } - return 0; } IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) @@ -217,7 +216,7 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) return 0; } -IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) +IMPL_LINK_TYPED( ScHighlightChgDlg, OKBtnHdl, Button*, pOKBtn, void ) { if (pOKBtn == m_pOkButton) { @@ -246,7 +245,6 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) pViewData->GetDocShell()->PostPaintGridAll(); Close(); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 0b3357e9e814..9a7922a03821 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -306,7 +306,7 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } } -IMPL_LINK( ScInsertContentsDlg, ShortCutHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnShortCutPasteValuesOnly ) { @@ -341,22 +341,17 @@ IMPL_LINK( ScInsertContentsDlg, ShortCutHdl, PushButton*, pBtn ) nShortCutMoveMode = INS_NONE; EndDialog(RET_OK); } - return 0; } -IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) +IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, InsAllHdl, Button*, void) { DisableChecks( mpBtnInsAll->IsChecked() ); - - return 0; } -IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScInsertContentsDlg, LinkBtnHdl, Button*, void) { TestModes(); - - return 0; } ScInsertContentsDlg::~ScInsertContentsDlg() diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 11d0458a3ec0..8cef9ad6f2d6 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -268,7 +268,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) return 0; } -IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, ChoiceHdl_Impl, Button*, void) { if ( m_pBtnNew->IsChecked() ) SetNewTable_Impl(); @@ -276,16 +276,14 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) SetFromTo_Impl(); DoEnable_Impl(); - return 0; } -IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseHdl_Impl, Button*, void) { delete pDocInserter; pDocInserter = new ::sfx2::DocumentInserter( OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg, DialogClosedHdl ) ); - return 0; } IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) @@ -302,7 +300,7 @@ void ScInsertTableDlg::DoEnable_Impl() m_pBtnOk->Disable(); } -IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, DoEnterHdl, Button*, void) { if(nTableCount > 1 || ScDocument::ValidTabName(m_pEdName->GetText())) { @@ -313,7 +311,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) OUString aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); (void)ScopedVclPtrInstance<MessageDialog>::Create(this, aErrMsg)->Execute(); } - return 0; } IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 3b0d426b7b0f..246cac6e3a0c 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -95,13 +95,12 @@ short ScLinkedAreaDlg::Execute() #define FILTERNAME_HTML "HTML (StarCalc)" #define FILTERNAME_QUERY "calc_HTML_WebQuery" -IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) +IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, BrowseHdl, Button*, void) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( OUString::createFromAscii( ScDocShell::Factory().GetShortName() ) ); pDocInserter->StartExecuteModal( LINK( this, ScLinkedAreaDlg, DialogClosedHdl ) ); - return 0; } IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) @@ -204,10 +203,9 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl) return 0; } -IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl) +IMPL_LINK_NOARG_TYPED(ScLinkedAreaDlg, ReloadHdl, Button*, void) { UpdateEnable(); - return 0; } IMPL_LINK_TYPED( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index f59a36cb22b2..92c39f599d66 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -96,7 +96,7 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const // Handler: -IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) +IMPL_LINK_NOARG_TYPED(ScMetricInputDlg, SetDefValHdl, Button*, void) { if ( m_pBtnDefVal->IsChecked() ) { @@ -105,7 +105,6 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) } else m_pEdValue->SetValue( nCurrentValue ); - return 0; } IMPL_LINK_NOARG(ScMetricInputDlg, ModifyHdl) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 4359e1b9f8d2..6840c5297d0e 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -263,7 +263,7 @@ IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) return 0; } -IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(ScMoveTableDlg, OkHdl, Button*, void) { sal_uInt16 nDocSel = pLbDoc->GetSelectEntryPos(); sal_uInt16 nDocLast = pLbDoc->GetEntryCount()-1; @@ -294,8 +294,6 @@ IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) } EndDialog( RET_OK ); - - return 0; } IMPL_LINK( ScMoveTableDlg, SelHdl, ListBox *, pLb ) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 2cb6a11f967e..60cdf3df92cb 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -120,13 +120,12 @@ void ScSolverSuccessDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) EndDialog(RET_OK); else EndDialog(); - return 0; } ScCursorRefEdit::ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel ) @@ -600,7 +599,7 @@ bool ScOptSolverDlg::IsRefInputMode() const // Handler: -IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScOptSolverDlg, BtnHdl, Button*, pBtn, void ) { if ( pBtn == m_pBtnSolve || pBtn == m_pBtnCancel ) { @@ -640,8 +639,6 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) maProperties = pOptDlg->GetProperties(); } } - - return 0; } IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) @@ -679,7 +676,7 @@ IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) return 0; } -IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScOptSolverDlg, DelBtnHdl, Button*, pBtn, void ) { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) if( pBtn == mpDelButton[nRow] ) @@ -703,8 +700,6 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) } } } - - return 0; } IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 826689fe5392..eac9eac93291 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -89,13 +89,11 @@ void ScTableProtectionDlg::WriteData(ScTableProtection& rData) const void ScTableProtectionDlg::Init() { - Link<> aLink = LINK( this, ScTableProtectionDlg, CheckBoxHdl ); - m_pBtnProtect->SetClickHdl(aLink); + m_pBtnProtect->SetClickHdl(LINK( this, ScTableProtectionDlg, CheckBoxHdl )); - aLink = LINK( this, ScTableProtectionDlg, OKHdl ); - m_pBtnOk->SetClickHdl(aLink); + m_pBtnOk->SetClickHdl(LINK( this, ScTableProtectionDlg, OKHdl )); - aLink = LINK( this, ScTableProtectionDlg, PasswordModifyHdl ); + Link<> aLink = LINK( this, ScTableProtectionDlg, PasswordModifyHdl ); m_pPassword1Edit->SetModifyHdl(aLink); m_pPassword2Edit->SetModifyHdl(aLink); @@ -122,7 +120,7 @@ void ScTableProtectionDlg::EnableOptionalWidgets(bool bEnable) m_pOptionsListBox->Invalidate(); } -IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, CheckBox*, pBtn ) +IMPL_LINK_TYPED( ScTableProtectionDlg, CheckBoxHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnProtect) { @@ -130,14 +128,11 @@ IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, CheckBox*, pBtn ) EnableOptionalWidgets(bChecked); m_pBtnOk->Enable(bChecked); } - - return 0; } -IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScTableProtectionDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 662a2a9fcef9..639f74744d80 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -153,7 +153,7 @@ void ScRetypePassDlg::WriteNewDataToDocument(ScDocument& rDoc) const void ScRetypePassDlg::Init() { - Link<> aLink = LINK( this, ScRetypePassDlg, OKHdl ); + Link<Button*,void> aLink = LINK( this, ScRetypePassDlg, OKHdl ); mpBtnOk->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassDlg, RetypeBtnHdl ); @@ -263,13 +263,12 @@ void ScRetypePassDlg::CheckHashStatus() mpBtnOk->Disable(); } -IMPL_LINK_NOARG(ScRetypePassDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } -IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, void ) { ScPassHashProtectable* pProtected = NULL; if (pBtn == mpBtnRetypeDoc) @@ -289,7 +288,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) if (!pProtected) // What the ... !? - return 0; + return; ScopedVclPtrInstance< ScRetypePassInputDlg > aDlg(this, pProtected); if (aDlg->Execute() == RET_OK) @@ -310,7 +309,6 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) SetDocData(); CheckHashStatus(); } - return 0; } ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected) @@ -363,16 +361,16 @@ OUString ScRetypePassInputDlg::GetNewPassword() const void ScRetypePassInputDlg::Init() { - Link<> aLink = LINK( this, ScRetypePassInputDlg, OKHdl ); + Link<Button*,void> aLink = LINK( this, ScRetypePassInputDlg, OKHdl ); m_pBtnOk->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassInputDlg, RadioBtnHdl ); m_pBtnRetypePassword->SetClickHdl(aLink); m_pBtnRemovePassword->SetClickHdl(aLink); aLink = LINK( this, ScRetypePassInputDlg, CheckBoxHdl ); m_pBtnMatchOldPass->SetClickHdl(aLink); - aLink = LINK( this, ScRetypePassInputDlg, PasswordModifyHdl ); - m_pPassword1Edit->SetModifyHdl(aLink); - m_pPassword2Edit->SetModifyHdl(aLink); + Link<> aLink2 = LINK( this, ScRetypePassInputDlg, PasswordModifyHdl ); + m_pPassword1Edit->SetModifyHdl(aLink2); + m_pPassword2Edit->SetModifyHdl(aLink2); m_pBtnOk->Disable(); m_pBtnRetypePassword->Check(); @@ -416,13 +414,12 @@ void ScRetypePassInputDlg::CheckPasswordInput() m_pBtnOk->Enable(bPassGood); } -IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } -IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScRetypePassInputDlg, RadioBtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnRetypePassword) { @@ -436,14 +433,11 @@ IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, RadioButton*, pBtn ) m_pPasswordGrid->Disable(); m_pBtnOk->Enable(); } - - return 0; } -IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl) +IMPL_LINK_NOARG_TYPED(ScRetypePassInputDlg, CheckBoxHdl, Button*, void) { CheckPasswordInput(); - return 0; } IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index fb7f9ffafe4d..f12eab8a8af0 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -163,7 +163,7 @@ void ScAutoFormatDlg::UpdateChecks() // Handler: -IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) +IMPL_LINK_TYPED( ScAutoFormatDlg, CloseHdl, Button *, pBtn, void ) { if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) { @@ -172,7 +172,6 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) EndDialog( (pBtn == m_pBtnOk) ? RET_OK : RET_CANCEL ); } - return 0; } IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl) @@ -184,7 +183,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl) return 0; } -IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) +IMPL_LINK_TYPED( ScAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(); @@ -209,11 +208,9 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) } m_pWndPreview->NotifyChange( pData ); - - return 0; } -IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) +IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, AddHdl, Button*, void) { if ( !bFmtInserted && pSelFmtData ) { @@ -279,11 +276,9 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) bOk = true; } } - - return 0; } -IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) +IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RemoveHdl, Button*, void) { if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) { @@ -317,11 +312,9 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) } SelFmtHdl( 0 ); - - return 0; } -IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) +IMPL_LINK_NOARG_TYPED(ScAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -400,8 +393,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) else bOk = true; } - - return 0; } IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 429b84a6140a..c6e121abaa86 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -190,7 +190,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) // Handler: -IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, OkBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); @@ -198,10 +198,9 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) Link<> aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); - return 0; } -IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScSimpleRefDlg, CancelBtnHdl, Button*, void) { bAutoReOpen=false; OUString aResult=m_pEdAssign->GetText(); @@ -209,7 +208,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) Link<> aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 66446d5d54cd..b539260f396a 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -350,12 +350,10 @@ void ScSolverOptionsDialog::EditOption() } } -IMPL_LINK( ScSolverOptionsDialog, ButtonHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnEdit) EditOption(); - - return 0; } IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl) diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 09d0fa1cea88..ff37302b9658 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -199,7 +199,7 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) // Handler: -IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScSolverDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -253,8 +253,6 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) { Close(); } - - return 0; } IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 56541ae00c71..337cf71762f5 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -129,16 +129,13 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) return 0; } -IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) -{ - // Handler, called when the OK button is pushed - +IMPL_LINK_NOARG_TYPED(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void) +{ sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId(); Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : Color( COL_AUTO ); m_aTabBgColor = aColor; EndDialog( RET_OK ); - return 0; } ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle) diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 5ff6903d29f2..dd74ab0e431a 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -244,7 +244,7 @@ static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, // Handler: -IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScTabOpDlg, BtnHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnOk) { @@ -320,8 +320,6 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) } else if (pBtn == m_pBtnCancel) Close(); - - return 0; } IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 0f80368c5377..9eafd5f40209 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -327,16 +327,14 @@ void ScNameDefDlg::SetActive() RefInputDone(); } -IMPL_LINK_NOARG(ScNameDefDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScNameDefDlg, CancelBtnHdl, Button*, void) { CancelPushed(); - return 0; } -IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScNameDefDlg, AddBtnHdl, Button*, void) { AddPushed(); - return 0; }; IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 3b1aa06e89ab..63ae44dca41a 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -483,27 +483,24 @@ void ScNameDlg::GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap) maRangeMap.swap(rRangeMap); } -IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(ScNameDlg, OkBtnHdl, Button*, void) { Close(); - return 0; } -IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl) +IMPL_LINK_NOARG_TYPED(ScNameDlg, CancelBtnHdl, Button*, void) { CancelPushed(); - return 0; } -IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl) +IMPL_LINK_NOARG_TYPED(ScNameDlg, AddBtnHdl, Button*, void) { - return long(AddPushed()); + AddPushed(); } -IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl) +IMPL_LINK_NOARG_TYPED(ScNameDlg, RemoveBtnHdl, Button*, void) { RemovePushed(); - return 0; } IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 5f0c238327ef..7b64fed12108 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -77,7 +77,7 @@ void ScNamePasteDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) +IMPL_LINK_TYPED( ScNamePasteDlg, ButtonHdl, Button *, pButton, void ) { if( pButton == m_pBtnPasteAll ) { @@ -97,7 +97,6 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) { EndDialog( BTN_PASTE_CLOSE ); } - return 0; } std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 912a09897d53..8349ed374125 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -192,10 +192,9 @@ void ScCalcOptionsDialog::SelectedDeviceChanged() #endif } -IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, CheckBox*, pCheckBox ) +IMPL_LINK_TYPED(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void ) { - maConfig.mbEmptyStringAsZero = pCheckBox->IsChecked(); - return 0; + maConfig.mbEmptyStringAsZero = static_cast<CheckBox*>(pCheckBox)->IsChecked(); } IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox*, pConv ) @@ -230,10 +229,9 @@ IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox*, pSyntax) return 0; } -IMPL_LINK(ScCalcOptionsDialog, CBUseOpenCLHdl, CheckBox*, pCheckBox) +IMPL_LINK_TYPED(ScCalcOptionsDialog, CBUseOpenCLHdl, Button*, pCheckBox, void) { - maConfig.mbOpenCLSubsetOnly = pCheckBox->IsChecked(); - return 0; + maConfig.mbOpenCLSubsetOnly = static_cast<CheckBox*>(pCheckBox)->IsChecked(); } IMPL_LINK(ScCalcOptionsDialog, SpinOpenCLMinSizeHdl, NumericField*, pSpin) @@ -691,8 +689,7 @@ struct Reduction : Op } -IMPL_STATIC_LINK( - ScCalcOptionsDialog, TestClickHdl, PushButton*, pButton) +IMPL_STATIC_LINK_TYPED(ScCalcOptionsDialog, TestClickHdl, Button*, pButton, void) { pButton->Disable(); @@ -821,8 +818,6 @@ IMPL_STATIC_LINK( xTestDocument->mpDoc->CalcAll(); ScInterpreter::SetGlobalConfig(xTestDocument->maOldCalcConfig); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index ff29e4bd9f6d..633762e6b253 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -41,11 +41,11 @@ public: DECL_LINK( BtnAutomaticSelectHdl, void* ); DECL_LINK( DeviceSelHdl, void* ); DECL_LINK( EditModifiedHdl, Edit * ); - DECL_STATIC_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton* ); - DECL_LINK( AsZeroModifiedHdl, CheckBox*); + DECL_STATIC_LINK_TYPED( ScCalcOptionsDialog, TestClickHdl, Button*, void ); + DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void); DECL_LINK( ConversionModifiedHdl, ListBox*); DECL_LINK( SyntaxModifiedHdl, ListBox*); - DECL_LINK( CBUseOpenCLHdl, CheckBox*); + DECL_LINK_TYPED( CBUseOpenCLHdl, Button*, void); DECL_LINK( SpinOpenCLMinSizeHdl, NumericField*); const ScCalcConfig& GetConfig() const { return maConfig;} diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index a3fad625889e..8073d3735ba5 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -206,7 +206,7 @@ SfxTabPage::sfxpg ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) // Handler: -IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( ScTpCalcOptions, RadioClickHdl, Button*, pBtn, void ) { if (pBtn == m_pBtnDateStd) { @@ -220,12 +220,11 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) { pLocalOptions->SetDate( 1, 1, 1904 ); } - - return 0; } -IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) +IMPL_LINK_TYPED( ScTpCalcOptions, CheckClickHdl, Button*, p, void ) { + CheckBox* pBtn = static_cast<CheckBox*>(p); if (pBtn == m_pBtnGeneralPrec) { if (pBtn->IsChecked()) @@ -254,8 +253,6 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) m_pFtEps->Disable(); m_pEdEps->Disable(); } } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 255d71a31754..7201fb855306 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -58,13 +58,13 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString()); mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString()); - Link<> aLink = LINK( this, ScTpFormulaOptions, ButtonHdl ); - mpBtnSepReset->SetClickHdl(aLink); - mpBtnCustomCalcDefault->SetClickHdl(aLink); - mpBtnCustomCalcCustom->SetClickHdl(aLink); - mpBtnCustomCalcDetails->SetClickHdl(aLink); + Link<Button*,void> aLink2 = LINK( this, ScTpFormulaOptions, ButtonHdl ); + mpBtnSepReset->SetClickHdl(aLink2); + mpBtnCustomCalcDefault->SetClickHdl(aLink2); + mpBtnCustomCalcCustom->SetClickHdl(aLink2); + mpBtnCustomCalcDetails->SetClickHdl(aLink2); - aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl ); + Link<> aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl ); mpEdSepFuncArg->SetModifyHdl(aLink); mpEdSepArrayCol->SetModifyHdl(aLink); mpEdSepArrayRow->SetModifyHdl(aLink); @@ -195,7 +195,7 @@ bool ScTpFormulaOptions::IsValidSeparatorSet() const return true; } -IMPL_LINK( ScTpFormulaOptions, ButtonHdl, Button*, pBtn ) +IMPL_LINK_TYPED( ScTpFormulaOptions, ButtonHdl, Button*, pBtn, void ) { if (pBtn == mpBtnSepReset) ResetSeparators(); @@ -205,8 +205,6 @@ IMPL_LINK( ScTpFormulaOptions, ButtonHdl, Button*, pBtn ) UpdateCustomCalcRadioButtons(false); else if (pBtn == mpBtnCustomCalcDetails) LaunchCustomCalcSettings(); - - return 0; } IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, Edit*, pEdit ) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index c2668e43cfa1..3b8de0f93041 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -480,7 +480,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) return 0; } -IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) { if ( pBtn == mpBtnNew || pBtn == mpBtnDiscard ) { @@ -660,7 +660,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) else if ( pViewData && (pBtn == mpBtnCopy) ) { if ( bCopyDone ) - return 0; + return; ScRefAddress theStartPos; ScRefAddress theEndPos; @@ -708,8 +708,6 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) mpEdCopyFrom->SetSelection( Selection( 0, SELECTION_MAX ) ); } } - - return 0; } IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index c1ba49adc89d..8c69bb17d017 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -75,7 +75,7 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent, pDrawLB-> SetSelectHdl(aSelObjHdl); pGridLB-> SetSelectHdl( LINK( this, ScTpContentOptions, GridHdl ) ); - Link<> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) ); + Link<Button*, void> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) ); pFormulaCB ->SetClickHdl(aCBHdl); pNilCB ->SetClickHdl(aCBHdl); pAnnotCB ->SetClickHdl(aCBHdl); @@ -260,10 +260,10 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox*, pLb ) return 0; } -IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) +IMPL_LINK_TYPED( ScTpContentOptions, CBHdl, Button*, pBtn, void ) { ScViewOption eOption = VOPT_FORMULAS; - bool bChecked = pBtn->IsChecked(); + bool bChecked = static_cast<CheckBox*>(pBtn)->IsChecked(); if ( pFormulaCB == pBtn ) eOption = VOPT_FORMULAS; else if ( pNilCB == pBtn ) eOption = VOPT_NULLVALS; @@ -280,8 +280,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) else if ( pRowColHeaderCB == pBtn ) eOption = VOPT_HEADER; pLocalOptions->SetOption( eOption, bChecked ); - - return 0; } void ScTpContentOptions::InitGridOpt() @@ -698,10 +696,9 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl) return 0; } -IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( ScTpLayoutOptions, AlignHdl, Button*, pBox, void ) { - m_pAlignLB->Enable(pBox->IsChecked()); - return 0; + m_pAlignLB->Enable(static_cast<CheckBox*>(pBox)->IsChecked()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 82f5260f7d17..c2095e176a75 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -465,7 +465,7 @@ void ScPrintAreasDlg::Impl_FillLists() // Handler: -IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) { if ( pBtnOk == pBtn ) { @@ -511,8 +511,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) } else if ( pBtnCancel == pBtn ) Close(); - - return 0; } IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 1a14789a8b4c..38dd1ce3835e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -795,11 +795,11 @@ IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox*, pList ) return 0; } -IMPL_LINK( ScHFEditPage, ClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) { pActiveEdWnd = ::GetScEditWindow(); if ( !pActiveEdWnd ) - return 0; + return; if ( pBtn == m_pBtnText ) { @@ -824,8 +824,6 @@ IMPL_LINK( ScHFEditPage, ClickHdl, PushButton*, pBtn ) } InsertToDefinedList(); pActiveEdWnd->GrabFocus(); - - return 0; } IMPL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 8575607d6e48..c091636f4847 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -147,7 +147,7 @@ void ScHFPage::DeactivatePage() // Handler: -IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) +IMPL_LINK_NOARG_TYPED(ScHFPage, TurnOnHdl, Button*, void) { SvxHFPage::TurnOnHdl( m_pTurnOnBox ); @@ -155,18 +155,15 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) m_pBtnEdit->Enable(); else m_pBtnEdit->Disable(); - - return 0; } -IMPL_LINK_NOARG(ScHFPage, BtnHdl) +IMPL_LINK_NOARG_TYPED(ScHFPage, BtnHdl, Button*, void) { // When the Edit-Dialog is directly called from the Button's Click-Handler, // the GrabFocus from the Edit-Dialog under OS/2 doesn't work.(Bug #41805#). // With the new StarView, this workaround should be again considered! Application::PostUserEvent( LINK( this, ScHFPage, HFEditHdl ), NULL, true ); - return 0; } IMPL_LINK_NOARG(ScHFPage, HFEditHdl) diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 685e288796ed..f65472fd8405 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -359,13 +359,12 @@ void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) // Handler: -IMPL_LINK_NOARG(ScTablePage, PageDirHdl) +IMPL_LINK_NOARG_TYPED(ScTablePage, PageDirHdl, Button*, void) { ShowImage(); - return 0; } -IMPL_LINK( ScTablePage, PageNoHdl, CheckBox*, pBtn ) +IMPL_LINK_TYPED( ScTablePage, PageNoHdl, Button*, pBtn, void ) { if ( m_pBtnPageNo->IsChecked() ) { @@ -375,8 +374,6 @@ IMPL_LINK( ScTablePage, PageNoHdl, CheckBox*, pBtn ) } else m_pEdPageNo->Disable(); - - return 0; } IMPL_LINK_NOARG(ScTablePage, ScaleHdl) diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 270b68f7a634..9ef96251d0e9 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -110,11 +110,9 @@ void AlignmentPropertyPanel::Initialize() Link<> aLink = LINK(this, AlignmentPropertyPanel, MFLeftIndentMdyHdl); mpMFLeftIndent->SetModifyHdl ( aLink ); - aLink = LINK(this, AlignmentPropertyPanel, CBOXMergnCellClkHdl); - mpCBXMergeCell->SetClickHdl ( aLink ); + mpCBXMergeCell->SetClickHdl ( LINK(this, AlignmentPropertyPanel, CBOXMergnCellClkHdl) ); - aLink = LINK(this, AlignmentPropertyPanel, CBOXWrapTextClkHdl); - mpCBXWrapText->SetClickHdl ( aLink ); + mpCBXWrapText->SetClickHdl ( LINK(this, AlignmentPropertyPanel, CBOXWrapTextClkHdl) ); //rotation mpMtrAngle->SetAccessibleName(OUString( "Text Orientation")); //wj acc @@ -122,10 +120,10 @@ void AlignmentPropertyPanel::Initialize() mpMtrAngle->EnableAutocomplete( false ); mpCBStacked->SetClickHdl(LINK(this, AlignmentPropertyPanel, ClickStackHdl)); - aLink = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl); - mpRefEdgeBottom->SetClickHdl(aLink); - mpRefEdgeTop->SetClickHdl(aLink); - mpRefEdgeStd->SetClickHdl(aLink); + Link<Button*,void> aLink2 = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl); + mpRefEdgeBottom->SetClickHdl(aLink2); + mpRefEdgeTop->SetClickHdl(aLink2); + mpRefEdgeStd->SetClickHdl(aLink2); mpMtrAngle->InsertValue(0, FUNIT_CUSTOM); mpMtrAngle->InsertValue(45, FUNIT_CUSTOM); @@ -141,7 +139,7 @@ void AlignmentPropertyPanel::Initialize() mpMtrAngle->SetAccessibleRelationLabeledBy(mpFtRotate); } -IMPL_LINK( AlignmentPropertyPanel, ReferenceEdgeHdl, Control*, pControl ) +IMPL_LINK_TYPED( AlignmentPropertyPanel, ReferenceEdgeHdl, Button*, pControl, void ) { SvxRotateMode eMode; if(pControl == mpRefEdgeBottom) @@ -152,7 +150,6 @@ IMPL_LINK( AlignmentPropertyPanel, ReferenceEdgeHdl, Control*, pControl ) eMode = SVX_ROTATE_MODE_STANDARD; SvxRotateModeItem aItem(eMode,ATTR_ROTATE_MODE); GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_LOCKPOS, SfxCallMode::RECORD, &aItem, 0l); - return 0; } IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl ) @@ -193,13 +190,12 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl ) SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, &aAngleItem, 0L ); return 0; } -IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl ) +IMPL_LINK_NOARG_TYPED( AlignmentPropertyPanel, ClickStackHdl, Button*, void ) { bool bVertical = mpCBStacked->IsChecked(); SfxBoolItem aStackItem( SID_ATTR_ALIGN_STACKED, bVertical ); GetBindings()->GetDispatcher()->Execute( SID_ATTR_ALIGN_STACKED, SfxCallMode::RECORD, &aStackItem, 0L ); - return 0; } IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl) { @@ -211,7 +207,7 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl) return 0L; } -IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl) +IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXMergnCellClkHdl, Button*, void) { bool bState = mpCBXMergeCell->IsChecked(); @@ -224,16 +220,13 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl) GetBindings()->GetDispatcher()->Execute(FID_MERGE_OFF, SfxCallMode::RECORD); GetBindings()->Invalidate(FID_MERGE_TOGGLE,true); //modified end - - return 0; } -IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl) +IMPL_LINK_NOARG_TYPED(AlignmentPropertyPanel, CBOXWrapTextClkHdl, Button*, void) { bool bState = mpCBXWrapText->IsChecked(); SfxBoolItem aItem( SID_ATTR_ALIGN_LINEBREAK , bState); GetBindings()->GetDispatcher()->Execute(SID_ATTR_ALIGN_LINEBREAK, SfxCallMode::RECORD, &aItem, 0L); - return 0; } VclPtr<vcl::Window> AlignmentPropertyPanel::Create ( diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 42e4bcac6352..3d20848bcb29 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -98,11 +98,11 @@ private: SfxBindings* mpBindings; DECL_LINK( MFLeftIndentMdyHdl, void * ); - DECL_LINK( CBOXMergnCellClkHdl, void * ); - DECL_LINK( CBOXWrapTextClkHdl, void * ); + DECL_LINK_TYPED( CBOXMergnCellClkHdl, Button*, void ); + DECL_LINK_TYPED( CBOXWrapTextClkHdl, Button*, void ); DECL_LINK( AngleModifiedHdl, void * ); - DECL_LINK( ClickStackHdl, void * ); - DECL_LINK( ReferenceEdgeHdl, Control* ); + DECL_LINK_TYPED( ClickStackHdl, Button*, void ); + DECL_LINK_TYPED( ReferenceEdgeHdl, Button*, void ); void Initialize(); static void FormatDegrees(double& dTmp); diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index c250b903d350..141027f14f08 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -59,7 +59,7 @@ void CellLineStyleControl::dispose() void CellLineStyleControl::Initialize() { //maPushButtonMoreOptions->SetIcoPosX(2); - Link<> aLink = LINK(this, CellLineStyleControl, PBClickHdl); + Link<Button*,void> aLink = LINK(this, CellLineStyleControl, PBClickHdl); maPushButtonMoreOptions->SetClickHdl(aLink); maCellLineStyleValueSet->SetStyle(maCellLineStyleValueSet->GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT); @@ -88,8 +88,7 @@ void CellLineStyleControl::Initialize() } SetAllNoSel(); - aLink = LINK(this, CellLineStyleControl, VSSelectHdl); - maCellLineStyleValueSet->SetSelectHdl(aLink); + maCellLineStyleValueSet->SetSelectHdl(LINK(this, CellLineStyleControl, VSSelectHdl)); maCellLineStyleValueSet->StartSelection(); maCellLineStyleValueSet->Show(); } @@ -185,7 +184,7 @@ IMPL_LINK(CellLineStyleControl, VSSelectHdl, void *, pControl) return 0L; } -IMPL_LINK(CellLineStyleControl, PBClickHdl, PushButton *, pPBtn) +IMPL_LINK_TYPED(CellLineStyleControl, PBClickHdl, Button *, pPBtn, void) { if(pPBtn == maPushButtonMoreOptions.get()) { @@ -196,8 +195,6 @@ IMPL_LINK(CellLineStyleControl, PBClickHdl, PushButton *, pPBtn) mrCellAppearancePropertyPanel.EndCellLineStylePopupMode(); } - - return 0; } void CellLineStyleControl::SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis) diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index c4de870e3331..5647f0e96425 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -42,7 +42,7 @@ private: void SetAllNoSel(); DECL_LINK(VSSelectHdl, void*); - DECL_LINK(PBClickHdl, PushButton*); + DECL_LINK_TYPED(PBClickHdl, Button*, void); public: CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index e78bf7f11e16..25ad6a570091 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -100,8 +100,8 @@ void NumberFormatPropertyPanel::Initialize() mpEdDecimals->SetAccessibleName(OUString( "Decimal Places")); mpEdLeadZeroes->SetAccessibleName(OUString( "Leading Zeroes")); - mpBtnNegRed->SetClickHdl( aLink ); - mpBtnThousand->SetClickHdl( aLink ); + mpBtnNegRed->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); + mpBtnThousand->SetClickHdl( LINK(this, NumberFormatPropertyPanel, NumFormatValueClickHdl) ); mpTBCategory->SetAccessibleRelationLabeledBy(mpTBCategory); } @@ -118,6 +118,10 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox ) return 0L; } +IMPL_LINK_NOARG_TYPED( NumberFormatPropertyPanel, NumFormatValueClickHdl, Button*, void ) +{ + NumFormatValueHdl(nullptr); +} IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueHdl ) { OUString aFormat; diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index c401b8a0d643..7a024e078fc0 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -86,6 +86,7 @@ private: DECL_LINK(NumFormatSelectHdl, ListBox*); DECL_LINK(NumFormatValueHdl, void*); + DECL_LINK_TYPED(NumFormatValueClickHdl, Button*, void); void Initialize(); }; diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 3777b5edec9c..353a521e175f 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -94,7 +94,7 @@ ScXMLSourceDlg::ScXMLSourceDlg( maXMLParam.maImgElementRepeat = Image(ScResId(IMG_ELEMENT_REPEAT)); maXMLParam.maImgAttribute = Image(ScResId(IMG_ELEMENT_ATTRIBUTE)); - Link<> aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl); + Link<Button*,void> aBtnHdl = LINK(this, ScXMLSourceDlg, BtnPressedHdl); mpBtnSelectSource->SetClickHdl(aBtnHdl); mpBtnOk->SetClickHdl(aBtnHdl); mpBtnCancel->SetClickHdl(aBtnHdl); @@ -669,7 +669,7 @@ IMPL_LINK(ScXMLSourceDlg, GetFocusHdl, Control*, pCtrl) return 0; } -IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn) +IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) { if (pBtn == mpBtnSelectSource) SelectSourceFile(); @@ -677,7 +677,6 @@ IMPL_LINK(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn) OkPressed(); else if (pBtn == mpBtnCancel) CancelPressed(); - return 0; } IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 23d36acd5341..03c79109ebfb 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -939,7 +939,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) } // Clickhandler for the radiobuttons of the design-selection -IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) +IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void ) { if(pButton == pPage1_NewDesign) { @@ -968,8 +968,6 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) if(m_pDesign) SetDesign(m_pDesign); } - - return 0; } // Clickhandler for the choice of one design @@ -988,7 +986,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl) } // Clickhandler for the delete of one design -IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void) { sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); @@ -1006,42 +1004,35 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) m_bDesignListDirty = true; UpdatePage(); - - return 0; } // Clickhandler for the other servertypess -IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton ) +IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void ) { bool bASP = pButton == pPage2_ASP; pPage2_ASP->Check( bASP ); pPage2_PERL->Check( !bASP ); UpdatePage(); - - return 0; } // Clickhandler for the Radiobuttons of the graphicformat choice -IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton ) +IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void ) { pPage3_Png->Check( pButton == pPage3_Png ); pPage3_Gif->Check( pButton == pPage3_Gif ); pPage3_Jpg->Check( pButton == pPage3_Jpg ); pPage3_Quality->Enable(pButton == pPage3_Jpg); - return 0; } // Clickhandler for the Radiobuttons Standard/Frames -IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, BaseHdl, Button*, void) { UpdatePage(); - - return 0; } // Clickhandler for the Checkbox of the Title page -IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void) { if(pPage2_Content->IsChecked()) { @@ -1059,17 +1050,14 @@ IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl) UpdatePage(); } } - return 0; } // Clickhandler for the Resolution Radiobuttons -IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton ) +IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void ) { pPage3_Resolution_1->Check(pButton == pPage3_Resolution_1); pPage3_Resolution_2->Check(pButton == pPage3_Resolution_2); pPage3_Resolution_3->Check(pButton == pPage3_Resolution_3); - - return 0; } // Clickhandler for the ValueSet with the bitmap-buttons @@ -1081,7 +1069,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl) } // Fill the SfxItemSet with the settings of the dialog -IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton) +IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void) { SvColorDialog aDlg(this); @@ -1120,17 +1108,15 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton) pPage6_Preview->SetColors( m_aBackColor, m_aTextColor, m_aLinkColor, m_aVLinkColor, m_aALinkColor ); pPage6_Preview->Invalidate(); - return 0; } -IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, SlideChgHdl, Button*, void) { UpdatePage(); - return 0; } // Clickhandler for the Ok Button -IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, FinishHdl, Button*, void) { //End SdPublishingDesign* pDesign = new SdPublishingDesign(); @@ -1202,7 +1188,6 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) Save(); EndDialog(RET_OK); - return 0; } // Refresh the dialogs when changing from pages @@ -1381,11 +1366,10 @@ void SdPublishingDlg::LoadPreviewButtons() } // Clickhandler for the Forward Button -IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, NextPageHdl, Button*, void) { aAssistentFunc.NextPage(); ChangePage(); - return 0; } // Sets the Controls in the dialog to the settings in the design @@ -1527,11 +1511,10 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) } // Clickhandler for the back Button -IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl) +IMPL_LINK_NOARG_TYPED(SdPublishingDlg, LastPageHdl, Button*, void) { aAssistentFunc.PreviousPage(); ChangePage(); - return 0; } // Load Designs diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index fb1e256c4305..032273a1a8b5 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -989,6 +989,7 @@ public: void update( STLPropertySet* pSet ); DECL_LINK( implSelectHdl, Control* ); + DECL_LINK_TYPED( implClickHdl, Button*, void ); private: void updateControlStates(); @@ -1051,7 +1052,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent mpLBSound->SetSelectHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); - mpPBSoundPreview->SetClickHdl( LINK( this, CustomAnimationEffectTabPage, implSelectHdl ) ); + mpPBSoundPreview->SetClickHdl( LINK( this, CustomAnimationEffectTabPage, implClickHdl ) ); // fill the color box SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -1298,6 +1299,11 @@ void CustomAnimationEffectTabPage::updateControlStates() mpPBSoundPreview->Enable( nPos >= 2 ); } +IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void ) +{ + implSelectHdl(pBtn); +} + IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl ) { if( pControl == mpLBAfterEffect ) @@ -1586,6 +1592,7 @@ public: void update( STLPropertySet* pSet ); DECL_LINK( implControlHdl, Control* ); + DECL_LINK_TYPED( implClickHdl, Button*, void ); private: const STLPropertySet* mpSet; @@ -1624,7 +1631,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar fillRepeatComboBox( mpCBRepeat ); fillDurationComboBox( mpCBDuration ); - mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) ); + mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implClickHdl ) ); mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) ); if( pSet->getPropertyState( nHandleStart ) != STLPropertyState_AMBIGUOUS ) @@ -1799,6 +1806,11 @@ void CustomAnimationDurationTabPage::dispose() TabPage::dispose(); } +IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void ) +{ + implControlHdl(pBtn); +} + IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl ) { if( pControl == mpLBTrigger ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index c34370f11fae..9e60afde537e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -187,16 +187,16 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, fillDurationComboBox( mpCBSpeed ); - mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBRemoveEffect->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); + mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); + mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); + mpPBRemoveEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); mpLBStart->SetSelectHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); mpCBSpeed->SetSelectHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBPropertyMore->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpPBPlay->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); - mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implControlHdl ) ); + mpPBPropertyMore->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); + mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); + mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); + mpPBPlay->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); + mpCBAutoPreview->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) ); maStrModify = mpFTEffect->GetText(); @@ -2020,6 +2020,11 @@ IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl) return 0; } +IMPL_LINK_TYPED( CustomAnimationPane, implClickHdl, Button*, pBtn, void ) +{ + implControlHdl(pBtn); +} + /// this link is called when one of the controls is modified IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl ) { diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 0a1b87b6d5dc..5760860f7f33 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -117,6 +117,7 @@ private: void UpdateLook(); DECL_LINK( implControlHdl, Control* ); + DECL_LINK_TYPED( implClickHdl, Button*, void ); DECL_LINK(implPropertyHdl, void *); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); DECL_LINK_TYPED(lateInitCallback, Timer *, void); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 05121ceae9de..91285b05c9d5 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -969,11 +969,11 @@ IMPL_LINK(SlideTransitionPane,EventMultiplexerListener, return 0; } -IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked) +IMPL_LINK_NOARG_TYPED(SlideTransitionPane, ApplyToAllButtonClicked, Button*, void) { DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" ); if( !mpDrawDoc ) - return 0; + return; ::sd::slidesorter::SharedPageSelection pPages ( new ::sd::slidesorter::SlideSorterViewShell::PageSelection()); @@ -992,14 +992,11 @@ IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked) lcl_CreateUndoForPages( pPages, mrBase ); lcl_ApplyToPages( pPages, getTransitionEffectFromControls() ); } - - return 0; } -IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked) +IMPL_LINK_NOARG_TYPED(SlideTransitionPane, PlayButtonClicked, Button*, void) { playCurrentEffect(); - return 0; } IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected) @@ -1043,17 +1040,15 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected) return 0; } -IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked) +IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LoopSoundBoxChecked, Button*, void) { applyToSelectedPages(); - return 0; } -IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked) +IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AutoPreviewClicked, Button*, void) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); pOptions->SetPreviewTransitions( mpCB_AUTO_PREVIEW->IsChecked() ); - return 0; } IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void) diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index eac11eba8b94..ab640bfa161b 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -85,16 +85,16 @@ private: void UpdateLook(); - DECL_LINK( ApplyToAllButtonClicked, void * ); - DECL_LINK( PlayButtonClicked, void * ); - DECL_LINK( AutoPreviewClicked, void * ); + DECL_LINK_TYPED( ApplyToAllButtonClicked, Button*, void ); + DECL_LINK_TYPED( PlayButtonClicked, Button*, void ); + DECL_LINK_TYPED( AutoPreviewClicked, Button*, void ); DECL_LINK( TransitionSelected, void * ); DECL_LINK( AdvanceSlideRadioButtonToggled, void * ); DECL_LINK( AdvanceTimeModified, void * ); DECL_LINK( SpeedListBoxSelected, void * ); DECL_LINK( SoundListBoxSelected, void * ); - DECL_LINK( LoopSoundBoxChecked, void * ); + DECL_LINK_TYPED( LoopSoundBoxChecked, Button*, void ); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); DECL_LINK_TYPED(LateInitCallback, Timer *, void); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index fe664700d343..0c9838a5cfdf 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -95,13 +95,12 @@ void SdPhotoAlbumDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CancelHdl, Button*, void) { Close(); - return 0; } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) +IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void) { if (pImagesLst->GetEntryCount() == 0) { @@ -466,12 +465,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl) aInfo->Execute(); } EndDialog(); - return 0; } - return 0; } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl) +IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, @@ -510,10 +507,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl) } } EnableDisableButtons(); - return 0; } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl) +IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void) { if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && pImagesLst->GetSelectEntryPos() != 0) @@ -542,10 +538,9 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl) } EnableDisableButtons(); - return 0; } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl) +IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void) { sal_uInt16 nActPos = pImagesLst->GetSelectEntryPos(); if (!pImagesLst->GetEntry(nActPos + 1).isEmpty()) @@ -571,16 +566,14 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl) } EnableDisableButtons(); - return 0; } -IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl) +IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void) { pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() ); pImg->SetImage(Image()); EnableDisableButtons(); - return 0; } IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl) diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 05748b3a673b..723f20aa4ef7 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -70,14 +70,14 @@ private: SdDrawDocument* pDoc; GraphicFilter* mpGraphicFilter; - DECL_LINK(CancelHdl, void*); - DECL_LINK(CreateHdl, void*); + DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK_TYPED(CreateHdl, Button*, void); - DECL_LINK(FileHdl, void*); + DECL_LINK_TYPED(FileHdl, Button*, void); DECL_LINK(TextHdl, void*); - DECL_LINK(UpHdl, void*); - DECL_LINK(DownHdl, void*); - DECL_LINK(RemoveHdl, void*); + DECL_LINK_TYPED(UpHdl, Button*, void); + DECL_LINK_TYPED(DownHdl, Button*, void); + DECL_LINK_TYPED(RemoveHdl, Button*, void); DECL_LINK(SelectHdl, void*); diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 62c9d3eaffe7..06f70ef3f49a 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -27,7 +27,7 @@ RemoteDialog::RemoteDialog( vcl::Window *pWindow ) m_pButtonConnect->SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton ) ); SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) ); - m_pButtonClose->SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) ); + m_pButtonClose->SetClickHdl( LINK( this, RemoteDialog, CloseClickHdl ) ); } RemoteDialog::~RemoteDialog() @@ -43,29 +43,27 @@ void RemoteDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton) +IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void) { // setBusy( true ); // Fixme: Try and connect #if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH) long aSelected = m_pClientBox->GetActiveEntryIndex(); if ( aSelected < 0 ) - return 1; + return; TClientBoxEntry aEntry = m_pClientBox->GetEntryData(aSelected); OUString aPin ( m_pClientBox->getPin() ); if ( RemoteServer::connectClient( aEntry->m_pClientInfo, aPin ) ) { - return CloseHdl( 0 ); + CloseHdl( 0 ); } - else - { - return 1; - } -#else - return 0; #endif } +IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseClickHdl, Button*, void ) +{ + CloseHdl(NULL); +} IMPL_LINK_NOARG( RemoteDialog, CloseHdl ) { #ifdef ENABLE_SDREMOTE diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index 3c936eb10a1a..764d84469ef7 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -28,8 +28,9 @@ private: VclPtr<CloseButton> m_pButtonClose; VclPtr<ClientBox> m_pClientBox; - DECL_DLLPRIVATE_LINK( HandleConnectButton, void * ); - DECL_LINK( CloseHdl, void * ); + DECL_DLLPRIVATE_LINK_TYPED( HandleConnectButton, Button*, void ); + DECL_LINK( CloseHdl, void* ); + DECL_LINK_TYPED( CloseClickHdl, Button*, void ); public: RemoteDialog( vcl::Window* pWindow ); virtual ~RemoteDialog(); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 7ecfae4f181c..f18454650d51 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -726,18 +726,17 @@ IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar ) return 1; } -IMPL_LINK_NOARG( ClientBox, DeauthoriseHdl ) +IMPL_LINK_NOARG_TYPED( ClientBox, DeauthoriseHdl, Button*, void ) { long aSelected = GetActiveEntryIndex(); if ( aSelected < 0 ) - return 1; + return; TClientBoxEntry aEntry = GetEntryData(aSelected); #ifdef ENABLE_SDREMOTE RemoteServer::deauthoriseClient( aEntry->m_pClientInfo ); #endif populateEntries(); - return 1; } } //namespace dp_gui diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 5f60f8572a2a..6a1439b7301d 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -131,7 +131,7 @@ class ClientBox : public Control void DeleteRemoved(); DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar* ); - DECL_DLLPRIVATE_LINK( DeauthoriseHdl, void * ); + DECL_DLLPRIVATE_LINK_TYPED( DeauthoriseHdl, Button*, void ); //Index starts with 1. //Throws an com::sun::star::lang::IllegalArgumentException, when the index is invalid. void checkIndex(sal_Int32 pos) const; diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index f414121b1e65..8e3989c42acd 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -247,21 +247,18 @@ void AnimationWindow::dispose() SfxDockingWindow::dispose(); } -IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) +IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickFirstHdl, Button*, void) { m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0; UpdateControl(); - - return 0L; } -IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) +IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickStopHdl, Button*, void) { bMovie = false; - return 0L; } -IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) +IMPL_LINK_TYPED( AnimationWindow, ClickPlayHdl, Button *, p, void ) { ScopeLockGuard aGuard( maPlayLock ); @@ -376,20 +373,16 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) m_pRbtGroup->Enable( bRbtGroupEnabled ); m_pBtnGetAllObjects->Enable( bBtnGetAllObjectsEnabled ); m_pBtnGetOneObject->Enable( bBtnGetOneObjectEnabled ); - - return 0L; } -IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl) +IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickLastHdl, Button*, void) { m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : m_FrameList.size() - 1 ; UpdateControl(); - - return 0L; } -IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) +IMPL_LINK_TYPED( AnimationWindow, ClickRbtHdl, Button*, p, void ) { if (m_FrameList.empty() || p == m_pRbtGroup || m_pRbtGroup->IsChecked()) { @@ -409,11 +402,9 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p ) m_pTimeField->Enable(); m_pLbLoopCount->Enable(); } - - return 0L; } -IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) +IMPL_LINK_TYPED( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void ) { bAllObjects = pBtn == m_pBtnGetAllObjects; @@ -422,10 +413,9 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn ) GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); - return 0L; } -IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) +IMPL_LINK_TYPED( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void ) { SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); SdrObject* pObject; @@ -496,18 +486,15 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn ) m_pCtlDisplay->SetScale(aFrac); UpdateControl(); - - return 0L; } -IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl) +IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickCreateGroupHdl, Button*, void) { // Code now in CreatePresObj() SfxBoolItem aItem( SID_ANIMATOR_CREATE, true ); GetBindings().GetDispatcher()->Execute( SID_ANIMATOR_CREATE, SfxCallMode::SLOT | SfxCallMode::RECORD, &aItem, 0L ); - return 0L; } IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl) @@ -1130,7 +1117,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) } } - ClickFirstHdl( this ); + ClickFirstHdl( NULL ); } void AnimationWindow::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index d02f13128b80..f40bcce6af70 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -84,11 +84,10 @@ void BreakDlg::dispose() } // Control-Handler for cancel button -IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl) +IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void) { - bCancel = true; - m_pBtnCancel->Disable(); - return 0L; + bCancel = true; + m_pBtnCancel->Disable(); } /** diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index b87f58e0908c..86421fde3f0c 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -238,7 +238,7 @@ IMPL_LINK_NOARG(CopyDlg, SelectColorHdl) /** * sets values of selection */ -IMPL_LINK_NOARG(CopyDlg, SetViewData) +IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void) { Rectangle aRect = mpView->GetAllMarkedRect(); @@ -254,14 +254,12 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData) Color aColor = static_cast<const XColorItem*>( pPoolItem )->GetColorValue(); m_pLbStartColor->SelectEntry( aColor ); } - - return 0; } /** * resets values to default */ -IMPL_LINK_NOARG(CopyDlg, SetDefault) +IMPL_LINK_NOARG_TYPED(CopyDlg, SetDefault, Button*, void) { m_pNumFldCopies->SetValue( 1L ); @@ -282,8 +280,6 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault) m_pLbStartColor->SelectEntry( aColor ); m_pLbEndColor->SelectEntry( aColor ); } - - return 0; } } // end of namespace sd diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 27c3a8695408..47a139645938 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -52,13 +52,13 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow, m_pLbCustomShows->set_width_request(m_pLbCustomShows->approximate_char_width() * 32); m_pLbCustomShows->SetDropDownLineCount(8); - Link<> aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) ); + Link<Button*,void> aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) ); m_pBtnNew->SetClickHdl( aLink ); m_pBtnEdit->SetClickHdl( aLink ); m_pBtnRemove->SetClickHdl( aLink ); m_pBtnCopy->SetClickHdl( aLink ); m_pCbxUseCustomShow->SetClickHdl( aLink ); - m_pLbCustomShows->SetSelectHdl( aLink ); + m_pLbCustomShows->SetSelectHdl( LINK( this, SdCustomShowDlg, SelectHdl ) ); m_pBtnStartShow->SetClickHdl( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // for test @@ -117,10 +117,14 @@ void SdCustomShowDlg::CheckState() pCustomShowList->Seek( nPos ); } +IMPL_LINK_TYPED( SdCustomShowDlg, ClickButtonHdl, Button *, p, void ) +{ + SelectHdl(p); +} /** * ButtonHdl() */ -IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) +IMPL_LINK( SdCustomShowDlg, SelectHdl, void *, p ) { // new CustomShow if( p == m_pBtnNew ) @@ -262,11 +266,9 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } // StartShow-Hdl -IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) +IMPL_LINK_NOARG_TYPED(SdCustomShowDlg, StartShowHdl, Button*, void) { EndDialog( RET_YES ); - - return 0; } // CheckState @@ -292,12 +294,13 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, get( m_pBtnCancel, "cancel" ); get( m_pBtnHelp, "help" ); - Link<> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl ); + Link<Button*,void> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl ); + Link<> aLink2= LINK( this, SdDefineCustomShowDlg, ClickButtonHdl2 ); m_pBtnAdd->SetClickHdl( aLink ); m_pBtnRemove->SetClickHdl( aLink ); - m_pEdtName->SetModifyHdl( aLink ); - m_pLbPages->SetSelectHdl( aLink ); // because of status - m_pLbCustomPages->SetSelectHdl( aLink ); // because of status + m_pEdtName->SetModifyHdl( aLink2 ); + m_pLbPages->SetSelectHdl( aLink2 ); // because of status + m_pLbCustomPages->SetSelectHdl( aLink2 ); // because of status m_pBtnOK->SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) ); @@ -380,8 +383,12 @@ void SdDefineCustomShowDlg::CheckState() m_pBtnRemove->Enable( bCSPages ); } +IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void ) +{ + ClickButtonHdl2(p); +} // ButtonHdl() -IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) +IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl2, void *, p ) { if( p == m_pBtnAdd ) { @@ -486,7 +493,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() } // OK-Hdl -IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(SdDefineCustomShowDlg, OKHdl, Button*, void) { // check name... bool bDifferent = true; @@ -520,8 +527,6 @@ IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) m_pEdtName->GrabFocus(); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 9a1f0c7fd2a2..2f67a4d46861 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -96,7 +96,7 @@ public: NextButton (vcl::Window* pParent); void ForceFocusEventBroadcast(); - void SetClickHdl (const Link<>& rLink); + void SetClickHdl (const Link<Button*,void>& rLink); bool IsEnabled(); void Enable (bool bEnable); @@ -229,19 +229,19 @@ public: DECL_LINK( SelectRegionHdl, ListBox * ); DECL_LINK_TYPED( UpdatePreviewHdl, Idle *, void ); DECL_LINK_TYPED( UpdatePageListHdl, Idle *, void ); - DECL_LINK( StartTypeHdl, RadioButton * ); + DECL_LINK_TYPED( StartTypeHdl, Button *, void ); DECL_LINK( SelectTemplateHdl, void * ); - DECL_LINK( NextPageHdl, void * ); - DECL_LINK( LastPageHdl, void * ); - DECL_LINK( PreviewFlagHdl, void * ); + DECL_LINK_TYPED( NextPageHdl, Button*, void ); + DECL_LINK_TYPED( LastPageHdl, Button*, void ); + DECL_LINK_TYPED( PreviewFlagHdl, Button*, void ); DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void ); DECL_LINK( EffectPreviewClickHdl, void * ); DECL_LINK( SelectLayoutHdl, void * ); DECL_LINK( PageSelectHdl, void * ); - DECL_LINK( PresTypeHdl, void * ); + DECL_LINK_TYPED( PresTypeHdl, Button*, void ); DECL_LINK( UpdateUserDataHdl, void * ); DECL_LINK( SelectEffectHdl, void* ); - DECL_LINK( OpenButtonHdl, Button * ); + DECL_LINK_TYPED( OpenButtonHdl, Button *, void ); OUString maCreateStr; OUString maOpenStr; @@ -1101,11 +1101,11 @@ IMPL_LINK_NOARG(AssistentDlgImpl, SelectEffectHdl) return 0; } -IMPL_LINK( AssistentDlgImpl, OpenButtonHdl, Button*, pButton ) +IMPL_LINK_TYPED( AssistentDlgImpl, OpenButtonHdl, Button*, pButton, void ) { // Clear the selection and forward the call. mpPage1OpenLB->SetNoSelection(); - return mpPage1OpenLB->GetDoubleClickHdl().Call(pButton); + mpPage1OpenLB->GetDoubleClickHdl().Call(pButton); } IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, EffectPreviewIdleHdl, Idle *, void) @@ -1134,15 +1134,13 @@ IMPL_LINK_NOARG(AssistentDlgImpl, EffectPreviewClickHdl) return 0; } -IMPL_LINK_NOARG(AssistentDlgImpl, PreviewFlagHdl) - +IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PreviewFlagHdl, Button*, void) { if( mpPreviewFlag->IsChecked() != mbPreview ) { mbPreview = mpPreviewFlag->IsChecked(); UpdatePreview(true); } - return 0; } IMPL_LINK_NOARG(AssistentDlgImpl, SelectTemplateHdl) @@ -1189,9 +1187,9 @@ IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, UpdatePreviewHdl, Idle *, void) UpdatePreview( true ); } -IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton ) +IMPL_LINK_TYPED( AssistentDlgImpl, StartTypeHdl, Button *, pButton, void ) { - StartType eType = pButton == mpPage1EmptyRB?ST_EMPTY:pButton == mpPage1TemplateRB?ST_TEMPLATE:ST_OPEN; + StartType eType = pButton == mpPage1EmptyRB ? ST_EMPTY : pButton == mpPage1TemplateRB ? ST_TEMPLATE:ST_OPEN; if(eType == ST_TEMPLATE) ProvideTemplates(); @@ -1209,10 +1207,9 @@ IMPL_LINK( AssistentDlgImpl, StartTypeHdl, RadioButton *, pButton ) mpPage1OpenLB->SelectEntryPos(0); maPrevIdle.Start(); - return 0; } -IMPL_LINK_NOARG(AssistentDlgImpl, NextPageHdl) +IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, NextPageHdl, Button*, void) { // When changing from the first to the second page make sure that the // templates are present. @@ -1223,18 +1220,16 @@ IMPL_LINK_NOARG(AssistentDlgImpl, NextPageHdl) LeavePage(); maAssistentFunc.NextPage(); ChangePage(); - return 0; } -IMPL_LINK_NOARG(AssistentDlgImpl, LastPageHdl) +IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, LastPageHdl, Button*, void) { LeavePage(); maAssistentFunc.PreviousPage(); ChangePage(); - return 0; } -IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl) +IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PresTypeHdl, Button*, void) { if (maDocFile.isEmpty()) { @@ -1247,7 +1242,6 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl) mpPage3PresTimeTMF->Enable(bKiosk); mpPage3BreakTMF->Enable(bKiosk); mpPage3LogoCB->Enable(bKiosk); - return 0; } IMPL_LINK_NOARG(AssistentDlgImpl, UpdateUserDataHdl) @@ -1728,14 +1722,18 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) AssistentDlg::AssistentDlg(vcl::Window* pParent, bool bAutoPilot) : ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui") { - Link<> aFinishLink = LINK(this,AssistentDlg, FinishHdl); - mpImpl = new AssistentDlgImpl( this, aFinishLink, bAutoPilot ); + mpImpl = new AssistentDlgImpl( this, LINK(this,AssistentDlg, FinishHdl2), bAutoPilot ); // button assignment mpImpl->mpFinishButton->SetClickHdl(LINK(this,AssistentDlg,FinishHdl)); } -IMPL_LINK_NOARG(AssistentDlg, FinishHdl) +IMPL_LINK_NOARG_TYPED(AssistentDlg, FinishHdl, Button*, void) +{ + FinishHdl2(NULL); +} + +IMPL_LINK_NOARG(AssistentDlg, FinishHdl2) { if( GetStartType() == ST_OPEN ) { @@ -1865,7 +1863,7 @@ void NextButton::ForceFocusEventBroadcast() } } -void NextButton::SetClickHdl (const Link<>& rLink) +void NextButton::SetClickHdl (const Link<Button*,void>& rLink) { // Forward the setting of the click handler to the two buttons // regardless of which one is currently visible. diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index aed2a1059f4a..61c190586adf 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -133,14 +133,12 @@ void SdSnapLineDlg::dispose() /** * fills provided item sets with dialog box attributes */ -IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SdSnapLineDlg, ClickHdl, Button *, pBtn, void ) { if ( pBtn == m_pRbPoint ) SetInputFields(true, true); else if ( pBtn == m_pRbHorz ) SetInputFields(false, true); else if ( pBtn == m_pRbVert ) SetInputFields(true, false); else if ( pBtn == m_pBtnDelete ) EndDialog(RET_SNAP_DELETE); - - return 0; } /** diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 6cd66862d7d3..79ce991a6dbd 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -145,7 +145,7 @@ private: bool mbHandoutMode; - DECL_LINK( UpdateOnClickHdl, void * ); + DECL_LINK_TYPED( UpdateOnClickHdl, Button*, void ); DECL_LINK( LanguageChangeHdl, void * ); @@ -266,22 +266,19 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl ) return 0; } -IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl) +IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void) { ApplyToAll(); - return 0; } -IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl) +IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyHdl, Button*, void) { Apply(); - return 0; } -IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl) +IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickCancelHdl, Button*, void) { Cancel(); - return 0; } short HeaderFooterDialog::Execute() @@ -588,11 +585,9 @@ void HeaderFooterTabPage::update() mpCTPreview->update( aSettings ); } -IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl) +IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void) { update(); - - return 0; } void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet ) diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 29bc961a7e41..79538044e5cd 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -53,7 +53,7 @@ private: VclPtr<NumericField> m_pNewStartNF; bool mbModified; - DECL_LINK( ImplNewStartHdl, void* ); + DECL_LINK_TYPED( ImplNewStartHdl, Button*, void ); }; SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) @@ -155,12 +155,11 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet ) mbModified = false; } -IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl) +IMPL_LINK_NOARG_TYPED(SdParagraphNumTabPage, ImplNewStartHdl, Button*, void) { bool bEnable = m_pNewStartCB->IsChecked(); m_pNewStartNumberCB->Enable(bEnable); m_pNewStartNF->Enable(bEnable && m_pNewStartNumberCB->IsChecked()); - return 0; } SdParagraphDlg::SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr ) diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 8809295caed3..7891916a5e53 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -72,7 +72,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, get( msMonitor, "monitor_str" ); get( msAllMonitors, "allmonitors_str" ); - Link<> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) ); + Link<Button*,void> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) ); aRbtAll->SetClickHdl( aLink ); aRbtAtDia->SetClickHdl( aLink ); @@ -144,7 +144,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, InitMonitorSettings(); - ChangeRangeHdl( this ); + ChangeRangeHdl( NULL ); ClickWindowPresentationHdl( NULL ); ChangePauseHdl( NULL ); @@ -322,18 +322,16 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) /** * Handler: Enabled/Disabled Listbox "Dias" */ -IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl) +IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangeRangeHdl, Button*, void) { aLbDias->Enable( aRbtAtDia->IsChecked() ); aLbCustomshow->Enable( aRbtCustomshow->IsChecked() ); - - return 0L; } /** * Handler: Enabled/Disabled Checkbox "AlwaysOnTop" */ -IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) +IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ClickWindowPresentationHdl, Button*, void) { const bool bAuto = aRbtAuto->IsChecked(); const bool bWindow = aRbtWindow->IsChecked(); @@ -353,8 +351,6 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl) } else aCbxAlwaysOnTop->Enable(); - - return 0L; } /** diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 2b44f51b3599..0585682cd3b5 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -52,7 +52,7 @@ SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs get( m_pCbxBack , "backcb" ); get( m_pCbxPaperbin , "papertryfrmprntrcb" ); - Link<> aLink = LINK( this, SdPrintOptions, ClickBookletHdl ); + Link<Button*,void> aLink = LINK( this, SdPrintOptions, ClickBookletHdl ); m_pRbtDefault->SetClickHdl( aLink ); m_pRbtPagesize->SetClickHdl( aLink ); m_pRbtPagetile->SetClickHdl( aLink ); @@ -213,20 +213,18 @@ VclPtr<SfxTabPage> SdPrintOptions::Create( vcl::Window* pWindow, return VclPtr<SdPrintOptions>::Create( pWindow, *rOutAttrs ); } -IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx ) +IMPL_LINK_TYPED( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void ) { // there must be at least one of them checked if( !m_pCbxDraw->IsChecked() && !m_pCbxNotes->IsChecked() && !m_pCbxOutline->IsChecked() && !m_pCbxHandout->IsChecked() ) - pCbx->Check(); + static_cast<CheckBox*>(pCbx)->Check(); updateControls(); - return 0; } -IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl) +IMPL_LINK_NOARG_TYPED(SdPrintOptions, ClickBookletHdl, Button*, void) { updateControls(); - return 0; } void SdPrintOptions::updateControls() diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 51206936dd07..86e742a38456 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -177,13 +177,13 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl) /** * Click handler for load button */ -IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) +IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void) { VclPtrInstance< SfxNewFileDialog > pDlg(this, SFXWB_PREVIEW); pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT)); if(!IsReallyVisible()) - return 0; + return; sal_uInt16 nResult = pDlg->Execute(); // Inserted update to force repaint @@ -283,8 +283,6 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) } } } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 81a711452cae..e8d36f946f16 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -472,11 +472,9 @@ void SdTPAction::OpenFileDialog() } } -IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl) +IMPL_LINK_NOARG_TYPED(SdTPAction, ClickSearchHdl, Button*, void) { OpenFileDialog(); - - return 0L; } IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 1865ac53f17f..ffcdbe2c1232 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -266,24 +266,20 @@ IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData ) return 0L; } -IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl) +IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickPreviewHdl, Button*, void) { Calculate( aBmp, aMtf ); m_pMtfWin->SetGraphic( aMtf ); m_pBtnPreview->Disable(); - - return 0L; } -IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl) +IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickOKHdl, Button*, void) { if( m_pBtnPreview->IsEnabled() ) Calculate( aBmp, aMtf ); SaveSettings(); EndDialog( RET_OK ); - - return 0L; } IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb ) diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 2a807a7870d3..b53745300552 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -72,7 +72,7 @@ private: Link<> aLink; SfxProgress *mpProgress; - DECL_LINK( CancelButtonHdl, void* ); + DECL_LINK_TYPED( CancelButtonHdl, Button*, void ); DECL_LINK( UpDate, void* ); DECL_LINK_TYPED( InitialUpdate, Idle*, void ); }; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 4a02d194040f..11d69d3a8a4f 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -133,14 +133,14 @@ private: ScopeLock maPlayLock; - DECL_LINK( ClickFirstHdl, void * ); - DECL_LINK( ClickStopHdl, void * ); - DECL_LINK( ClickPlayHdl, void * ); - DECL_LINK( ClickLastHdl, void * ); - DECL_LINK( ClickGetObjectHdl, void * ); - DECL_LINK( ClickRemoveBitmapHdl, void * ); - DECL_LINK( ClickRbtHdl, void * ); - DECL_LINK( ClickCreateGroupHdl, void * ); + DECL_LINK_TYPED( ClickFirstHdl, Button*, void ); + DECL_LINK_TYPED( ClickStopHdl, Button*, void ); + DECL_LINK_TYPED( ClickPlayHdl, Button*, void ); + DECL_LINK_TYPED( ClickLastHdl, Button*, void ); + DECL_LINK_TYPED( ClickGetObjectHdl, Button*, void ); + DECL_LINK_TYPED( ClickRemoveBitmapHdl, Button*, void ); + DECL_LINK_TYPED( ClickRbtHdl, Button*, void ); + DECL_LINK_TYPED( ClickCreateGroupHdl, Button*, void ); DECL_LINK( ModifyBitmapHdl, void * ); DECL_LINK( ModifyTimeHdl, void * ); diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index 1da44c927a6c..25c0ce4310f4 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -70,8 +70,8 @@ private: ::sd::View* mpView; DECL_LINK( SelectColorHdl, void * ); - DECL_LINK( SetViewData, void * ); - DECL_LINK( SetDefault, void * ); + DECL_LINK_TYPED( SetViewData, Button*, void ); + DECL_LINK_TYPED( SetDefault, Button*, void ); }; } // end of namespace sd diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 4fcbc7d54c75..66cc333f9ca0 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -51,8 +51,9 @@ private: void CheckState(); - DECL_LINK( ClickButtonHdl, void * ); - DECL_LINK( StartShowHdl, void* ); + DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); + DECL_LINK( SelectHdl, void* ); + DECL_LINK_TYPED( StartShowHdl, Button*, void ); public: SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ); @@ -82,8 +83,9 @@ private: void CheckState(); void CheckCustomShow(); - DECL_LINK( ClickButtonHdl, void * ); - DECL_LINK( OKHdl, void * ); + DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); + DECL_LINK( ClickButtonHdl2, void* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); public: diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index b9f9136e2fd3..c3685c22d598 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -45,7 +45,8 @@ public: virtual ~AssistentDlg(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( FinishHdl, void * ); + DECL_LINK_TYPED( FinishHdl, Button*, void ); + DECL_LINK( FinishHdl2, void* ); SfxObjectShellLock GetDocument(); OutputType GetOutputMedium() const; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index f17a7c5c3413..0307fdf377f7 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -55,7 +55,7 @@ private: FieldUnit eUIUnit; Fraction aUIScale; - DECL_LINK( ClickHdl, Button * ); + DECL_LINK_TYPED( ClickHdl, Button *, void ); public: SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index a9c34b484577..8a1d4fd5c7f9 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -38,9 +38,9 @@ class HeaderFooterDialog : public TabDialog { private: DECL_LINK( ActivatePageHdl, TabControl * ); - DECL_LINK( ClickApplyToAllHdl, void * ); - DECL_LINK( ClickApplyHdl, void * ); - DECL_LINK( ClickCancelHdl, void * ); + DECL_LINK_TYPED( ClickApplyToAllHdl, Button*, void ); + DECL_LINK_TYPED( ClickApplyHdl, Button*, void ); + DECL_LINK_TYPED( ClickCancelHdl, Button*, void ); VclPtr<TabControl> mpTabCtrl; diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index 0398823c783d..49b8e9c8093b 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -69,8 +69,8 @@ private: VclPtr<FixedText> msMonitorExternal; VclPtr<FixedText> msExternal; - DECL_LINK( ChangeRangeHdl, void * ); - DECL_LINK( ClickWindowPresentationHdl, void * ); + DECL_LINK_TYPED( ChangeRangeHdl, Button*, void ); + DECL_LINK_TYPED( ClickWindowPresentationHdl, Button*, void ); DECL_LINK( ChangePauseHdl, void * ); void InitMonitorSettings(); diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 4c013ce36db1..0178891e34b9 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -54,8 +54,8 @@ private: const SfxItemSet& rOutAttrs; - DECL_LINK( ClickCheckboxHdl, CheckBox * ); - DECL_LINK( ClickBookletHdl, void * ); + DECL_LINK_TYPED( ClickCheckboxHdl, Button*, void ); + DECL_LINK_TYPED( ClickBookletHdl, Button*, void ); void updateControls(); diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index f9670c7b038f..1514594cae75 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -177,21 +177,21 @@ private: void LoadPreviewButtons(); - DECL_LINK( FinishHdl, void * ); - DECL_LINK( NextPageHdl, void * ); - DECL_LINK( LastPageHdl, void * ); + DECL_LINK_TYPED( FinishHdl, Button*, void ); + DECL_LINK_TYPED( NextPageHdl, Button*, void ); + DECL_LINK_TYPED( LastPageHdl, Button*, void ); - DECL_LINK( DesignHdl, RadioButton * ); + DECL_LINK_TYPED( DesignHdl, Button*, void ); DECL_LINK( DesignSelectHdl, void * ); - DECL_LINK( DesignDeleteHdl, void * ); - DECL_LINK( BaseHdl, void * ); - DECL_LINK( ContentHdl, void * ); - DECL_LINK( GfxFormatHdl, RadioButton * ); - DECL_LINK( ResolutionHdl, RadioButton * ); + DECL_LINK_TYPED( DesignDeleteHdl, Button*, void ); + DECL_LINK_TYPED( BaseHdl, Button*, void ); + DECL_LINK_TYPED( ContentHdl, Button*, void ); + DECL_LINK_TYPED( GfxFormatHdl, Button *, void ); + DECL_LINK_TYPED( ResolutionHdl, Button*, void ); DECL_LINK( ButtonsHdl, void * ); - DECL_LINK( ColorHdl, PushButton * ); - DECL_LINK( WebServerHdl, RadioButton * ); - DECL_LINK( SlideChgHdl, void * ); + DECL_LINK_TYPED( ColorHdl, Button*, void ); + DECL_LINK_TYPED( WebServerHdl, Button *, void ); + DECL_LINK_TYPED( SlideChgHdl, Button*, void ); public: diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 69093c624a8c..2c88259dc8e7 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -47,7 +47,7 @@ public: void GetAttr(SfxItemSet& rOutAttrs); DECL_LINK(ClickLayoutHdl, void *); - DECL_LINK(ClickLoadHdl, void *); + DECL_LINK_TYPED(ClickLoadHdl, Button*, void); private: ::sd::DrawDocShell* mpDocSh; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 09ebf54a72e0..931ed2d664b0 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -79,7 +79,7 @@ private: OUString aLastFile; ::std::vector< long > aVerbVector; - DECL_LINK( ClickSearchHdl, void * ); + DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); DECL_LINK( ClickActionHdl, void * ); DECL_LINK( SelectTreeHdl, void * ); DECL_LINK( CheckFileHdl, void * ); diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index d76b66fa6588..3c9a75810987 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -73,8 +73,8 @@ class SdVectorizeDlg : public ModalDialog long nPosX, long nPosY, long nWidth, long nHeight ); DECL_LINK( ProgressHdl, void* ); - DECL_LINK( ClickPreviewHdl, void* ); - DECL_LINK( ClickOKHdl, void* ); + DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); + DECL_LINK_TYPED( ClickOKHdl, Button*, void ); DECL_LINK( ToggleHdl, CheckBox* ); DECL_LINK( ModifyHdl, void* ); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 206a08bb0993..910aa9e44f54 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -218,7 +218,7 @@ void TableDesignWidget::ApplyStyle() } } -IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl) +IMPL_LINK_NOARG_TYPED(TableDesignWidget, implCheckBoxHdl, Button*, void) { mbOptionsChanged = true; @@ -226,7 +226,6 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl) ApplyOptions(); FillDesignPreviewControl(); - return 0; } void TableDesignWidget::ApplyOptions() diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index ecf324078546..64fb0070d23a 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -87,7 +87,7 @@ private: DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); DECL_LINK(implValueSetHdl, void *); - DECL_LINK(implCheckBoxHdl, void *); + DECL_LINK_TYPED(implCheckBoxHdl, Button*, void); private: ViewShellBase& mrBase; diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 782d75a2fe6e..fd35c932addf 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -54,7 +54,7 @@ private: void LoadConfig(); void SaveConfig(); - DECL_LINK(FindHdl, void *); + DECL_LINK_TYPED(FindHdl, Button *, void); public: SearchDialog( vcl::Window* pWindow, const OUString& rConfigName ); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 0f92cfb68208..0021c8ed0a80 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -242,7 +242,7 @@ namespace class LicenseDialog : public ModalDialog { private: - DECL_LINK(ShowHdl, void *); + DECL_LINK_TYPED(ShowHdl, Button*, void); public: LicenseDialog(vcl::Window *pParent=NULL); }; @@ -253,11 +253,10 @@ namespace get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); } - IMPL_LINK_NOARG(LicenseDialog, ShowHdl) + IMPL_LINK_NOARG_TYPED(LicenseDialog, ShowHdl, Button*, void) { EndDialog(RET_OK); showDocument("LICENSE"); - return 0; } } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 145121d14842..b0da8b4d1cb4 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -735,10 +735,9 @@ void IndexTabPage_Impl::ClearIndex() m_pIndexCB->Clear(); } -IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl) +IMPL_LINK_NOARG_TYPED(IndexTabPage_Impl, OpenHdl, Button*, void) { m_pIndexCB->GetDoubleClickHdl().Call(m_pIndexCB); - return 0; } IMPL_LINK_TYPED( IndexTabPage_Impl, IdleHdl, Idle*, pIdle, void ) @@ -945,9 +944,8 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_ m_pResultsLB->set_height_request(aSize.Height()); get(m_pOpenBtn, "display"); - Link<> aLink = LINK( this, SearchTabPage_Impl, SearchHdl ); - m_pSearchED->SetSearchLink( aLink ); - m_pSearchBtn->SetClickHdl(aLink); + m_pSearchED->SetSearchLink( LINK( this, SearchTabPage_Impl, SearchHdl ) ); + m_pSearchBtn->SetClickHdl(LINK( this, SearchTabPage_Impl, ClickHdl )); m_pSearchED->SetModifyHdl( LINK( this, SearchTabPage_Impl, ModifyHdl ) ); m_pOpenBtn->SetClickHdl( LINK( this, SearchTabPage_Impl, OpenHdl ) ); @@ -1042,6 +1040,11 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText ) +IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void) +{ + SearchHdl(NULL); +} + IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) { OUString aSearchText = comphelper::string::strip(m_pSearchED->GetText(), ' '); @@ -1081,10 +1084,9 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) return 0; } -IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl) +IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, OpenHdl, Button*, void) { m_pResultsLB->GetDoubleClickHdl().Call(m_pResultsLB); - return 0; } IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl) @@ -1333,10 +1335,9 @@ void BookmarksTabPage_Impl::dispose() } -IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl) +IMPL_LINK_NOARG_TYPED(BookmarksTabPage_Impl, OpenHdl, Button*, void) { m_pBookmarksBox->GetDoubleClickHdl().Call(m_pBookmarksBox); - return 0; } void BookmarksTabPage_Impl::ActivatePage() @@ -2350,8 +2351,9 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, /*pDlg*/ ) -IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, CheckHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); if ( xConfiguration.is() ) { bool bChecked = pBox->IsChecked(); @@ -2368,8 +2370,6 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::CheckHdl(): unexpected exception" ); } } - - return 0; } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index f3a588e943a1..0d08861074ba 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -138,7 +138,7 @@ private: void InitializeIndex(); void ClearIndex(); - DECL_LINK(OpenHdl, void *); + DECL_LINK_TYPED(OpenHdl, Button*, void); DECL_LINK_TYPED(IdleHdl, Idle*, void); DECL_LINK_TYPED(TimeoutHdl, Timer*, void); @@ -216,7 +216,8 @@ private: void RememberSearchText( const OUString& rSearchText ); DECL_LINK(SearchHdl, void *); - DECL_LINK(OpenHdl, void *); + DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK_TYPED(OpenHdl, Button*, void); DECL_LINK(ModifyHdl, void *); public: @@ -259,7 +260,7 @@ private: VclPtr<BookmarksBox_Impl> m_pBookmarksBox; VclPtr<PushButton> m_pBookmarksPB; - DECL_LINK(OpenHdl, void *); + DECL_LINK_TYPED(OpenHdl, Button*, void); public: BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); @@ -450,11 +451,11 @@ private: getCursor() const; bool isHandledKey( const vcl::KeyCode& _rKeyCode ); - DECL_LINK_TYPED(SelectHdl, Idle *, void); + DECL_LINK_TYPED( SelectHdl, Idle *, void); DECL_LINK( NotifyHdl, SvtMiscOptions* ); DECL_LINK( FindHdl, sfx2::SearchDialog* ); DECL_LINK( CloseHdl, sfx2::SearchDialog* ); - DECL_LINK( CheckHdl, CheckBox* ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); public: SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ); diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 3ecef13f0268..38c0609624b1 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -271,10 +271,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width return TemplateAbstractView::scaleImg(ThumbnailView::readThumbnail(msURL), width, height); } -IMPL_LINK_NOARG(TemplateAbstractView, ShowRootRegionHdl) +IMPL_LINK_NOARG_TYPED(TemplateAbstractView, ShowRootRegionHdl, Button*, void) { showRootRegion(); - return 0; } void TemplateAbstractView::OnItemDblClicked (ThumbnailViewItem *pItem) diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index a6eabcea28a6..ec76c0565041 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -515,7 +515,7 @@ void BackingWindow::Resize() Invalidate(); } -IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton) +IMPL_LINK_TYPED(BackingWindow, ExtLinkClickHdl, Button*, pButton, void) { OUString aNode; @@ -552,10 +552,9 @@ IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton) { } } - return 0; } -IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) +IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, void ) { // dispatch the appropriate URL and end the dialog if( pButton == mpWriterAllButton ) @@ -604,7 +603,6 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) mpLocalView->reload(); mpLocalView->GrabFocus(); } - return 0; } IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, pButton, void ) diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 5c8dd072bc67..ad63152ab4e8 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -105,9 +105,9 @@ class BackingWindow : public vcl::Window, public VclBuilderContainer std::set<const ThumbnailViewItem*, selection_cmp_fn> maSelTemplates; std::set<const ThumbnailViewItem*, selection_cmp_fn> maSelFolders; - DECL_LINK(ClickHdl, Button*); + DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK_TYPED(MenuSelectHdl, MenuButton*, void); - DECL_LINK(ExtLinkClickHdl, Button*); + DECL_LINK_TYPED(ExtLinkClickHdl, Button*, void); DECL_LINK_TYPED(OpenRegionHdl, void*, void); DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 709ba9a16333..b9b1b528d46d 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -623,7 +623,7 @@ void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const // SfxSingleTabDialog ---------------------------------------------------- -IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(SfxSingleTabDialog, OKHdl_Impl, Button*, void) /* [Description] @@ -635,7 +635,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) { // TabPage without ItemSet EndDialog( RET_OK ); - return 1; + return; } if ( !GetOutputItemSet() ) @@ -648,7 +648,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) { int nRet = pImpl->m_pSfxPage->DeactivatePage( GetOutputSetImpl() ); if ( nRet != SfxTabPage::LEAVE_PAGE ) - return 0; + return; else bModified = ( GetOutputItemSet()->Count() > 0 ); } @@ -675,7 +675,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) } else EndDialog(); - return 0; + return; } diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index e628476df652..c6e10ccec20e 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -43,10 +43,9 @@ bool SfxCheckinDialog::IsMajor( ) return m_pMajorCB->IsChecked( ); } -IMPL_LINK_NOARG( SfxCheckinDialog, OKHdl ) +IMPL_LINK_NOARG_TYPED( SfxCheckinDialog, OKHdl, Button*, void ) { EndDialog( RET_OK ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 3334c9e9b97d..408a34346491 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -831,7 +831,7 @@ void SfxDocumentPage::dispose() } -IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) +IMPL_LINK_NOARG_TYPED(SfxDocumentPage, DeleteHdl, Button*, void) { OUString aName; if ( bEnableUseUserData && m_pUseUserDataCB->IsChecked() ) @@ -847,10 +847,9 @@ IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aTime ) ); m_pDocNoValFt->SetText(OUString('1')); bHandleDelete = true; - return 0; } -IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl) +IMPL_LINK_NOARG_TYPED(SfxDocumentPage, SignatureHdl, Button*, void) { SfxObjectShell* pDoc = SfxObjectShell::Current(); if( pDoc ) @@ -859,11 +858,9 @@ IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl) ImplUpdateSignatures(); } - - return 0; } -IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl) +IMPL_STATIC_LINK_NOARG_TYPED(SfxDocumentPage, ChangePassHdl, Button*, void) { SfxObjectShell* pShell = SfxObjectShell::Current(); do @@ -882,7 +879,6 @@ IMPL_STATIC_LINK_NOARG(SfxDocumentPage, ChangePassHdl) pShell->SetModified(); } while (false); - return 0; } void SfxDocumentPage::ImplUpdateSignatures() @@ -1365,12 +1361,11 @@ CustomPropertiesEditButton::CustomPropertiesEditButton(vcl::Window* pParent, Win SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl )); } -IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl) +IMPL_LINK_NOARG_TYPED(CustomPropertiesEditButton, ClickHdl, Button*, void) { VclPtrInstance< DurationDialog_Impl > pDurationDlg( this, m_pLine->m_aDurationField->GetDuration() ); if ( RET_OK == pDurationDlg->Execute() ) m_pLine->m_aDurationField->SetDuration( pDurationDlg->GetDuration() ); - return 1; } void CustomPropertiesYesNoButton::Resize() @@ -1540,8 +1535,9 @@ IMPL_STATIC_LINK( return 0; } -IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pButton ) +IMPL_LINK_TYPED( CustomPropertiesWindow, RemoveHdl, Button*, pBtn, void ) { + CustomPropertiesRemoveButton* pButton = static_cast<CustomPropertiesRemoveButton*>(pBtn); CustomPropertyLine* pLine = pButton->GetLine(); std::vector< CustomPropertyLine* >::iterator pFound = std::find( m_aCustomPropertiesLines.begin(), m_aCustomPropertiesLines.end(), pLine ); @@ -1573,7 +1569,6 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pBu } m_aRemovedHdl.Call(0); - return 0; } IMPL_LINK( CustomPropertiesWindow, EditLoseFocusHdl, CustomPropertiesEdit*, pEdit ) @@ -2189,11 +2184,10 @@ void SfxCustomPropertiesPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl) +IMPL_LINK_NOARG_TYPED(SfxCustomPropertiesPage, AddHdl, Button*, void) { Any aAny; m_pPropertiesCtrl->AddLine( OUString(), aAny, true ); - return 0; } bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 67208ba61e73..d6d9d2e6d1b0 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -230,10 +230,9 @@ void SfxInfoBarWindow::Resize() m_pMessage->SetPosSizePixel(aMessagePosition, aMessageSize); } -IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler) +IMPL_LINK_NOARG_TYPED(SfxInfoBarWindow, CloseHandler, Button*, void) { static_cast<SfxInfoBarContainerWindow*>(GetParent())->removeInfoBar(this); - return 0; } SfxInfoBarContainerWindow::SfxInfoBarContainerWindow(SfxInfoBarContainerChild* pChildWin ) : diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index faa591d89f6a..8aa717d4a56e 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -45,10 +45,9 @@ OUString InputDialog::getEntryText() const return m_pEntry->GetText(); } -IMPL_LINK(InputDialog,ClickHdl,PushButton*, pButton) +IMPL_LINK_TYPED(InputDialog,ClickHdl, Button*, pButton, void) { EndDialog(pButton == m_pOK ? RET_OK : RET_CANCEL); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 8b69def6daee..b97ac2df97cc 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -353,16 +353,12 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl ) return 0; } -IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl ) +IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) { - OUString aTemplName(m_pFollowLb->GetSelectEntry()); if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily(), 0 )) { } - - return 0; - } IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl ) @@ -375,12 +371,11 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl ) return 0; } -IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl ) +IMPL_LINK_NOARG_TYPED( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) { OUString aTemplName(m_pBaseLb->GetSelectEntry()); if (aTemplName != SfxResId(STR_NONE)) Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily(), 0 ); - return 0; } // Internal: Perform functions through the Dispatcher diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 57396e79b00f..4b0408fe3ddc 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -28,9 +28,12 @@ // PRIVATE METHODES ------------------------------------------------------ -IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl ) +IMPL_LINK_NOARG_TYPED( SfxNewStyleDlg, OKClickHdl, Button*, void ) +{ + OKHdl(NULL); +} +IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, /*pControl*/ ) { - (void)pControl; //unused const OUString aName( m_pColBox->GetText() ); SfxStyleSheetBase* pStyle = rPool.Find( aName, rPool.GetSearchFamily() ); if ( pStyle ) @@ -67,7 +70,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rIn m_pColBox->set_height_request(m_pColBox->GetTextHeight() * 10); get(m_pOKBtn, "ok"); - m_pOKBtn->SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); + m_pOKBtn->SetClickHdl(LINK(this, SfxNewStyleDlg, OKClickHdl)); m_pColBox->SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl)); m_pColBox->SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl)); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 9ae21b08e1ed..96f7c42a6dea 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -60,7 +60,7 @@ IMPL_LINK( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit ) return 0; } -IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) +IMPL_LINK_NOARG_TYPED(SfxPasswordDialog, OKHdl, Button*, void) { bool bConfirmFailed = bool( mnExtras & SfxShowExtras::CONFIRM ) && ( GetConfirm() != GetPassword() ); @@ -75,7 +75,6 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) } else EndDialog( RET_OK ); - return 0; } // CTOR / DTOR ----------------------------------------------------------- @@ -112,8 +111,7 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou Link<> aLink = LINK( this, SfxPasswordDialog, EditModifyHdl ); mpPassword1ED->SetModifyHdl( aLink ); mpPassword2ED->SetModifyHdl( aLink ); - aLink = LINK( this, SfxPasswordDialog, OKHdl ); - mpOKBtn->SetClickHdl( aLink ); + mpOKBtn->SetClickHdl( LINK( this, SfxPasswordDialog, OKHdl ) ); if (pGroupText) mpPassword1Box->set_label(*pGroupText); diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 28a245325c58..8c25b8fefc72 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -271,22 +271,18 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt } } -IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox ) +IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, Button*, void ) { - (void)pBox; //unused const bool bReduceTransparency = m_pReduceTransparencyCB->IsChecked(); m_pReduceTransparencyAutoRB->Enable( bReduceTransparency ); m_pReduceTransparencyNoneRB->Enable( bReduceTransparency ); m_pTransparencyCB->Enable( !bReduceTransparency ); - - return 0; } -IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox ) +IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, Button*, void ) { - (void)pBox; //unused const bool bEnable = m_pReduceGradientsCB->IsChecked(); m_pReduceGradientsStripesRB->Enable( bEnable ); @@ -294,13 +290,10 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p m_pReduceGradientsStepCountNF->Enable( bEnable ); ToggleReduceGradientsStripesRBHdl(m_pReduceGradientsStripesRB); - - return 0; } -IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox ) +IMPL_LINK_NOARG_TYPED( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, Button*, void ) { - (void)pBox; //unused const bool bEnable = m_pReduceBitmapsCB->IsChecked(); m_pReduceBitmapsOptimalRB->Enable( bEnable ); @@ -310,8 +303,6 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo m_pReduceBitmapsResolutionLB->Enable( bEnable ); ToggleReduceBitmapsResolutionRBHdl(m_pReduceBitmapsResolutionRB); - - return 0; } IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton ) diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 60ff95989b9b..c92981fe6acb 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -150,7 +150,7 @@ struct SfxSecurityPage_Impl bool m_bEndRedliningWarningDone; DECL_LINK( RecordChangesCBToggleHdl, void* ); - DECL_LINK( ChangeProtectionPBHdl, void* ); + DECL_LINK_TYPED( ChangeProtectionPBHdl, Button*, void ); SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet ); ~SfxSecurityPage_Impl(); @@ -377,10 +377,10 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl) } -IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) +IMPL_LINK_NOARG_TYPED(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void) { if (m_eRedlingMode == RL_NONE) - return 0; + return; // the push button text is always the opposite of the current state. Thus: const bool bCurrentProtection = m_pUnProtectPB->IsVisible(); @@ -393,7 +393,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) { // ask for password and if dialog is canceled or no password provided return if (!lcl_GetPassword( m_rMyTabPage.GetParent(), bNewProtection, aPasswordText )) - return 0; + return; // provided password still needs to be checked? if (!bNewProtection && !m_bOrigPasswordIsConfirmed) @@ -401,7 +401,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) if (lcl_IsPasswordCorrect( aPasswordText )) m_bOrigPasswordIsConfirmed = true; else - return 0; + return; } } DBG_ASSERT( m_bOrigPasswordIsConfirmed, "ooops... this should not have happened!" ); @@ -415,8 +415,6 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) m_pUnProtectPB->Show(bNewProtection); m_pProtectPB->Show(!bNewProtection); - - return 0; } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index a74292f92d22..9f4d099c4bec 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -132,7 +132,7 @@ void SearchDialog::SaveConfig() aViewOpt.SetUserItem( "UserItem", aUserItem ); } -IMPL_LINK_NOARG(SearchDialog, FindHdl) +IMPL_LINK_NOARG_TYPED(SearchDialog, FindHdl, Button*, void) { OUString sSrchTxt = m_pSearchEdit->GetText(); sal_Int32 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt ); @@ -141,7 +141,6 @@ IMPL_LINK_NOARG(SearchDialog, FindHdl) if ( nPos > 0 ) m_pSearchEdit->InsertEntry( sSrchTxt, 0 ); m_aFindHdl.Call( this ); - return 0; } void SearchDialog::SetFocusOnEdit() diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 6c3f55009bbf..d96b80ba07ac 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -118,7 +118,7 @@ short SfxStyleDialog::Ok() -IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton ) +IMPL_LINK_NOARG_TYPED( SfxStyleDialog, CancelHdl, Button *, void ) /* [Description] @@ -127,7 +127,6 @@ IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton ) */ { - (void)pButton; //unused SfxTabPage* pPage = GetTabPage(m_nOrganizerId); const SfxItemSet* pInSet = GetInputSetImpl(); @@ -148,7 +147,6 @@ IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton ) if ( pPage ) pPage->Reset( GetInputSetImpl() ); EndDialog(); - return 0; } OUString SfxStyleDialog::GenerateUnusedName(SfxStyleSheetBasePool &rPool) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 2b7111646b32..d19a2abfa9b0 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -567,7 +567,7 @@ void SfxTabDialog::Start( bool bShow ) -void SfxTabDialog::SetApplyHandler(const Link<>& _rHdl) +void SfxTabDialog::SetApplyHandler(const Link<Button*, void>& _rHdl) { DBG_ASSERT( m_pApplyBtn, "SfxTabDialog::GetApplyHandler: no apply button enabled!" ); if ( m_pApplyBtn ) @@ -860,10 +860,9 @@ short SfxTabDialog::Ok() return bModified ? RET_OK : RET_CANCEL; } -IMPL_LINK_NOARG(SfxTabDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(SfxTabDialog, CancelHdl, Button*, void) { EndDialog( RET_USER_CANCEL ); - return 0; } @@ -898,7 +897,7 @@ void SfxTabDialog::RefreshInputSet() -IMPL_LINK_NOARG(SfxTabDialog, OkHdl) +IMPL_LINK_NOARG_TYPED(SfxTabDialog, OkHdl, Button*, void) /* [Description] @@ -919,7 +918,6 @@ IMPL_LINK_NOARG(SfxTabDialog, OkHdl) Close(); } } - return 0; } bool SfxTabDialog::Apply() @@ -968,7 +966,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage() -IMPL_LINK_NOARG(SfxTabDialog, UserHdl) +IMPL_LINK_NOARG_TYPED(SfxTabDialog, UserHdl, Button*, void) /* [Description] @@ -989,12 +987,11 @@ IMPL_LINK_NOARG(SfxTabDialog, UserHdl) nRet = RET_USER_CANCEL; EndDialog( nRet ); } - return 0; } -IMPL_LINK_NOARG(SfxTabDialog, ResetHdl) +IMPL_LINK_NOARG_TYPED(SfxTabDialog, ResetHdl, Button*, void) /* [Description] @@ -1016,12 +1013,11 @@ IMPL_LINK_NOARG(SfxTabDialog, ResetHdl) } else pDataObject->pTabPage->Reset( pSet ); - return 0; } -IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl) +IMPL_LINK_NOARG_TYPED(SfxTabDialog, BaseFmtHdl, Button*, void) /* [Description] @@ -1094,7 +1090,6 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl) pDataObject->pTabPage->Reset( &aTmpSet ); pDataObject->pTabPage->pImpl->mbStandard = true; } - return 1; } diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 7b7a553855e1..fc2de4f7b449 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -126,10 +126,9 @@ void SfxTemplateInfoDlg::loadDocument(const OUString &rURL) } } -IMPL_LINK_NOARG (SfxTemplateInfoDlg, CloseHdl) +IMPL_LINK_NOARG_TYPED(SfxTemplateInfoDlg, CloseHdl, Button*, void) { Close(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 0ea9352e5458..5fe8966a8c64 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -213,7 +213,7 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersion m_pVersionBox = VclPtr<SfxVersionsTabListBox_Impl>::Create(*pContainer, WB_TABSTOP); - Link<> aClickLink = LINK( this, SfxVersionDialog, ButtonHdl_Impl ); + Link<Button*,void> aClickLink = LINK( this, SfxVersionDialog, ButtonHdl_Impl ); m_pViewButton->SetClickHdl ( aClickLink ); m_pSaveButton->SetClickHdl ( aClickLink ); m_pDeleteButton->SetClickHdl ( aClickLink ); @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) return 0L; } -IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) +IMPL_LINK_TYPED( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); SvTreeListEntry *pEntry = m_pVersionBox->FirstSelected(); @@ -463,8 +463,6 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) VclPtrInstance< SfxCmisVersionsDialog > pDlg(pViewFrame); pDlg->Execute(); } - - return 0L; } SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit) @@ -520,13 +518,12 @@ void SfxViewVersionDialog_Impl::dispose() SfxModalDialog::dispose(); } -IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton) +IMPL_LINK_TYPED(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton, void) { assert(pButton == m_pOKButton); (void)pButton; m_rInfo.aComment = m_pEdit->GetText(); EndDialog(RET_OK); - return 0L; } SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame ) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index ac71fd744cbf..aa2a062589a9 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -151,7 +151,7 @@ class SfxNewFileDialog_Impl DECL_LINK(TemplateSelect, void*); DECL_LINK(DoubleClick, ListBox*); DECL_LINK(Expand, void*); - DECL_LINK(LoadFile, void*); + DECL_LINK_TYPED(LoadFile, Button*, void); sal_uInt16 GetSelectedTemplatePos() const; public: @@ -292,10 +292,9 @@ IMPL_LINK( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox ) return 0; } -IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile) +IMPL_LINK_NOARG_TYPED(SfxNewFileDialog_Impl, LoadFile, Button*, void) { pAntiImpl->EndDialog(RET_TEMPLATE_LOAD); - return 0; } sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx index 41888d44d3c9..6e3fbe345103 100644 --- a/sfx2/source/inc/inputdlg.hxx +++ b/sfx2/source/inc/inputdlg.hxx @@ -15,6 +15,7 @@ class Edit; class FixedText; class PushButton; +class Button; class InputDialog : public ModalDialog { @@ -26,7 +27,7 @@ public: private: - DECL_LINK(ClickHdl, PushButton*); + DECL_LINK_TYPED(ClickHdl, Button*, void); private: diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 9ad3f3bf983b..e9ab98548bd8 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -59,7 +59,7 @@ class SfxVersionDialog : public SfxModalDialog DECL_LINK(DClickHdl_Impl, void *); DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK( ButtonHdl_Impl, Button* ); + DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void ); void Init_Impl(); void Open_Impl(); @@ -80,7 +80,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog VclPtr<CloseButton> m_pCloseButton; SfxVersionInfo& m_rInfo; - DECL_LINK(ButtonHdl, Button*); + DECL_LINK_TYPED(ButtonHdl, Button*, void); public: SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit); diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index d04f5b42d92e..3f6f430752b2 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -273,7 +273,7 @@ Image TabBar::GetItemImage(const DeckDescriptor& rDeckDescriptor) const mxFrame); } -IMPL_LINK(TabBar::Item, HandleClick, Button*,) +IMPL_LINK_NOARG_TYPED(TabBar::Item, HandleClick, Button*, void) { try { @@ -281,8 +281,6 @@ IMPL_LINK(TabBar::Item, HandleClick, Button*,) } catch(const css::uno::Exception&) {} // workaround for #i123198# - - return 1; } const ::rtl::OUString TabBar::GetDeckIdForIndex (const sal_Int32 nIndex) const @@ -336,10 +334,10 @@ void TabBar::UpdateFocusManager(FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } -IMPL_LINK_NOARG(TabBar, OnToolboxClicked) +IMPL_LINK_NOARG_TYPED(TabBar, OnToolboxClicked, Button*, void) { if (!mpMenuButton) - return 0; + return; std::vector<DeckMenuData> aMenuData; @@ -366,8 +364,6 @@ IMPL_LINK_NOARG(TabBar, OnToolboxClicked) mpMenuButton->GetSizePixel()), aMenuData); mpMenuButton->Check(false); - - return 0; } } } // end of namespace sfx2::sidebar 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; } /** diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 968d12e70664..ec94f62ce7a5 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -62,7 +62,7 @@ class SmPrintOptionsTabPage : public SfxTabPage VclPtr<CheckBox> m_pNoRightSpaces; VclPtr<CheckBox> m_pSaveOnlyUsedSymbols; - DECL_LINK(SizeButtonClickHdl, Button *); + DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void); virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; @@ -104,7 +104,7 @@ class SmFontDialog : public ModalDialog DECL_LINK(FontSelectHdl, ComboBox *); DECL_LINK(FontModifyHdl, ComboBox *); - DECL_LINK(AttrChangeHdl, CheckBox *); + DECL_LINK_TYPED(AttrChangeHdl, Button *, void); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -132,7 +132,7 @@ class SmFontSizeDialog : public ModalDialog VclPtr<MetricField> m_pBorderSize; VclPtr<PushButton> m_pDefaultButton; - DECL_LINK(DefaultButtonClickHdl, Button *); + DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); public: SmFontSizeDialog(vcl::Window *pParent); @@ -160,7 +160,7 @@ class SmFontTypeDialog : public ModalDialog VclPtr<OutputDevice> pFontListDev; DECL_LINK(MenuSelectHdl, Menu *); - DECL_LINK(DefaultButtonClickHdl, Button *); + DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); public: SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); @@ -224,8 +224,8 @@ class SmDistanceDialog : public ModalDialog DECL_LINK(GetFocusHdl, Control *); DECL_LINK(MenuSelectHdl, Menu *); - DECL_LINK(DefaultButtonClickHdl, Button *); - DECL_LINK(CheckBoxClickHdl, CheckBox *); + DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); + DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void); using Window::SetHelpId; static void SetHelpId(MetricField &rField, const OString& sHelpId); @@ -254,7 +254,7 @@ class SmAlignDialog : public ModalDialog VclPtr<RadioButton> m_pRight; VclPtr<PushButton> m_pDefaultButton; - DECL_LINK(DefaultButtonClickHdl, Button *); + DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void); public: SmAlignDialog(vcl::Window *pParent); @@ -367,8 +367,8 @@ class SmSymbolDialog : public ModalDialog DECL_LINK(SymbolSetChangeHdl, void*); DECL_LINK(SymbolChangeHdl, void*); DECL_LINK(SymbolDblClickHdl, void*); - DECL_LINK(EditClickHdl, void*); - DECL_LINK(GetClickHdl, void*); + DECL_LINK_TYPED(EditClickHdl, Button*, void); + DECL_LINK_TYPED(GetClickHdl, Button*, void); void FillSymbolSets(bool bDeleteText = true); const SmSym *GetSymbol() const; @@ -439,9 +439,9 @@ class SmSymDefineDialog : public ModalDialog DECL_LINK(SubsetChangeHdl, ListBox*); DECL_LINK(StyleChangeHdl, ComboBox *); DECL_LINK(CharHighlightHdl, void *); - DECL_LINK(AddClickHdl, Button *); - DECL_LINK(ChangeClickHdl, Button *); - DECL_LINK(DeleteClickHdl, Button *); + DECL_LINK_TYPED(AddClickHdl, Button *, void); + DECL_LINK_TYPED(ChangeClickHdl, Button *, void); + DECL_LINK_TYPED(DeleteClickHdl, Button *, void); void FillSymbols(ComboBox &rComboBox, bool bDeleteText = true); void FillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index b0503f5f046b..57ab5bae7754 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -159,10 +159,9 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont) rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL); } -IMPL_LINK( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *,/*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void ) { m_pZoom->Enable(m_pSizeZoomed->IsChecked()); - return 0; } SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rOptions) @@ -314,7 +313,7 @@ IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox ) return 0; } -IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, /*pCheckBox*/ ) +IMPL_LINK_NOARG_TYPED( SmFontDialog, AttrChangeHdl, Button*, void ) { if (m_pBoldCheckBox->IsChecked()) maFont.SetWeight(FontWeight(WEIGHT_BOLD)); @@ -327,7 +326,6 @@ IMPL_LINK( SmFontDialog, AttrChangeHdl, CheckBox *, /*pCheckBox*/ ) maFont.SetItalic(ITALIC_NONE); m_pShowFont->SetFont(maFont); - return 0; } void SmFontDialog::SetFont(const vcl::Font &rFont) @@ -420,7 +418,7 @@ public: } }; -IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES) { @@ -429,7 +427,6 @@ IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) WriteTo( aFmt ); pp->GetConfig()->SetStandardFormat( aFmt ); } - return 0; } SmFontSizeDialog::SmFontSizeDialog(vcl::Window * pParent) @@ -524,7 +521,7 @@ IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu ) } -IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES) { @@ -533,7 +530,6 @@ IMPL_LINK( SmFontTypeDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) WriteTo( aFmt ); pp->GetConfig()->SetStandardFormat( aFmt, true ); } - return 0; } SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntListDevice) @@ -721,7 +717,7 @@ IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu ) } -IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES) { @@ -730,10 +726,9 @@ IMPL_LINK( SmDistanceDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) WriteTo( aFmt ); pp->GetConfig()->SetStandardFormat( aFmt ); } - return 0; } -IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox ) +IMPL_LINK_TYPED( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void ) { if (pCheckBox == m_pCheckBox1) { @@ -743,7 +738,6 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox ) m_pFixedText4->Enable( bChecked ); m_pMetricField4->Enable( bChecked ); } - return 0; } @@ -1027,7 +1021,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/ rFormat.RequestApplyChanges(); } -IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( SmAlignDialog, DefaultButtonClickHdl, Button *, void ) { if (ScopedVclPtr<SaveDefaultsQuery>::Create(this)->Execute() == RET_YES) { @@ -1036,7 +1030,6 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, /*pButton*/ ) WriteTo( aFmt ); pp->GetConfig()->SetStandardFormat( aFmt ); } - return 0; } SmAlignDialog::SmAlignDialog(vcl::Window * pParent) @@ -1472,7 +1465,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, SymbolChangeHdl ) return 0; } -IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl) +IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void) { ScopedVclPtrInstance<SmSymDefineDialog> pDialog(this, pFontListDev, rSymbolMgr); @@ -1510,8 +1503,6 @@ IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl) if (nSymPos >= aSymbolSet.size()) nSymPos = static_cast< sal_uInt16 >(aSymbolSet.size()) - 1; SelectSymbol( nSymPos ); - - return 0; } @@ -1523,7 +1514,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl ) } -IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl ) +IMPL_LINK_NOARG_TYPED( SmSymbolDialog, GetClickHdl, Button*, void ) { const SmSym *pSym = GetSymbol(); if (pSym) @@ -1535,8 +1526,6 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl ) SID_INSERTSYMBOL, SfxCallMode::RECORD, new SfxStringItem(SID_INSERTSYMBOL, aText.makeStringAndClear()), 0L); } - - return 0; } @@ -1922,7 +1911,7 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl) } -IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void ) { (void) pButton; #if OSL_DEBUG_LEVEL > 1 @@ -1948,12 +1937,10 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton ) FillSymbols(*pSymbols ,false); UpdateButtons(); - - return 0; } -IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void ) { (void) pButton; #if OSL_DEBUG_LEVEL > 1 @@ -1989,12 +1976,10 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton ) FillSymbols(*pSymbols ,false); UpdateButtons(); - - return 0; } -IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton ) +IMPL_LINK_TYPED( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void ) { (void) pButton; #if OSL_DEBUG_LEVEL > 1 @@ -2017,8 +2002,6 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton ) } UpdateButtons(); - - return 0; } diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index e55b90d0c123..e486e0e7b0bb 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -259,10 +259,10 @@ namespace svt } - IMPL_LINK_NOARG(CheckBoxControl, OnClick) + IMPL_LINK_NOARG_TYPED(CheckBoxControl, OnClick, Button*, void) { m_aClickLink.Call(pBox); - return m_aModifyLink.Call(pBox); + m_aModifyLink.Call(pBox); } diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 12cdcfd867a4..a403848ebfe7 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -2252,8 +2252,9 @@ IMPL_LINK_TYPED( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) } } -IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( CalendarField, ImplClickHdl, Button*, pButton, void ) { + PushButton* pBtn = static_cast<PushButton*>(pButton); mpFloatWin->EndPopupMode(); EndDropDown(); GrabFocus(); @@ -2277,8 +2278,6 @@ IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn ) Modify(); } } - - return 0; } IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl) diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 4482cf4b8ab9..34941ecce52a 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -186,11 +186,9 @@ void FileControl::Resize() -IMPL_LINK_NOARG(FileControl, ButtonHdl) +IMPL_LINK_NOARG_TYPED(FileControl, ButtonHdl, Button*, void) { ImplBrowseFile( ); - - return 0; } void FileControl::GetFocus() diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index a4cfe4e2d340..6cb9fe4919ef 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -822,14 +822,14 @@ void TabBar::ImplInitControls() if ((mnWinStyle & WB_INSERTTAB) && !mpImpl->mpAddButton) { - Link<> aLink = LINK(this, TabBar, ImplAddClickHandler); + Link<Button*,void> aLink = LINK(this, TabBar, ImplAddClickHandler); mpImpl->mpAddButton.reset(VclPtr<ImplTabButton>::Create(this, WB_REPEAT)); mpImpl->mpAddButton->SetClickHdl(aLink); mpImpl->mpAddButton->SetSymbol(SymbolType::PLUS); mpImpl->mpAddButton->Show(); } - Link<> aLink = LINK( this, TabBar, ImplClickHdl ); + Link<Button*,void> aLink = LINK( this, TabBar, ImplClickHdl ); if (mnWinStyle & (WB_MINSCROLL | WB_SCROLL)) { @@ -929,8 +929,9 @@ void TabBar::ImplShowPage( sal_uInt16 nPos ) } } -IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn ) +IMPL_LINK_TYPED( TabBar, ImplClickHdl, Button*, pButton, void ) { + ImplTabButton* pBtn = static_cast<ImplTabButton*>(pButton); EndEditMode(); sal_uInt16 nNewPos = mnFirstPos; @@ -958,19 +959,16 @@ IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn ) } else { - return 0; + return; } if (nNewPos != mnFirstPos) SetFirstPageId(GetPageId(nNewPos)); - - return 0; } -IMPL_LINK_NOARG(TabBar, ImplAddClickHandler) +IMPL_LINK_NOARG_TYPED(TabBar, ImplAddClickHandler, Button*, void) { AddTabClick(); - return 0; } void TabBar::MouseMove(const MouseEvent& rMEvt) diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 5b8bba57c044..b244494fbfda 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -252,7 +252,7 @@ void PlaceEditDialog::UpdateLabel( ) } } -IMPL_LINK ( PlaceEditDialog, OKHdl, Button *, ) +IMPL_LINK_TYPED( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) { if ( m_xCurrentDetails.get() ) { @@ -285,15 +285,12 @@ IMPL_LINK ( PlaceEditDialog, OKHdl, Button *, ) EndDialog( RET_OK ); } } - - return 1; } -IMPL_LINK ( PlaceEditDialog, DelHdl, Button *, ) +IMPL_LINK_TYPED( PlaceEditDialog, DelHdl, Button*, /*pButton*/, void) { // ReUsing existing symbols... EndDialog( RET_NO ); - return 1; } IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditHdl, DetailsContainer*, void ) diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index ad4750e27ece..96da5918c740 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -393,7 +393,7 @@ void CmisDetailsContainer::selectRepository( ) } } -IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl ) +IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, RefreshReposHdl, Button*, void ) { OUString sBindingUrl = m_pEDHost->GetText().trim( ); @@ -456,8 +456,6 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl ) m_pLBRepository->SelectEntryPos( 0 ); selectRepository( ); } - - return 0; } IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl ) diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 01b730bf7d31..041c198e619a 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1155,7 +1155,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked) + IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnOkClicked, Button*, void) { OUString sSelectedDS = lcl_getSelectedDataSource(*m_pDatasource); if ( m_pImpl->bWorkingPersistent ) @@ -1178,11 +1178,10 @@ void AssignmentPersistentData::ImplCommit() EndDialog(RET_OK); - return 0L; } - IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources) + IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnAdministrateDatasources, Button*, void) { // create the dialog object Reference< XExecutableDialog > xAdminDialog; @@ -1194,7 +1193,7 @@ void AssignmentPersistentData::ImplCommit() if (!xAdminDialog.is()) { ShowServiceNotAvailableError(this, OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), true); - return 1L; + return; } // execute the dialog @@ -1232,8 +1231,6 @@ void AssignmentPersistentData::ImplCommit() // try to preserve the current selection // initializeDatasources(); - - return 0L; } bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt ) diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 05a7e6d9c59b..849714f133e5 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -264,7 +264,7 @@ void PrinterSetupDialog::dispose() ModalDialog::dispose(); } -void PrinterSetupDialog::SetOptionsHdl( const Link<>& rLink ) +void PrinterSetupDialog::SetOptionsHdl( const Link<Button*,void>& rLink ) { m_pBtnOptions->SetClickHdl( rLink ); m_pBtnOptions->Show( rLink.IsSet() ); @@ -301,13 +301,11 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) -IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl) +IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) { if ( !mpTempPrinter ) mpTempPrinter = VclPtr<Printer>::Create( mpPrinter->GetJobSetup() ); mpTempPrinter->Setup( this ); - - return 0; } diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 1fa2de2c6c73..3deeb8b0995a 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -59,22 +59,22 @@ public: ModalDialog::dispose(); } private: - DECL_LINK(hdlYes, void *); - DECL_LINK(hdlNo, void *); + DECL_LINK_TYPED(hdlYes, Button*, void); + DECL_LINK_TYPED(hdlNo, Button*, void); VclPtr<vcl::Window> reason_; VclPtr<PushButton> btnYes_; VclPtr<PushButton> btnNo_; }; -IMPL_LINK_NOARG(RestartDialog, hdlYes) { +IMPL_LINK_NOARG_TYPED(RestartDialog, hdlYes, Button*, void) +{ EndDialog(RET_OK); - return 0; } -IMPL_LINK_NOARG(RestartDialog, hdlNo) { +IMPL_LINK_NOARG_TYPED(RestartDialog, hdlNo, Button*, void) +{ EndDialog(); - return 0; } } diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index ffb47bb6255b..458598b3e673 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -412,16 +412,16 @@ namespace svt } - IMPL_LINK_NOARG(OWizardMachine, OnFinish) + IMPL_LINK_NOARG_TYPED(OWizardMachine, OnFinish, Button*, void) { if ( isTravelingSuspended() ) - return 0; + return; WizardTravelSuspension aTravelGuard( *this ); if ( !prepareLeaveCurrentState( eFinish ) ) { - return 0L; + return; } - return onFinish() ? 1L : 0L; + onFinish(); } @@ -629,23 +629,21 @@ namespace svt } - IMPL_LINK_NOARG(OWizardMachine, OnPrevPage) + IMPL_LINK_NOARG_TYPED(OWizardMachine, OnPrevPage, Button*, void) { if ( isTravelingSuspended() ) - return 0; + return; WizardTravelSuspension aTravelGuard( *this ); - bool nRet = travelPrevious(); - return nRet ? 1 : 0; + travelPrevious(); } - IMPL_LINK_NOARG(OWizardMachine, OnNextPage) + IMPL_LINK_NOARG_TYPED(OWizardMachine, OnNextPage, Button*, void) { if ( isTravelingSuspended() ) - return 0; + return; WizardTravelSuspension aTravelGuard( *this ); - bool nRet = travelNext(); - return nRet ? 1 : 0; + travelNext(); } diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 1c6a6a0695bc..5f5f85e8659f 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -658,20 +658,20 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara, setupControls(); // Size - mpLbSizeX->SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpLbSizeX->SetSelectHdl( LINK( this, ExportDialog, SelectHdl ) ); if (mpSbCompression) mpSbCompression->SetScrollHdl(LINK(this, ExportDialog, SbCompressionUpdateHdl)); if (mpNfCompression) - mpNfCompression->SetModifyHdl(LINK(this, ExportDialog, UpdateHdl)); + mpNfCompression->SetModifyHdl(LINK(this, ExportDialog, SelectHdl)); mpMfSizeX->SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeX ) ); mpMfSizeY->SetModifyHdl( LINK( this, ExportDialog, UpdateHdlMtfSizeY ) ); mpNfResolution->SetModifyHdl( LINK( this, ExportDialog, UpdateHdlNfResolution ) ); - mpLbResolution->SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpLbResolution->SetSelectHdl( LINK( this, ExportDialog, SelectHdl ) ); - mpLbColorDepth->SetSelectHdl( LINK( this, ExportDialog, UpdateHdl ) ); + mpLbColorDepth->SetSelectHdl( LINK( this, ExportDialog, SelectHdl ) ); mpCbInterlaced->SetClickHdl( LINK( this, ExportDialog, UpdateHdl ) ); @@ -1028,11 +1028,15 @@ void ExportDialog::dispose() |* stores values set in the ini-file |* \************************************************************************/ -IMPL_LINK_NOARG(ExportDialog, UpdateHdl) +IMPL_LINK_NOARG(ExportDialog, SelectHdl) { - updateControls(); + UpdateHdl(NULL); return 0; } +IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdl, Button*, void) +{ + updateControls(); +} IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX) { @@ -1123,15 +1127,12 @@ IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl) return 0; } -IMPL_LINK_NOARG(ExportDialog, OK) +IMPL_LINK_NOARG_TYPED(ExportDialog, OK, Button*, void) { // writing config parameter - mrFltCallPara.aFilterData = GetFilterData( true ); EndDialog( RET_OK ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index a68aa69921d3..898e6aaf6f16 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -142,13 +142,14 @@ private: mxPage; - DECL_LINK( UpdateHdl, void* ); + DECL_LINK_TYPED( UpdateHdl, Button*, void ); + DECL_LINK( SelectHdl, void* ); DECL_LINK( UpdateHdlMtfSizeX, void* ); DECL_LINK( UpdateHdlMtfSizeY, void* ); DECL_LINK( UpdateHdlNfResolution, void* ); DECL_LINK( SbCompressionUpdateHdl, void* ); - DECL_LINK( OK, void* ); + DECL_LINK_TYPED( OK, Button*, void ); void setupSizeControls(); void createFilterOptions(); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index b872489c8991..583ebed423cd 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -410,7 +410,7 @@ namespace svt } protected: - DECL_LINK( OnScroll, const PushButton* ); + DECL_LINK_TYPED( OnScroll, Button*, void ); void impl_calcItemRects(); Size impl_calculateItemContentSize( const PToolPanel& i_pPanel, const TabItemContent i_eItemContent ) const; @@ -924,8 +924,9 @@ namespace svt } - IMPL_LINK( PanelTabBar_Impl, OnScroll, const PushButton*, i_pButton ) + IMPL_LINK_TYPED( PanelTabBar_Impl, OnScroll, Button*, pButton, void ) { + PushButton* i_pButton = static_cast<PushButton*>(pButton); if ( i_pButton == m_aScrollBack.get() ) { OSL_ENSURE( m_nScrollPosition > 0, "PanelTabBar_Impl::OnScroll: inconsistency!" ); @@ -940,8 +941,6 @@ namespace svt } UpdateScrollButtons(); - - return 0L; } diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index ef68703c7b71..bbe0d9647a5f 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -173,10 +173,10 @@ public: bool IsExecReady() const { return bExecState; } DECL_LINK_TYPED( PipetteHdl, ToolBox*, void ); - DECL_LINK( CbxHdl, CheckBox* ); - DECL_LINK( CbxTransHdl, CheckBox* ); + DECL_LINK_TYPED( CbxHdl, Button*, void); + DECL_LINK_TYPED( CbxTransHdl, Button*, void ); DECL_LINK( FocusLbHdl, ColorLB* ); - DECL_LINK(ExecHdl, void *); + DECL_LINK_TYPED(ExecHdl, Button*, void); }; @@ -199,8 +199,9 @@ IMPL_LINK_TYPED( MaskData, PipetteHdl, ToolBox*, pTbx, void ) rBindings.GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aBItem, 0L ); } -IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) +IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) { + CheckBox* pCbx = static_cast<CheckBox*>(pButton); bIsReady = pMask->m_pCbx1->IsChecked() || pMask->m_pCbx2->IsChecked() || pMask->m_pCbx3->IsChecked() || pMask->m_pCbx4->IsChecked(); @@ -229,14 +230,13 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) pMask->m_pTbxPipette->CheckItem( pMask->m_pTbxPipette->GetItemId(0) ); PipetteHdl(pMask->m_pTbxPipette); } - - return 0; } -IMPL_LINK( MaskData, CbxTransHdl, CheckBox*, pCbx ) +IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) { + CheckBox* pCbx = static_cast<CheckBox*>(pButton); bIsReady = pCbx->IsChecked(); if ( bIsReady ) { @@ -292,8 +292,6 @@ IMPL_LINK( MaskData, CbxTransHdl, CheckBox*, pCbx ) pMask->m_pBtnExec->Enable(); else pMask->m_pBtnExec->Disable(); - - return 0L; } @@ -311,12 +309,10 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb ) -IMPL_LINK_NOARG(MaskData, ExecHdl) +IMPL_LINK_NOARG_TYPED(MaskData, ExecHdl, Button*, void) { SfxBoolItem aBItem( SID_BMPMASK_EXEC, true ); rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L ); - - return 0L; } void ColorWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& /*Rect*/) diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 43656aff665d..c398969ad996 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -340,7 +340,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB ) return 0L; } -IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl ) +IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) { sal_Int32 aSize = 0; @@ -361,7 +361,6 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl ) aNewSizeString = aNewSizeString.replaceAll("$(CAPACITY)", aSizeAsString); m_pFixedText6->SetText(aNewSizeString); } - return 0L; } Rectangle CompressGraphicsDialog::GetScaledCropRectangle() diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 602a7c2a76b8..3a6d07b9feef 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -392,7 +392,7 @@ SvxTPView::SvxTPView(vcl::Window *pParent, VclBuilderContainer *pTopLevel) pTable->set_height_request(aControlSize.Height()); m_pViewData = VclPtr<SvxRedlinTable>::Create(*pTable, 0); - Link<> aLink=LINK( this, SvxTPView, PbClickHdl); + Link<Button*,void> aLink=LINK( this, SvxTPView, PbClickHdl); m_pAccept->SetClickHdl(aLink); m_pAcceptAll->SetClickHdl(aLink); @@ -509,8 +509,9 @@ void SvxTPView::EnableUndo(bool nFlag) } -IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) +IMPL_LINK_TYPED( SvxTPView, PbClickHdl, Button*, pButton, void ) { + PushButton* pPushB = static_cast<PushButton*>(pButton); if (pPushB == m_pAccept) { AcceptClickLk.Call(this); @@ -531,8 +532,6 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) { UndoClickLk.Call(this); } - - return 0; } SvxTPFilter::SvxTPFilter( vcl::Window * pParent) @@ -571,7 +570,7 @@ SvxTPFilter::SvxTPFilter( vcl::Window * pParent) m_pIbClock2->SetClickHdl( LINK( this, SvxTPFilter,TimeHdl) ); m_pBtnRange->SetClickHdl( LINK( this, SvxTPFilter, RefHandle)); - Link<> aLink=LINK( this, SvxTPFilter, RowEnableHdl) ; + Link<Button*,void> aLink=LINK( this, SvxTPFilter, RowEnableHdl) ; m_pCbDate->SetClickHdl(aLink); m_pCbAuthor->SetClickHdl(aLink); m_pCbRange->SetClickHdl(aLink); @@ -915,8 +914,9 @@ IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb ) return 0; } -IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB ) +IMPL_LINK_TYPED( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) { + CheckBox* pCB = static_cast<CheckBox*>(pButton); if (pCB == m_pCbDate) { m_pLbDate->Enable(m_pCbDate->IsChecked()); @@ -947,11 +947,11 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB ) } ModifyHdl(pCB); - return 0; } -IMPL_LINK( SvxTPFilter, TimeHdl, ImageButton*,pIB ) +IMPL_LINK_TYPED( SvxTPFilter, TimeHdl, Button*, pButton, void ) { + ImageButton* pIB = static_cast<ImageButton*>(pButton); Date aDate( Date::SYSTEM ); tools::Time aTime( tools::Time::SYSTEM ); if (pIB == m_pIbClock) @@ -965,7 +965,6 @@ IMPL_LINK( SvxTPFilter, TimeHdl, ImageButton*,pIB ) m_pTfDate2->SetTime(aTime); } ModifyHdl(m_pDfDate); - return 0; } IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr) @@ -1089,13 +1088,12 @@ IMPL_LINK( SvxTPFilter, ModifyDate, void*,pTF) return 0; } -IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef ) +IMPL_LINK_TYPED( SvxTPFilter, RefHandle, Button*, pRef, void ) { if(pRef!=NULL) { aRefLink.Call(this); } - return 0; } SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTopLevel) diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 37d0b6ee28a1..ea9bc0f8a405 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1241,7 +1241,7 @@ IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove) return 0; } -IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress) +IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ButtonPress, Button*, void) { if(SvxPreviewObjectType::SPHERE == GetSvx3DLightControl().GetObjectType()) { @@ -1251,8 +1251,6 @@ IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress) { GetSvx3DLightControl().SetObjectType(SvxPreviewObjectType::SPHERE); } - - return 0; } IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange) diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index c08b4b9f7bc9..019b4d99740d 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -678,7 +678,7 @@ void SaveDialog::dispose() Dialog::dispose(); } -IMPL_LINK_NOARG(SaveDialog, OKButtonHdl) +IMPL_LINK_NOARG_TYPED(SaveDialog, OKButtonHdl, Button*, void) { // start crash-save with progress ScopedVclPtrInstance< SaveProgressDialog > pProgress(this, m_pCore); @@ -691,7 +691,6 @@ IMPL_LINK_NOARG(SaveDialog, OKButtonHdl) nResult = DLG_RET_OK_AUTOLUNCH; EndDialog(nResult); - return 0; } SaveProgressDialog::SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore) @@ -1166,7 +1165,7 @@ void RecoveryDialog::end() m_bWaitForCore = false; } -IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl) +IMPL_LINK_NOARG_TYPED(RecoveryDialog, NextButtonHdl, Button*, void) { switch (m_eRecoveryState) { @@ -1183,13 +1182,10 @@ IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl) if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_HANDLED) { EndDialog(DLG_RET_OK); - return DLG_RET_OK; } - - return 0; } -IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl) +IMPL_LINK_NOARG_TYPED(RecoveryDialog, CancelButtonHdl, Button*, void) { switch (m_eRecoveryState) { @@ -1209,10 +1205,7 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl) if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_HANDLED) { EndDialog(); - return DLG_RET_CANCEL; } - - return 0; } OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const @@ -1332,7 +1325,7 @@ OUString BrokenRecoveryDialog::getSaveDirURL() } -IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) +IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, OkButtonHdl, Button*, void) { OUString sPhysicalPath = comphelper::string::strip(m_pSaveDirED->GetText(), ' '); OUString sURL; @@ -1342,21 +1335,18 @@ IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl) impl_askForSavePath(); EndDialog(DLG_RET_OK); - return 0; } -IMPL_LINK_NOARG(BrokenRecoveryDialog, CancelButtonHdl) +IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, CancelButtonHdl, Button*, void) { EndDialog(); - return 0; } -IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl) +IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, SaveButtonHdl, Button*, void) { impl_askForSavePath(); - return 0; } diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 03d3e31eb6e0..427eb4c0316e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -501,8 +501,9 @@ void SvxHFPage::InitHandler() m_pBackgroundBtn->SetClickHdl(LINK(this,SvxHFPage, BackgroundHdl)); } -IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SvxHFPage, TurnOnHdl, Button *, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); if ( m_pTurnOnBox->IsChecked() ) { m_pDistFT->Enable(); @@ -563,7 +564,6 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) m_pTurnOnBox->Check(); } UpdateExample(); - return 0; } IMPL_LINK_NOARG(SvxHFPage, DistModify) @@ -585,7 +585,7 @@ IMPL_LINK_NOARG(SvxHFPage, BorderModify) return 0; } -IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) +IMPL_LINK_NOARG_TYPED(SvxHFPage, BackgroundHdl, Button*, void) { if(!pBBSet) { @@ -749,8 +749,6 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl) UpdateExample(); } - - return 0; } void SvxHFPage::UpdateExample() diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 2d2fca69b106..8340c0c51d29 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -157,7 +157,7 @@ SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet pCbxRotate->SetClickHdl( LINK( this, SvxGridTabPage, ClickRotateHdl_Impl ) ); - Link<> aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl ); + Link<Button*,void> aLink = LINK( this, SvxGridTabPage, ChangeGridsnapHdl_Impl ); pCbxUseGridsnap->SetClickHdl( aLink ); pCbxSynchronize->SetClickHdl( aLink ); pCbxGridVisible->SetClickHdl( aLink ); @@ -326,14 +326,12 @@ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) } -IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) { if( pCbxRotate->IsChecked() ) pMtrFldAngle->Enable(); else pMtrFldAngle->Disable(); - - return 0L; } @@ -352,10 +350,9 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) } -IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ChangeGridsnapHdl_Impl, Button*, void) { bAttrModified = true; - return 0; } diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index d622c8b4b66d..1bae8481e15e 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -49,7 +49,7 @@ struct OrientationHelper_Impl void ShowDependentWindows(); - DECL_LINK( ClickHdl, void* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); }; @@ -97,10 +97,9 @@ void OrientationHelper_Impl::ShowDependentWindows() aIt->first->Show( mbVisible ); } -IMPL_LINK_NOARG(OrientationHelper_Impl, ClickHdl) +IMPL_LINK_NOARG_TYPED(OrientationHelper_Impl, ClickHdl, Button*, void) { EnableDependentWindows(); - return 0L; } diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 5139bafe8bb1..ebb736cdbfbe 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -23,7 +23,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) +IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) { bool bOK = true; short nRet = RET_OK; @@ -48,8 +48,6 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl) if ( bOK ) EndDialog( nRet ); - - return 0; } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 891dc33f077f..d6dc088dfd54 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -564,7 +564,7 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll) return 0; } -IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxRubyDialog, ApplyHdl_Impl, Button*, void) { const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); if (!aRubyValues.getLength()) @@ -590,16 +590,14 @@ IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl) OSL_FAIL("Exception caught"); } } - return 0; } -IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CloseHdl_Impl, Button*, void) { Close(); - return 0; } -IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxRubyDialog, StylistHdl_Impl, Button*, void) { SfxPoolItem* pState = nullptr; SfxItemState eState = pBindings->QueryState(SID_STYLE_DESIGNER, pState); @@ -609,7 +607,6 @@ IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl) SfxCallMode::ASYNCHRON | SfxCallMode::RECORD); } delete pState; - return 0; } IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index ba27a6a3a870..f31dc5bcb756 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -644,29 +644,29 @@ void SvxSearchDialog::InitControls_Impl() m_pSearchTmplLB->SetLoseFocusHdl( aLink ); m_pReplaceTmplLB->SetLoseFocusHdl( aLink ); - aLink = LINK( this, SvxSearchDialog, CommandHdl_Impl ); - m_pSearchBtn->SetClickHdl( aLink ); - m_pSearchAllBtn->SetClickHdl( aLink ); - m_pReplaceBtn->SetClickHdl( aLink ); - m_pReplaceAllBtn->SetClickHdl( aLink ); - m_pCloseBtn->SetClickHdl( aLink ); - m_pSimilarityBtn->SetClickHdl( aLink ); - m_pJapOptionsBtn->SetClickHdl( aLink ); - m_pSearchComponent1PB->SetClickHdl( aLink ); - m_pSearchComponent2PB->SetClickHdl( aLink ); - - aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); - m_pWordBtn->SetClickHdl( aLink ); - m_pSelectionBtn->SetClickHdl( aLink ); - m_pMatchCaseCB->SetClickHdl( aLink ); - m_pRegExpBtn->SetClickHdl( aLink ); - m_pBackwardsBtn->SetClickHdl( aLink ); - m_pNotesBtn->SetClickHdl( aLink ); - m_pSimilarityBox->SetClickHdl( aLink ); - m_pJapOptionsCB->SetClickHdl( aLink ); - m_pJapMatchFullHalfWidthCB->SetClickHdl( aLink ); - m_pIgnoreDiacritics->SetClickHdl( aLink ); - m_pIgnoreKashida->SetClickHdl( aLink ); + Link<Button*,void> aLink2 = LINK( this, SvxSearchDialog, CommandHdl_Impl ); + m_pSearchBtn->SetClickHdl( aLink2 ); + m_pSearchAllBtn->SetClickHdl( aLink2 ); + m_pReplaceBtn->SetClickHdl( aLink2 ); + m_pReplaceAllBtn->SetClickHdl( aLink2 ); + m_pCloseBtn->SetClickHdl( aLink2 ); + m_pSimilarityBtn->SetClickHdl( aLink2 ); + m_pJapOptionsBtn->SetClickHdl( aLink2 ); + m_pSearchComponent1PB->SetClickHdl( aLink2 ); + m_pSearchComponent2PB->SetClickHdl( aLink2 ); + + aLink2 = LINK( this, SvxSearchDialog, FlagHdl_Impl ); + m_pWordBtn->SetClickHdl( aLink2 ); + m_pSelectionBtn->SetClickHdl( aLink2 ); + m_pMatchCaseCB->SetClickHdl( aLink2 ); + m_pRegExpBtn->SetClickHdl( aLink2 ); + m_pBackwardsBtn->SetClickHdl( aLink2 ); + m_pNotesBtn->SetClickHdl( aLink2 ); + m_pSimilarityBox->SetClickHdl( aLink2 ); + m_pJapOptionsCB->SetClickHdl( aLink2 ); + m_pJapMatchFullHalfWidthCB->SetClickHdl( aLink2 ); + m_pIgnoreDiacritics->SetClickHdl( aLink2 ); + m_pIgnoreKashida->SetClickHdl( aLink2 ); m_pLayoutBtn->SetClickHdl( LINK( this, SvxSearchDialog, TemplateHdl_Impl ) ); m_pFormatBtn->SetClickHdl( LINK( this, SvxSearchDialog, FormatHdl_Impl ) ); m_pNoFormatBtn->SetClickHdl( @@ -808,8 +808,8 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) if ( pSearchItem->GetAppFlag() == SvxSearchApp::CALC ) { m_pCalcGrid->Show(); - Link<> aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); - m_pCalcSearchInLB->SetSelectHdl( aLink ); + Link<Button*,void> aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); + m_pCalcSearchInLB->SetSelectHdl( LINK( this, SvxSearchDialog, LBSelectHdl_Impl ) ); m_pRowsBtn->SetClickHdl( aLink ); m_pColumnsBtn->SetClickHdl( aLink ); m_pAllSheetsCB->SetClickHdl( aLink ); @@ -1108,10 +1108,21 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, -IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) +IMPL_LINK( SvxSearchDialog, LBSelectHdl_Impl, Control *, pCtrl ) +{ + ClickHdl_Impl(pCtrl); + return 0; +} + +IMPL_LINK_TYPED( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void ) +{ + ClickHdl_Impl(pCtrl); +} + +void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) { if ( pCtrl && !bSet ) - SetModifyFlag_Impl( pCtrl ); + SetModifyFlag_Impl( static_cast<Control*>(pCtrl) ); else bSet = false; @@ -1207,13 +1218,13 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) } } - if (m_pAllSheetsCB == pCtrl) + if (pCtrl == m_pAllSheetsCB) { bSet = true; ModifyHdl_Impl(m_pSearchLB); } - if (m_pJapOptionsCB == pCtrl) + if (pCtrl == m_pJapOptionsCB) { bool bEnableJapOpt = m_pJapOptionsCB->IsChecked(); m_pMatchCaseCB->Enable(!bEnableJapOpt ); @@ -1223,12 +1234,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( pImpl->bSaveToModule ) SaveToModule_Impl(); - return 0; } -IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) +IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr ); @@ -1387,8 +1397,6 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pImpl->xCommand2Dispatch->dispatch(pImpl->aCommand2URL, aArgs); } } - - return 0; } @@ -1435,13 +1443,13 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) -IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) { if ( pImpl->bSaveToModule ) SaveToModule_Impl(); if ( bFormat ) - return 0; + return; OUString sDesc; if ( m_pLayoutBtn->IsChecked() ) @@ -1518,7 +1526,6 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) pImpl->bSaveToModule = false; FlagHdl_Impl(m_pLayoutBtn); pImpl->bSaveToModule = true; - return 0; } @@ -1880,14 +1887,14 @@ IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl) -IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) { SfxObjectShell* pSh = SfxObjectShell::Current(); DBG_ASSERT( pSh, "no DocShell" ); if ( !pSh || !pImpl->pRanges ) - return 0; + return; sal_sSize nCnt = 0; const sal_uInt16* pPtr = pImpl->pRanges; @@ -1968,12 +1975,11 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl) PaintAttrText_Impl(); // Set AttributText in GroupBox } } - return 0; } -IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); bool bWriterApp = @@ -2009,15 +2015,14 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) TemplateHdl_Impl(m_pLayoutBtn); pImpl->bSaveToModule = true; m_pNoFormatBtn->Disable(); - return 0; } -IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) { if ( !pSearchList || !pImpl->pRanges ) - return 0; + return; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -2027,7 +2032,6 @@ IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl) pDlg->Execute(); } PaintAttrText_Impl(); - return 0; } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 069e7a3e34e6..a18f2ac68eb6 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -219,7 +219,7 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p m_pBtnAssign->SetClickHdl( LINK( this, Svx3DWin, ClickAssignHdl ) ); m_pBtnUpdate->SetClickHdl( LINK( this, Svx3DWin, ClickUpdateHdl ) ); - Link<> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); + Link<Button*,void> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); m_pBtnGeo->SetClickHdl( aLink ); m_pBtnRepresentation->SetClickHdl( aLink ); m_pBtnLight->SetClickHdl( aLink ); @@ -274,31 +274,31 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p m_pBtnSpecularColor->SetClickHdl( aLink ); - aLink = LINK( this, Svx3DWin, SelectHdl ); - m_pLbMatFavorites->SetSelectHdl( aLink ); - m_pLbMatColor->SetSelectHdl( aLink ); - m_pLbMatEmission->SetSelectHdl( aLink ); - m_pLbMatSpecular->SetSelectHdl( aLink ); - m_pLbLight1->SetSelectHdl( aLink ); - m_pLbLight2->SetSelectHdl( aLink ); - m_pLbLight3->SetSelectHdl( aLink ); - m_pLbLight4->SetSelectHdl( aLink ); - m_pLbLight5->SetSelectHdl( aLink ); - m_pLbLight6->SetSelectHdl( aLink ); - m_pLbLight7->SetSelectHdl( aLink ); - m_pLbLight8->SetSelectHdl( aLink ); - m_pLbAmbientlight->SetSelectHdl( aLink ); - m_pLbShademode->SetSelectHdl( aLink ); - - aLink = LINK( this, Svx3DWin, ModifyHdl ); - m_pMtrMatSpecularIntensity->SetModifyHdl( aLink ); - m_pNumHorizontal->SetModifyHdl( aLink ); - m_pNumVertical->SetModifyHdl( aLink ); - m_pMtrSlant->SetModifyHdl( aLink ); + Link<> aLink2 = LINK( this, Svx3DWin, SelectHdl ); + m_pLbMatFavorites->SetSelectHdl( aLink2 ); + m_pLbMatColor->SetSelectHdl( aLink2 ); + m_pLbMatEmission->SetSelectHdl( aLink2 ); + m_pLbMatSpecular->SetSelectHdl( aLink2 ); + m_pLbLight1->SetSelectHdl( aLink2 ); + m_pLbLight2->SetSelectHdl( aLink2 ); + m_pLbLight3->SetSelectHdl( aLink2 ); + m_pLbLight4->SetSelectHdl( aLink2 ); + m_pLbLight5->SetSelectHdl( aLink2 ); + m_pLbLight6->SetSelectHdl( aLink2 ); + m_pLbLight7->SetSelectHdl( aLink2 ); + m_pLbLight8->SetSelectHdl( aLink2 ); + m_pLbAmbientlight->SetSelectHdl( aLink2 ); + m_pLbShademode->SetSelectHdl( aLink2 ); + + aLink2 = LINK( this, Svx3DWin, ModifyHdl ); + m_pMtrMatSpecularIntensity->SetModifyHdl( aLink2 ); + m_pNumHorizontal->SetModifyHdl( aLink2 ); + m_pNumVertical->SetModifyHdl( aLink2 ); + m_pMtrSlant->SetModifyHdl( aLink2 ); // Preview callback - aLink = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); - m_pCtlLightPreview->SetUserSelectionChangeCallback(aLink); + aLink2 = LINK( this, Svx3DWin, ChangeSelectionCallbackHdl ); + m_pCtlLightPreview->SetUserSelectionChangeCallback(aLink2); aSize = GetOutputSizePixel(); SetMinOutputSizePixel( aSize ); @@ -356,7 +356,7 @@ void Svx3DWin::dispose() void Svx3DWin::Construct() { m_pBtnGeo->Check(); - Link<> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); + Link<Button*,void> aLink( LINK( this, Svx3DWin, ClickViewTypeHdl ) ); aLink.Call(m_pBtnGeo); m_pCtlLightPreview->Hide(); } @@ -2141,7 +2141,7 @@ void Svx3DWin::Resize() SfxDockingWindow::Resize(); } -IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) +IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) { bUpdate = !m_pBtnUpdate->IsChecked(); m_pBtnUpdate->Check( bUpdate ); @@ -2160,12 +2160,10 @@ IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl) { // Controls can be disabled during certain circumstances } - - return 0L; } -IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl) +IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) @@ -2174,13 +2172,11 @@ IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl) pDispatcher->Execute( SID_3D_ASSIGN, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L ); } - - return 0L; } -IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) +IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) { if( pBtn ) @@ -2285,12 +2281,12 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) m_pBtnTexture->Check( eViewType == VIEWTYPE_TEXTURE ); m_pBtnMaterial->Check( eViewType == VIEWTYPE_MATERIAL ); } - return 0L; } -IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) +IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) { + PushButton* pBtn = static_cast<PushButton*>(pButton); if( pBtn ) { bool bUpdatePreview = false; @@ -2443,12 +2439,11 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) else if( bUpdatePreview ) UpdatePreview(); } - return 0L; } -IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn ) +IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) { SvColorDialog aColorDlg( this ); ColorLB* pLb; @@ -2473,7 +2468,6 @@ IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn ) if( LBSelectColor( pLb, aColor ) ) SelectHdl( pLb ); } - return 0L; } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 5f986986b099..b4d305da16d2 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -500,7 +500,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() return nX; } -IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton ) +IMPL_LINK_TYPED(DbGridControl::NavigationBar, OnClick, Button *, pButton, void ) { DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); @@ -520,7 +520,7 @@ IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton ) if (lResult) // the link already handled it - return 0; + return; } if (pButton == m_aFirstBtn.get()) @@ -533,7 +533,6 @@ IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton ) pParent->MoveToLast(); else if( pButton == m_aNewBtn.get() ) pParent->AppendNew(); - return 0; } void DbGridControl::NavigationBar::InvalidateAll(sal_Int32 nCurrentPos, bool bAll) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index f1cdfbb47f53..164805583556 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2351,8 +2351,9 @@ namespace svxform } - IMPL_LINK( AddDataItemDialog, CheckHdl, CheckBox *, pBox ) + IMPL_LINK_TYPED( AddDataItemDialog, CheckHdl, Button *, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); // Condition buttons are only enable if their check box is checked m_pReadonlyBtn->Enable( m_pReadonlyCB->IsChecked() ); m_pRequiredBtn->Enable( m_pRequiredCB->IsChecked() ); @@ -2381,13 +2382,12 @@ namespace svxform sTemp.clear(); m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) ); } - - return 0; } - IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn ) + IMPL_LINK_TYPED( AddDataItemDialog, ConditionHdl, Button *, pButton, void ) { + PushButton* pBtn = static_cast<PushButton*>(pButton); OUString sTemp, sPropName; if ( m_pDefaultBtn == pBtn ) sPropName = PN_BINDING_EXPR; @@ -2427,7 +2427,6 @@ namespace svxform sPropName, makeAny( OUString( sNewCondition ) ) ); } } - return 0; } void copyPropSet( const Reference< XPropertySet >& xFrom, Reference< XPropertySet >& xTo ) @@ -2465,7 +2464,7 @@ namespace svxform } - IMPL_LINK_NOARG(AddDataItemDialog, OKHdl) + IMPL_LINK_NOARG_TYPED(AddDataItemDialog, OKHdl, Button*, void) { bool bIsHandleBinding = ( DITBinding == m_eItemType ); bool bIsHandleText = ( DITText == m_eItemType ); @@ -2478,7 +2477,7 @@ namespace svxform ScopedVclPtrInstance< MessageDialog > aErrBox( this, SVX_RES( RID_STR_INVALID_XMLNAME ) ); aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName)); aErrBox->Execute(); - return 0; + return; } OUString sDataType( m_pDataTypeLB->GetSelectEntry() ); @@ -2523,14 +2522,13 @@ namespace svxform } // then close the dialog EndDialog( RET_OK ); - return 0; } void AddDataItemDialog::InitDialog() { // set handler - Link<> aLink = LINK( this, AddDataItemDialog, CheckHdl ); + Link<Button*,void> aLink = LINK( this, AddDataItemDialog, CheckHdl ); m_pRequiredCB->SetClickHdl( aLink ); m_pRelevantCB->SetClickHdl( aLink ); m_pConstraintCB->SetClickHdl( aLink ); @@ -2830,7 +2828,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG(AddConditionDialog, EditHdl) + IMPL_LINK_NOARG_TYPED(AddConditionDialog, EditHdl, Button*, void) { Reference< XNameContainer > xNameContnr; try @@ -2851,11 +2849,10 @@ namespace svxform { SAL_WARN( "svx.form", "AddDataItemDialog::EditHdl(): exception caught" ); } - return 0; } - IMPL_LINK_NOARG(AddConditionDialog, OKHdl) + IMPL_LINK_NOARG_TYPED(AddConditionDialog, OKHdl, Button*, void) { /*!!! try @@ -2869,7 +2866,6 @@ namespace svxform } */ EndDialog( RET_OK ); - return 0; } @@ -2928,7 +2924,7 @@ namespace svxform sHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT /*| HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED*/ ); m_pNamespacesList->SetSelectHdl( LINK( this, NamespaceItemDialog, SelectHdl ) ); - Link<> aLink = LINK( this, NamespaceItemDialog, ClickHdl ); + Link<Button*,void> aLink = LINK( this, NamespaceItemDialog, ClickHdl ); m_pAddNamespaceBtn->SetClickHdl( aLink ); m_pEditNamespaceBtn->SetClickHdl( aLink ); m_pDeleteNamespaceBtn->SetClickHdl( aLink ); @@ -2966,8 +2962,9 @@ namespace svxform } - IMPL_LINK( NamespaceItemDialog, ClickHdl, PushButton *, pBtn ) + IMPL_LINK_TYPED( NamespaceItemDialog, ClickHdl, Button *, pButton, void ) { + PushButton* pBtn = static_cast<PushButton*>(pButton); if ( m_pAddNamespaceBtn == pBtn ) { ScopedVclPtrInstance< ManageNamespaceDialog > aDlg(this, m_pConditionDlg, false); @@ -3012,11 +3009,10 @@ namespace svxform } SelectHdl( m_pNamespacesList ); - return 0; } - IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl) + IMPL_LINK_NOARG_TYPED(NamespaceItemDialog, OKHdl, Button*, void) { try { @@ -3044,7 +3040,6 @@ namespace svxform } // and close the dialog EndDialog( RET_OK ); - return 0; } @@ -3107,7 +3102,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl) + IMPL_LINK_NOARG_TYPED(ManageNamespaceDialog, OKHdl, Button*, void) { OUString sPrefix = m_pPrefixED->GetText(); @@ -3118,7 +3113,7 @@ namespace svxform ScopedVclPtrInstance< MessageDialog > aErrBox(this, SVX_RES( RID_STR_INVALID_XMLPREFIX ) ); aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sPrefix)); aErrBox->Execute(); - return 0; + return; } } catch ( Exception& ) @@ -3128,7 +3123,6 @@ namespace svxform // no error so close the dialog EndDialog( RET_OK ); - return 0; } AddSubmissionDialog::AddSubmissionDialog( @@ -3176,18 +3170,16 @@ namespace svxform } - IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl) + IMPL_LINK_NOARG_TYPED(AddSubmissionDialog, RefHdl, Button*, void) { ScopedVclPtrInstance< AddConditionDialog > aDlg(this, PN_BINDING_EXPR, m_xTempBinding ); aDlg->SetCondition( m_pRefED->GetText() ); if ( aDlg->Execute() == RET_OK ) m_pRefED->SetText( aDlg->GetCondition() ); - - return 0; } - IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl) + IMPL_LINK_NOARG_TYPED(AddSubmissionDialog, OKHdl, Button*, void) { OUString sName(m_pNameED->GetText()); if(sName.isEmpty()) { @@ -3195,7 +3187,7 @@ namespace svxform ScopedVclPtrInstance< MessageDialog > aErrorBox(this,SVX_RES(RID_STR_EMPTY_SUBMISSIONNAME)); aErrorBox->set_primary_text( Application::GetDisplayName() ); aErrorBox->Execute(); - return 0; + return; } if ( !m_xSubmission.is() ) @@ -3247,7 +3239,6 @@ namespace svxform } EndDialog( RET_OK ); - return 0; } @@ -3419,7 +3410,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl) + IMPL_LINK_NOARG_TYPED(AddInstanceDialog, FilePickerHdl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); @@ -3433,8 +3424,6 @@ namespace svxform if( aDlg.Execute() == ERRCODE_NONE ) m_pURLED->SetText( aDlg.GetPath() ); - - return 0; } LinkedInstanceWarningBox::LinkedInstanceWarningBox( vcl::Window* pParent ) diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 53faca310e74..6e0a1a304b27 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -623,7 +623,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl) return 0L; } -IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl) +IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ClickNewThemeHdl, Button*, void) { OUString aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) ); OUString aName( aNewTheme ); @@ -640,8 +640,6 @@ IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl) { ImplGalleryThemeProperties( aName, true ); } - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 2a35853696ac..cc8f2490f1f3 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -109,7 +109,7 @@ private: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - DECL_LINK( ClickNewThemeHdl, void* ); + DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void ); DECL_LINK( SelectThemeHdl, void* ); DECL_LINK( ShowContextMenuHdl, void* ); DECL_LINK( PopupMenuHdl, Menu* ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index b2562e023659..88e8d7d4cf16 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -459,9 +459,9 @@ namespace svxform OUString m_sFL_Binding; OUString m_sFT_BindingExp; - DECL_LINK( CheckHdl, CheckBox * ); - DECL_LINK( ConditionHdl, PushButton * ); - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK_TYPED( ConditionHdl, Button*, void ); + DECL_LINK_TYPED( OKHdl, Button*, void); void InitDialog(); void InitFromNode(); @@ -493,8 +493,8 @@ namespace svxform DECL_LINK(ModifyHdl, void *); DECL_LINK_TYPED(ResultHdl, Idle *, void); - DECL_LINK(EditHdl, void *); - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(EditHdl, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); public: AddConditionDialog(vcl::Window* pParent, @@ -529,8 +529,8 @@ namespace svxform XNameContainer_ref& m_rNamespaces; DECL_LINK( SelectHdl, SvSimpleTable * ); - DECL_LINK( ClickHdl, PushButton * ); - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK_TYPED( OKHdl, Button*, void); void LoadNamespaces(); @@ -550,7 +550,7 @@ namespace svxform VclPtr<AddConditionDialog> m_pConditionDlg; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); public: ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); @@ -591,8 +591,8 @@ namespace svxform XPropertySet_ref m_xTempBinding; XPropertySet_ref m_xCreatedBinding; - DECL_LINK(RefHdl, void *); - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(RefHdl, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); void FillAllBoxes(); @@ -636,7 +636,7 @@ namespace svxform OUString m_sAllFilterName; - DECL_LINK(FilePickerHdl, void *); + DECL_LINK_TYPED(FilePickerHdl, Button*, void); public: AddInstanceDialog( vcl::Window* pParent, bool _bEdit ); diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 47c425856e40..1cd3ba4dacfc 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -396,7 +396,7 @@ class SaveDialog : public Dialog virtual ~SaveDialog(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK(OKButtonHdl, void*); + DECL_LINK_TYPED(OKButtonHdl, Button*, void); }; class SaveProgressDialog : public ModalDialog @@ -544,8 +544,8 @@ class RecoveryDialog : public Dialog // helper private: /** @short TODO */ - DECL_LINK(NextButtonHdl, void*); - DECL_LINK(CancelButtonHdl, void*); + DECL_LINK_TYPED(NextButtonHdl, Button*, void); + DECL_LINK_TYPED(CancelButtonHdl, Button*, void); /** @short TODO */ @@ -599,15 +599,15 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ - DECL_LINK(SaveButtonHdl, void*); + DECL_LINK_TYPED(SaveButtonHdl, Button*, void); /** @short TODO */ - DECL_LINK(OkButtonHdl, void*); + DECL_LINK_TYPED(OkButtonHdl, Button*, void); /** @short TODO */ - DECL_LINK(CancelButtonHdl, void*); + DECL_LINK_TYPED(CancelButtonHdl, Button*, void); /** @short TODO */ diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index ff514d95b4b4..8fa15c13bf0f 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -66,19 +66,19 @@ ParaLineSpacingControl::ParaLineSpacingControl(sal_uInt16 nId) meLNSpaceUnit = SFX_MAPUNIT_100TH_MM; - Link<> aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); + Link<Button*,void> aLink = LINK(this, ParaLineSpacingControl, PredefinedValuesHandler); mpSpacing1Button->SetClickHdl(aLink); mpSpacing115Button->SetClickHdl(aLink); mpSpacing15Button->SetClickHdl(aLink); mpSpacing2Button->SetClickHdl(aLink); - aLink = LINK( this, ParaLineSpacingControl, LineSPDistHdl_Impl ); - mpLineDist->SetSelectHdl(aLink); + Link<> aLink2 = LINK( this, ParaLineSpacingControl, LineSPDistHdl_Impl ); + mpLineDist->SetSelectHdl(aLink2); SelectEntryPos(LLINESPACE_1); - aLink = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl ); - mpLineDistAtPercentBox->SetModifyHdl( aLink ); - mpLineDistAtMetricBox->SetModifyHdl( aLink ); + aLink2 = LINK( this, ParaLineSpacingControl, LineSPDistAtHdl_Impl ); + mpLineDistAtPercentBox->SetModifyHdl( aLink2 ); + mpLineDistAtMetricBox->SetModifyHdl( aLink2 ); FieldUnit eUnit = FUNIT_INCH; const SfxPoolItem* pItem = NULL; @@ -409,7 +409,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, int eS } } -IMPL_LINK(ParaLineSpacingControl, PredefinedValuesHandler, void *, pControl) +IMPL_LINK_TYPED(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pControl, void) { if (pControl == mpSpacing1Button) { @@ -427,8 +427,6 @@ IMPL_LINK(ParaLineSpacingControl, PredefinedValuesHandler, void *, pControl) { ExecuteLineSpacing(LLINESPACE_2); } - - return 0; } void ParaLineSpacingControl::ExecuteLineSpacing(sal_uInt16 nEntry) diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index b3d04e538338..da9c3d98493a 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -23,6 +23,7 @@ #include <sfx2/tbxctrl.hxx> class SvxLineSpacingItem; +class Button; namespace svx { @@ -70,7 +71,7 @@ private: DECL_LINK(LineSPDistHdl_Impl, ListBox*); DECL_LINK(LineSPDistAtHdl_Impl, void*); - DECL_LINK(PredefinedValuesHandler, void*); + DECL_LINK_TYPED(PredefinedValuesHandler, Button*, void); }; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index a4a40a5b6b77..80ebaaedf01c 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -472,7 +472,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl ) -IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl ) +IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) { if ( mpCbxScale->IsChecked() ) { @@ -483,8 +483,6 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl ) // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog SvtViewOptions aPageOpt(E_TABPAGE, "cui/ui/possizetabpage/PositionAndSize"); aPageOpt.SetUserItem( USERITEM_NAME, ::com::sun::star::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) ); - - return 0; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index d315c6cf3469..875eae75f373 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -153,7 +153,7 @@ private: DECL_LINK( ChangePosYHdl, void * ); DECL_LINK( ChangeWidthHdl, void * ); DECL_LINK( ChangeHeightHdl, void * ); - DECL_LINK( ClickAutoHdl, void * ); + DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); DECL_LINK( AngleModifiedHdl, void * ); DECL_LINK( RotationHdl, void * ); DECL_LINK_TYPED( FlipHdl, ToolBox *, void ); diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index a4bb8e122a36..31e5b33050be 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -123,8 +123,7 @@ void ShadowPropertyPanel::Initialize() pColorList = static_cast<const SvxColorListItem*>(pItem) ->GetColorList(); mpLBShadowColor->Fill(pColorList); mpShowShadow->SetState( TRISTATE_FALSE ); - Link<> bLink = LINK(this, ShadowPropertyPanel, ClickShadowHdl ); - mpShowShadow->SetClickHdl( bLink ); + mpShowShadow->SetClickHdl( LINK(this, ShadowPropertyPanel, ClickShadowHdl ) ); Link<> aLink = LINK( this, ShadowPropertyPanel, ModifyShadowColorHdl ); mpShadowTransMetric->SetModifyHdl( LINK(this, ShadowPropertyPanel, ModifyShadowTransMetricHdl) ); mpLBShadowColor->SetSelectHdl( aLink ); @@ -137,21 +136,18 @@ void ShadowPropertyPanel::Initialize() InsertAngleValues(); } -IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl) +IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ClickShadowHdl, Button*, void) { if( mpShowShadow->GetState() == TRISTATE_FALSE ) { SdrOnOffItem aItem(makeSdrShadowItem(false)); GetBindings()->GetDispatcher()->Execute(SID_ATTR_FILL_SHADOW, SfxCallMode::RECORD, &aItem, 0L); } - else { SdrOnOffItem aItem(makeSdrShadowItem(true)); GetBindings()->GetDispatcher()->Execute(SID_ATTR_FILL_SHADOW, SfxCallMode::RECORD, &aItem, 0L); } - - return 0L; } IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowColorHdl) diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 510f2489ed53..2ae22e1d39ad 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -81,7 +81,7 @@ private: void InsertAngleValues(); void SetTransparencyValue(long); void UpdateControls(); - DECL_LINK(ClickShadowHdl, void*); + DECL_LINK_TYPED(ClickShadowHdl, Button*, void); DECL_LINK(ModifyShadowColorHdl, void*); DECL_LINK(ModifyShadowTransMetricHdl, void*); DECL_LINK(ModifyShadowDistanceHdl, void*); diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index fc7362f53f39..6acfd14a7bde 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -86,7 +86,7 @@ void TextUnderlineControl::initial() GetSettings().GetStyleSettings().GetMenuColor() : sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground )); - Link<> aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ; + Link<Button*,void> aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ; maPBOptions->SetClickHdl(aLink); maVSUnderline->SetStyle( maVSUnderline->GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT ); @@ -126,8 +126,8 @@ void TextUnderlineControl::initial() maVSUnderline->SetItemData(10, reinterpret_cast<void*>(UNDERLINE_WAVE)); maVSUnderline->SetColCount(); - aLink = LINK( this, TextUnderlineControl, VSSelectHdl ) ; - maVSUnderline->SetSelectHdl(aLink); + Link<> aLink2 = LINK( this, TextUnderlineControl, VSSelectHdl ) ; + maVSUnderline->SetSelectHdl(aLink2); maVSUnderline->StartSelection(); maVSUnderline->Show(); @@ -228,7 +228,7 @@ IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl) return 0L; } -IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn) +IMPL_LINK_TYPED(TextUnderlineControl, PBClickHdl, Button *, pPBtn, void) { if(pPBtn == maPBOptions.get()) { @@ -239,7 +239,6 @@ IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn) } mrTextPropertyPanel.EndUnderlinePopupMode(); } - return 0; } }} diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 441e15798eda..4c0f124d7ed0 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -70,7 +70,7 @@ private: void initial(); - DECL_LINK( PBClickHdl, PushButton *); + DECL_LINK_TYPED( PBClickHdl, Button*, void); DECL_LINK(VSSelectHdl, void *); }; }} diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 9cb27fdf4c9d..82df5e198bb0 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -56,8 +56,8 @@ private: DECL_LINK( SelectHdl, SvxColorValueSet* ); DECL_LINK( SelectPaletteHdl, void *); - DECL_LINK( AutoColorClickHdl, void * ); - DECL_LINK( OpenPickerClickHdl, void * ); + DECL_LINK_TYPED( AutoColorClickHdl, Button*, void ); + DECL_LINK_TYPED( OpenPickerClickHdl, Button*, void ); protected: virtual void Resize() SAL_OVERRIDE; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index aefc47d6776b..8e3cb432f887 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -241,11 +241,10 @@ void FontWorkGalleryDialog::insertSelectedFontwork() -IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl) +IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) { insertSelectedFontwork(); EndDialog( RET_OK ); - return 0; } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 96edbf0932d3..bfa401734dd8 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -69,7 +69,7 @@ private: long mnTableWidth; long mnTableHeight; - DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( SelectHdl, Button*, void ); public: TableWindow( sal_uInt16 nSlotId, @@ -96,10 +96,9 @@ const long TableWindow::TABLE_CELLS_VERT = 15; -IMPL_LINK_NOARG(TableWindow, SelectHdl) +IMPL_LINK_NOARG_TYPED(TableWindow, SelectHdl, Button*, void) { CloseAndShowTableDialog(); - return 0; } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 528b4eac14ef..d9f4f133b524 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1380,7 +1380,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl) return 0; } -IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl) +IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) { Color aColor; switch ( theSlotId ) @@ -1410,15 +1410,13 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl) maSelectedLink.Call(&aColor); maColorSelectFunction(maCommand, aColor); - return 0; } -IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl) +IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void) { if ( IsInPopupMode() ) EndPopupMode(); mrPaletteManager.PopupColorPicker(maCommand); - return 0; } void SvxColorWindow_Impl::Resize() diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 38b007fa8dc0..887fd203fa48 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -595,10 +595,9 @@ void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect updateAfterDirectionChange(); } -IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl) +IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DirectionHdl, Button*, void) { updateAfterDirectionChange(); - return 0; } void ChineseDictionaryDialog::updateAfterDirectionChange() @@ -713,10 +712,10 @@ void ChineseDictionaryDialog::updateButtons() m_pPB_Modify->Enable( bModify ); } -IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl) +IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, AddHdl, Button*, void) { if( !isEditFieldsHaveContent() ) - return 0; + return; sal_Int16 nConversionPropertyType = m_pLB_Property->GetSelectEntryPos()+1; @@ -729,9 +728,9 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl) } updateButtons(); - return 0; } -IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl) + +IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, ModifyHdl, Button*, void) { OUString aTerm( m_pED_Term->GetText() ); OUString aMapping( m_pED_Mapping->GetText() ); @@ -742,7 +741,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl) DictionaryEntry* pE = rActive.getFirstSelectedEntry(); if( pE && pE->m_aTerm != aTerm ) - return 0; + return; if( pE ) { @@ -761,10 +760,9 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl) } updateButtons(); - return 0; } -IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl) +IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DeleteHdl, Button*, void) { DictionaryList& rActive = getActiveDictionary(); DictionaryList& rReverse = getReverseDictionary(); @@ -792,7 +790,6 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl) } updateButtons(); - return 0; } short ChineseDictionaryDialog::Execute() diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 5e7f82954779..156c6c9756cc 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -123,12 +123,12 @@ public: virtual short Execute() SAL_OVERRIDE; private: - DECL_LINK( DirectionHdl, void* ); + DECL_LINK_TYPED( DirectionHdl, Button*, void ); DECL_LINK(EditFieldsHdl, void *); DECL_LINK( MappingSelectHdl, void* ); - DECL_LINK( AddHdl, void* ); - DECL_LINK( ModifyHdl, void* ); - DECL_LINK( DeleteHdl, void* ); + DECL_LINK_TYPED( AddHdl, Button*, void ); + DECL_LINK_TYPED( ModifyHdl, Button*, void ); + DECL_LINK_TYPED( DeleteHdl, Button*, void ); DECL_LINK( HeaderBarClick, HeaderBar* ); void initDictionaryControl(DictionaryList *pList, diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index faa63755f7b2..a1ab685c7c0f 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -89,7 +89,7 @@ void ChineseTranslationDialog::getSettings( bool& rbDirectionToSimplified rbTranslateCommonTerms = m_pCB_Translate_Commonterms->IsChecked(); } -IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl) +IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, OkHdl, Button*, void) { //save settings to configuration SvtLinguConfig aLngCfg; @@ -100,10 +100,9 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl) aLngCfg.SetProperty( OUString( UPN_IS_TRANSLATE_COMMON_TERMS ), aAny ); EndDialog( RET_OK ); - return 0; } -IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl) +IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, DictionaryHdl, Button*, void) { if( !m_pDictionaryDialog ) { @@ -128,7 +127,6 @@ IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl) m_pDictionaryDialog->Execute(); } } - return 0; } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 3b8140f7dce9..0091cfbbf7e3 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -45,8 +45,8 @@ public: , bool& rbTranslateCommonTerms ) const; private: - DECL_LINK( DictionaryHdl, void* ); - DECL_LINK( OkHdl, void* ); + DECL_LINK_TYPED( DictionaryHdl, Button*, void ); + DECL_LINK_TYPED( OkHdl, Button*, void ); private: VclPtr<RadioButton> m_pRB_To_Simplified; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 5febdf4b03b4..0f5378afe250 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -210,7 +210,7 @@ friend class SwConnectionDisposedListener_Impl; SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, bool bCreate); SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, bool bCreate); - DECL_DLLPRIVATE_LINK( PrtCancelHdl, Button * ); + DECL_DLLPRIVATE_LINK_TYPED( PrtCancelHdl, Button *, void ); /// Insert data record as text into document. SAL_DLLPRIVATE void ImportFromConnection( SwWrtShell* pSh); diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 25419f142fcc..df536dbefd2d 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -59,20 +59,24 @@ void SwBreakDlg::Apply() } } -IMPL_LINK_NOARG(SwBreakDlg, ClickHdl) +IMPL_LINK_NOARG_TYPED(SwBreakDlg, ClickHdl, Button*, void) +{ + CheckEnable(); +} + +IMPL_LINK_NOARG(SwBreakDlg, SelectHdl) { CheckEnable(); return 0; } // Handler for Change Page Number -IMPL_LINK( SwBreakDlg, PageNumHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwBreakDlg, PageNumHdl, Button*, pBox, void ) { - if(pBox->IsChecked()) + if(static_cast<CheckBox*>(pBox)->IsChecked()) m_pPageNumEdit->SetValue(1); else m_pPageNumEdit->SetText(OUString()); - return 0; } // By changing the Page number the checkbox is checked. @@ -87,7 +91,7 @@ IMPL_LINK_NOARG(SwBreakDlg, PageNumModifyHdl) * checks whether pagenumber nPage is a legal pagenumber (left pages with even * numbers etc. for a page template with alternating pages) */ -IMPL_LINK_NOARG(SwBreakDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(SwBreakDlg, OkHdl, Button*, void) { if(m_pPageNumBox->IsChecked()) { // In case of differing page descriptions, test validity @@ -114,11 +118,10 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl) if(!bOk) { ScopedVclPtrInstance<MessageDialog>::Create(this, SW_RES(STR_ILLEGAL_PAGENUM), VCL_MESSAGE_INFO)->Execute(); m_pPageNumEdit->GrabFocus(); - return 0; + return; } } EndDialog(RET_OK); - return 0; } SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) @@ -137,11 +140,11 @@ SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) m_pPageNumEdit->SetAccessibleName(m_pPageNumBox->GetText()); - Link<> aLk = LINK(this,SwBreakDlg,ClickHdl); + Link<Button*,void> aLk = LINK(this,SwBreakDlg,ClickHdl); m_pPageBtn->SetClickHdl( aLk ); m_pLineBtn->SetClickHdl( aLk ); m_pColumnBtn->SetClickHdl( aLk ); - m_pPageCollBox->SetSelectHdl( aLk ); + m_pPageCollBox->SetSelectHdl( LINK(this,SwBreakDlg,SelectHdl) ); get<OKButton>("ok")->SetClickHdl(LINK(this,SwBreakDlg,OkHdl));; m_pPageNumBox->SetClickHdl(LINK(this,SwBreakDlg,PageNumHdl)); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 364bb2b64f03..64cd58edfdae 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -300,7 +300,7 @@ VclPtr<SfxTabPage> SwCharURLPage::Create( vcl::Window* pParent, return VclPtr<SwCharURLPage>::Create( pParent, *rAttrSet ); } -IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl) +IMPL_LINK_NOARG_TYPED(SwCharURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 ); if( aDlgHelper.Execute() == ERRCODE_NONE ) @@ -308,14 +308,12 @@ IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl) Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); m_pURLED->SetText(xFP->getFiles().getConstArray()[0]); } - return 0; } -IMPL_LINK_NOARG(SwCharURLPage, EventHdl) +IMPL_LINK_NOARG_TYPED(SwCharURLPage, EventHdl, Button*, void) { bModified |= SwMacroAssignDlg::INetFormatDlg( this, ::GetActiveView()->GetWrtShell(), pINetItem ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index d57fc8169dd7..b4f0596c8417 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -679,7 +679,7 @@ void SwDropCapsPage::Reset(const SfxItemSet *rSet) bModified = false; } -IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) +IMPL_LINK_NOARG_TYPED(SwDropCapsPage, ClickHdl, Button*, void) { bool bChecked = m_pDropCapsBox->IsChecked(); @@ -705,11 +705,9 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) m_pPict->SetText(""); bModified = true; - - return 0; } -IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) +IMPL_LINK_NOARG_TYPED(SwDropCapsPage, WholeWordHdl, Button*, void) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); m_pSwitchText->Enable(!m_pWholeWordCB->IsChecked()); @@ -717,8 +715,6 @@ IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) ModifyHdl(m_pDropCapsField); bModified = true; - - return 0; } IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit ) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 39230e98f7a7..41c68a41f63b 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -300,24 +300,21 @@ void SwParagraphNumTabPage::EnableNewStart() m_pNewStartBX->Show(); } -IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, NewStartHdl_Impl, Button*, void) { bool bEnable = m_pNewStartCB->IsChecked(); m_pNewStartNumberCB->Enable(bEnable); m_pNewStartNF->Enable(bEnable && m_pNewStartNumberCB->IsChecked()); - return 0; } -IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) { m_pRestartParaCountCB->Enable(m_pCountParaCB->IsChecked()); bool bEnableRestartValue = m_pRestartParaCountCB->IsEnabled() && m_pRestartParaCountCB->IsChecked(); m_pRestartBX->Enable(bEnableRestartValue); - - return 0; } IMPL_LINK_NOARG( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl ) @@ -331,11 +328,10 @@ IMPL_LINK_NOARG( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl ) return 0; } -IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) { OUString aTemplName(m_pNumberStyleLB->GetSelectEntry()); ExecuteEditNumStyle_Impl( SID_STYLE_EDIT, aTemplName, OUString(),SFX_STYLE_FAMILY_PSEUDO, 0 ); - return 0; } // Internal: Perform functions through the Dispatcher diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 0dc4faacd151..6625503a4baf 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -84,8 +84,8 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pConditionCB->SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); - m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl )); + m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl )); m_pTbLinks->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); m_pStyleLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); m_pFilterLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); @@ -213,9 +213,9 @@ void SwCondCollPage::Reset(const SfxItemSet *) } -IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) { - const bool bEnable = pBox->IsChecked(); + const bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pContextFT->Enable( bEnable ); m_pUsedFT->Enable( bEnable ); m_pTbLinks->EnableList( bEnable ); @@ -226,9 +226,12 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) m_pAssignPB->Enable( bEnable ); if( bEnable ) SelectHdl(0); - return 0; } +IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) +{ + AssignRemoveHdl(static_cast<PushButton*>(pBtn)); +} IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) { SvTreeListEntry* pE = m_pTbLinks->FirstSelected(); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index ad03fa047c51..b21c252bc1e6 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -67,7 +67,7 @@ class SwTestAccountSettingsDialog : public SfxModalDialog bool m_bStop; void Test(); - DECL_LINK(StopHdl, void *); + DECL_LINK_TYPED(StopHdl, Button*, void); DECL_LINK(TestHdl, void*); public: explicit SwTestAccountSettingsDialog(SwMailConfigPage* pParent); @@ -105,9 +105,9 @@ class SwAuthenticationSettingsDialog : public SfxModalDialog SwMailMergeConfigItem& rConfigItem; - DECL_LINK(OKHdl_Impl, void *); - DECL_LINK( CheckBoxHdl_Impl, CheckBox*); - DECL_LINK(RadioButtonHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK_TYPED( CheckBoxHdl_Impl, Button*, void); + DECL_LINK_TYPED(RadioButtonHdl_Impl, Button*, void); public: SwAuthenticationSettingsDialog(SwMailConfigPage* pParent, SwMailMergeConfigItem& rItem); @@ -207,25 +207,22 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ ) m_pSecureCB ->SaveValue(); } -IMPL_LINK(SwMailConfigPage, ReplyToHdl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwMailConfigPage, ReplyToHdl, Button*, pBox, void) { - bool bEnable = pBox->IsChecked(); + bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pReplyToFT->Enable(bEnable); m_pReplyToED->Enable(bEnable); - return 0; } -IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl) +IMPL_LINK_NOARG_TYPED(SwMailConfigPage, AuthenticationHdl, Button*, void) { ScopedVclPtrInstance< SwAuthenticationSettingsDialog > aDlg(this, *m_pConfigItem); aDlg->Execute(); - return 0; } -IMPL_LINK_NOARG(SwMailConfigPage, TestHdl) +IMPL_LINK_NOARG_TYPED(SwMailConfigPage, TestHdl, Button*, void) { ScopedVclPtrInstance<SwTestAccountSettingsDialog>::Create(this)->Execute(); - return 0; } SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent) @@ -276,10 +273,9 @@ void SwTestAccountSettingsDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwTestAccountSettingsDialog, StopHdl) +IMPL_LINK_NOARG_TYPED(SwTestAccountSettingsDialog, StopHdl, Button*, void) { m_bStop = true; - return 0; } IMPL_LINK_NOARG(SwTestAccountSettingsDialog, TestHdl) @@ -425,7 +421,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog( get(m_pOKPB,"ok"); m_pAuthenticationCB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, CheckBoxHdl_Impl)); - Link<> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl ); + Link<Button*,void> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl ); m_pSeparateAuthenticationRB->SetClickHdl( aRBLink ); m_pSMTPAfterPOPRB->SetClickHdl( aRBLink ); m_pOKPB->SetClickHdl( LINK( this, SwAuthenticationSettingsDialog, OKHdl_Impl)); @@ -481,7 +477,7 @@ void SwAuthenticationSettingsDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, OKHdl_Impl, Button*, void) { rConfigItem.SetAuthentication( m_pAuthenticationCB->IsChecked() ); rConfigItem.SetSMTPAfterPOP(m_pSMTPAfterPOPRB->IsChecked()); @@ -494,20 +490,17 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl) rConfigItem.SetInServerPassword(m_pInPasswordED->GetText()); EndDialog(RET_OK); - return 0; } -IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, Button*, pBox, void) { - bool bChecked = pBox->IsChecked(); + bool bChecked = static_cast<CheckBox*>(pBox)->IsChecked(); m_pSeparateAuthenticationRB->Enable(bChecked); m_pSMTPAfterPOPRB->Enable(bChecked); RadioButtonHdl_Impl( 0 ); - - return 0; } -IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, Button*, void) { bool bSeparate = m_pSeparateAuthenticationRB->IsChecked(); bool bIsEnabled = m_pSeparateAuthenticationRB->IsEnabled(); @@ -532,8 +525,6 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl) m_pIMAPRB->Enable(bNotSeparate); m_pInPasswordFT->Enable(bNotSeparate); m_pInPasswordED->Enable(bNotSeparate); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index a43554d65fb0..cc674d8f57ed 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -317,7 +317,7 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl) return 0; } -IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl) +IMPL_LINK_NOARG_TYPED(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void) { ScopedVclPtrInstance<MessageDialog> aQuery(this, "QueryDefaultCompatDialog", "modules/swriter/ui/querydefaultcompatdialog.ui"); @@ -358,8 +358,6 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl) WriteOptions(); } - - return 0; } void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index fecd2a010823..df64fbd2a2d3 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -120,7 +120,7 @@ SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pUseCharUnit->Hide(); } - Link<> aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl); + Link<Button*,void> aLink = LINK(this, SwLoadOptPage, StandardizedPageCountCheckHdl); m_pShowStandardizedPageCount->SetClickHdl(aLink); } @@ -154,10 +154,9 @@ VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent, return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet ); } -IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl) +IMPL_LINK_NOARG_TYPED(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void) { m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked()); - return 0; } bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 2fccfb5baadc..a87396de73a6 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -286,10 +286,9 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) return bRet; } -IMPL_LINK(SwContentOptPage, VertRulerHdl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwContentOptPage, VertRulerHdl, Button*, pBox, void) { - m_pVRulerRightCBox->Enable(pBox->IsEnabled() && pBox->IsChecked()); - return 0; + m_pVRulerRightCBox->Enable(pBox->IsEnabled() && static_cast<CheckBox*>(pBox)->IsChecked()); } // TabPage Printer additional settings @@ -324,7 +323,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, get(m_pPaperFromSetupCB, "papertray"); get(m_pFaxLB, "fax"); - Link<> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); + Link<Button*,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); m_pGrfCB->SetClickHdl( aLk ); m_pRightPageCB->SetClickHdl( aLk ); m_pLeftPageCB->SetClickHdl( aLk ); @@ -485,7 +484,7 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* ) m_pProspectCB_RTL->Enable( false ); } -IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl) +IMPL_LINK_NOARG_TYPED(SwAddPrinterTabPage, AutoClickHdl, Button*, void) { bAttrModified = true; bool bIsProspect = m_pProspectCB->IsChecked(); @@ -497,7 +496,6 @@ IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl) m_pEndRB->Enable( !bIsProspect ); m_pEndPageRB->Enable( !bIsProspect ); m_pInMarginsRB->Enable( !bIsProspect ); - return 0; } void SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst ) @@ -943,7 +941,7 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) pIndexHeightLB->SaveValue(); } -IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl) +IMPL_LINK_NOARG_TYPED(SwStdFontTabPage, StandardHdl, Button*, void) { sal_uInt8 nFontOffset = nFontGroup * FONT_PER_GROUP; pStandardBox->SetText(SwStdFontConfig::GetDefaultFor(FONT_STANDARD + nFontOffset, eLanguage)); @@ -973,7 +971,6 @@ IMPL_LINK_NOARG(SwStdFontTabPage, StandardHdl) pIndexHeightLB ->SetValue(CalcToPoint( SwStdFontConfig::GetDefaultHeightFor(FONT_INDEX + nFontOffset, eLanguage), SFX_MAPUNIT_TWIP, 10 )); - return 0; } IMPL_LINK( SwStdFontTabPage, ModifyHdl, ComboBox*, pBox ) @@ -1086,7 +1083,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxIte get(pFixPropRB,"fixprop"); get(pVarRB,"var"); - Link<> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); + Link<Button*,void> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl)); pNumFormattingCB->SetClickHdl(aLnk); pNumFormatFormattingCB->SetClickHdl(aLnk); pHeaderCB->SetClickHdl(aLnk); @@ -1269,12 +1266,11 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet) CheckBoxHdl(0); } -IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwTableOptionsTabPage, CheckBoxHdl, Button*, void) { pNumFormatFormattingCB->Enable(pNumFormattingCB->IsChecked()); pNumAlignmentCB->Enable(pNumFormattingCB->IsChecked()); pRepeatHeaderCB->Enable(pHeaderCB->IsChecked()); - return 0; } void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) @@ -2287,7 +2283,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const S get(m_pLenNF, "ignorelen"); get(m_pStoreRsidCB, "storeRSID"); - Link<> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); + Link<Button*,void> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) ); m_pAutoRB->SetClickHdl( aLnk ); m_pWordRB->SetClickHdl( aLnk ); m_pCharRB->SetClickHdl( aLnk ); @@ -2408,20 +2404,17 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* ) m_pStoreRsidCB->SaveValue(); } -IMPL_LINK_NOARG(SwCompareOptionsTabPage, ComparisonHdl) +IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, ComparisonHdl, Button*, void) { bool bChecked = !m_pAutoRB->IsChecked(); m_pRsidCB->Enable( bChecked ); m_pIgnoreCB->Enable( bChecked ); m_pLenNF->Enable( bChecked && m_pIgnoreCB->IsChecked() ); - - return 0; } -IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl) +IMPL_LINK_NOARG_TYPED(SwCompareOptionsTabPage, IgnoreHdl, Button*, void) { m_pLenNF->Enable( m_pIgnoreCB->IsChecked() ); - return 0; } #ifdef DBG_UTIL @@ -2516,7 +2509,7 @@ void SwTestTabPage::Reset( const SfxItemSet* ) void SwTestTabPage::Init() { // handler - Link<> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); + Link<Button*,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl ); m_pTest1CBox->SetClickHdl( aLk ); m_pTest2CBox->SetClickHdl( aLk ); m_pTest3CBox->SetClickHdl( aLk ); @@ -2529,10 +2522,9 @@ void SwTestTabPage::Init() m_pTest10CBox->SetClickHdl( aLk ); } -IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl) +IMPL_LINK_NOARG_TYPED(SwTestTabPage, AutoClickHdl, Button*, void) { bAttrModified = true; - return 0; } #endif diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index e348c107fb4e..c7b708837dac 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -290,7 +290,7 @@ void SwAddressListDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAddressListDialog, FilterHdl_Impl, Button*, void) { SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) { const OUString sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); if (sCommand.isEmpty()) - return 0; + return; AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); if(pUserData->xConnection.is() ) @@ -341,10 +341,9 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) } } } - return 0; } -IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAddressListDialog, LoadHdl_Impl, Button*, void) { SwView* pView = m_pAddressPage->GetWizard()->GetSwView(); @@ -355,15 +354,13 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl) pNewSource->SetUserData(new AddressUserData_Impl()); m_pListLB->Select(pNewSource); } - return 0; } -IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwAddressListDialog, CreateHdl_Impl, Button*, pButton, void) { OUString sInputURL; VclPtr<SwCreateAddressListDialog> pDlg( VclPtr<SwCreateAddressListDialog>::Create( - pButton, sInputURL, m_pAddressPage->GetWizard()->GetConfigItem())); @@ -439,10 +436,9 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) { } } - return 0; } -IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) { SvTreeListEntry* pEntry = m_pListLB->FirstSelected(); AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : 0; @@ -471,7 +467,6 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) { } } - return 0; }; IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl) @@ -635,7 +630,7 @@ void SwAddressListDialog::DetectTablesAndQueries( } } -IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwAddressListDialog, TableSelectHdl_Impl, Button*, pButton, void) { EnterWait(); SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); @@ -652,13 +647,11 @@ IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) } LeaveWait(); - return 0; } -IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAddressListDialog, OKHdl_Impl, Button*, void) { EndDialog(RET_OK); - return 0; } uno::Reference< XDataSource> SwAddressListDialog::GetSource() diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 2b7f2cb70eae..cb542429007f 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -74,13 +74,13 @@ class SwAddressListDialog : public SfxModalDialog void DetectTablesAndQueries(SvTreeListEntry* pSelect, bool bWidthDialog); - DECL_LINK(FilterHdl_Impl, void *); - DECL_LINK(LoadHdl_Impl, void *); - DECL_LINK(CreateHdl_Impl, PushButton*); + DECL_LINK_TYPED(FilterHdl_Impl, Button*, void); + DECL_LINK_TYPED(LoadHdl_Impl, Button*, void); + DECL_LINK_TYPED(CreateHdl_Impl, Button*, void); DECL_LINK(ListBoxSelectHdl_Impl, void *); - DECL_LINK(EditHdl_Impl, PushButton*); - DECL_LINK(TableSelectHdl_Impl, PushButton*); - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(EditHdl_Impl, Button*, void); + DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK(StaticListBoxSelectHdl_Impl, SvTreeListEntry*); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 4486925cd87b..598694fb3d89 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -421,7 +421,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog( m_pCustomizePB->SetClickHdl(LINK(this, SwCreateAddressListDialog, CustomizeHdl_Impl)); m_pOK->SetClickHdl(LINK(this, SwCreateAddressListDialog, OkHdl_Impl)); - Link<> aLk = LINK(this, SwCreateAddressListDialog, DBCursorHdl_Impl); + Link<Button*,void> aLk = LINK(this, SwCreateAddressListDialog, DBCursorHdl_Impl); m_pStartPB->SetClickHdl(aLk); m_pPrevPB->SetClickHdl(aLk); m_pSetNoNF->SetModifyHdl(LINK(this, SwCreateAddressListDialog, DBNumCursorHdl_Impl)); @@ -520,7 +520,7 @@ void SwCreateAddressListDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwCreateAddressListDialog, NewHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, NewHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); ::std::vector<OUString> aNewData; @@ -533,10 +533,9 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, NewHdl_Impl) //the address control starts at 0 m_pAddressControl->SetCurrentDataSet(nCurrent); UpdateButtons(); - return 0; } -IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, DeleteHdl_Impl, Button*, void) { sal_uInt32 nCurrent = m_pAddressControl->GetCurrentDataSet(); if(m_pCSVData->aDBData.size() > 1) @@ -555,10 +554,9 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, DeleteHdl_Impl) m_pAddressControl->SetCurrentDataSet(nCurrent); m_pSetNoNF->SetMax(m_pCSVData->aDBData.size()); UpdateButtons(); - return 0; } -IMPL_LINK_NOARG(SwCreateAddressListDialog, FindHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, FindHdl_Impl, Button*, void) { if(!m_pFindDlg) { @@ -574,10 +572,9 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, FindHdl_Impl) } else m_pFindDlg->Show(!m_pFindDlg->IsVisible()); - return 0; } -IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwCreateAddressListDialog, CustomizeHdl_Impl, Button*, pButton, void) { VclPtrInstance< SwCustomizeAddressListDialog > pDlg(pButton, *m_pCSVData); if(RET_OK == pDlg->Execute()) @@ -600,7 +597,6 @@ IMPL_LINK(SwCreateAddressListDialog, CustomizeHdl_Impl, PushButton*, pButton) ++aHeaderIter) rColumnBox.InsertEntry(*aHeaderIter); } - return 0; } namespace @@ -627,7 +623,7 @@ void lcl_WriteValues(const ::std::vector<OUString> *pFields, SvStream* pStream) } -IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) { if(m_sURL.isEmpty()) { @@ -665,11 +661,9 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl) aMedium.Commit(); EndDialog(RET_OK); } - - return 0; } -IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwCreateAddressListDialog, DBCursorHdl_Impl, Button*, pButton, void) { sal_uInt32 nValue = static_cast< sal_uInt32 >(m_pSetNoNF->GetValue()); @@ -692,7 +686,6 @@ IMPL_LINK(SwCreateAddressListDialog, DBCursorHdl_Impl, PushButton*, pButton) m_pSetNoNF->SetValue(nValue); DBNumCursorHdl_Impl(m_pSetNoNF); } - return 0; } IMPL_LINK_NOARG(SwCreateAddressListDialog, DBNumCursorHdl_Impl) @@ -789,14 +782,13 @@ void SwFindEntryDialog::dispose() } -IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, FindHdl_Impl, Button*, void) { sal_Int32 nColumn = -1; if(m_pFindOnlyCB->IsChecked()) nColumn = m_pFindOnlyLB->GetSelectEntryPos(); if(nColumn != LISTBOX_ENTRY_NOTFOUND) m_pParent->Find(m_pFindED->GetText(), nColumn); - return 0; } IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl) @@ -805,10 +797,9 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindEnableHdl_Impl) return 0; } -IMPL_LINK_NOARG(SwFindEntryDialog, CloseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwFindEntryDialog, CloseHdl_Impl, Button*, void) { Show(false); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index 26b7a3ecbe95..d8500aa5c47a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -62,12 +62,12 @@ class SwCreateAddressListDialog : public SfxModalDialog SwCSVData* m_pCSVData; VclPtr<SwFindEntryDialog> m_pFindDlg; - DECL_LINK(NewHdl_Impl, void *); - DECL_LINK(DeleteHdl_Impl, void *); - DECL_LINK(FindHdl_Impl, void *); - DECL_LINK(CustomizeHdl_Impl, PushButton*); - DECL_LINK(OkHdl_Impl, void *); - DECL_LINK(DBCursorHdl_Impl, PushButton*); + DECL_LINK_TYPED(NewHdl_Impl, Button*, void); + DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); + DECL_LINK_TYPED(FindHdl_Impl, Button*, void); + DECL_LINK_TYPED(CustomizeHdl_Impl, Button*, void); + DECL_LINK_TYPED(OkHdl_Impl, Button*, void); + DECL_LINK_TYPED(DBCursorHdl_Impl, Button*, void); DECL_LINK(DBNumCursorHdl_Impl, void *); void UpdateButtons(); @@ -93,9 +93,9 @@ class SwFindEntryDialog : public ModelessDialog VclPtr<SwCreateAddressListDialog> m_pParent; - DECL_LINK(FindHdl_Impl, void *); + DECL_LINK_TYPED(FindHdl_Impl, Button*, void); DECL_LINK(FindEnableHdl_Impl, void *); - DECL_LINK(CloseHdl_Impl, void *); + DECL_LINK_TYPED(CloseHdl_Impl, Button*, void); public: SwFindEntryDialog(SwCreateAddressListDialog* pParent); diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 1eb60f31b841..f1b5db0636e2 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -40,11 +40,11 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( get(m_pDownPB, "down"); m_pFieldsLB->SetSelectHdl(LINK(this, SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl)); - Link<> aAddRenameLk = LINK(this, SwCustomizeAddressListDialog, AddRenameHdl_Impl ); + Link<Button*,void> aAddRenameLk = LINK(this, SwCustomizeAddressListDialog, AddRenameHdl_Impl ); m_pAddPB->SetClickHdl(aAddRenameLk); m_pRenamePB->SetClickHdl(aAddRenameLk); m_pDeletePB->SetClickHdl(LINK(this, SwCustomizeAddressListDialog, DeleteHdl_Impl )); - Link<> aUpDownLk = LINK(this, SwCustomizeAddressListDialog, UpDownHdl_Impl); + Link<Button*,void> aUpDownLk = LINK(this, SwCustomizeAddressListDialog, UpDownHdl_Impl); m_pUpPB->SetClickHdl(aUpDownLk); m_pDownPB->SetClickHdl(aUpDownLk); @@ -81,7 +81,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl) return 0; } -IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void) { bool bRename = pButton == m_pRenamePB; sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); @@ -124,10 +124,9 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton) m_pFieldsLB->SelectEntryPos(nPos); } UpdateButtons(); - return 0; } -IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) { sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectEntryPos()); @@ -141,10 +140,9 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl) aDataIter->erase(aDataIter->begin() + nPos); UpdateButtons(); - return 0; } -IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) { sal_Int32 nPos; sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectEntryPos(); @@ -169,7 +167,6 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton) } UpdateButtons(); - return 0; } void SwCustomizeAddressListDialog::UpdateButtons() diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index e943f657b3f3..5466f1f997dd 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -40,9 +40,9 @@ class SwCustomizeAddressListDialog : public SfxModalDialog SwCSVData* m_pNewData; - DECL_LINK(AddRenameHdl_Impl, PushButton*); - DECL_LINK(DeleteHdl_Impl, void *); - DECL_LINK(UpDownHdl_Impl, PushButton*); + DECL_LINK_TYPED(AddRenameHdl_Impl, Button*, void); + DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); + DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void); DECL_LINK(ListBoxSelectHdl_Impl, void *); void UpdateButtons(); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index a7c8aa2fbde3..c65e56d26edf 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -450,7 +450,7 @@ void SwInsertDBColAutoPilot::dispose() SfxModalDialog::dispose(); } -IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwInsertDBColAutoPilot, PageHdl, Button*, pButton, void ) { bool bShowTable = pButton == m_pRbAsTable; @@ -479,11 +479,9 @@ IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, Button*, pButton ) m_pPbTableFormat->Enable( 0 != m_pLbTableCol->GetEntryCount() ); SelectHdl( bShowTable ? m_pLbTableDbColumn : m_pLbTextDbColumn ); - - return 0; } -IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) { ListBox& rBox = m_pRbAsTable->IsChecked() ? ( 0 == m_pLbTableCol->GetEntryData( 0 ) @@ -497,11 +495,9 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton ) bool bFromDB = m_pRbDbFormatFromDb == pButton; (*it)->bIsDBFormat = bFromDB; m_pLbDbFormatFromUsr->Enable( !bFromDB ); - - return 0; } -IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) { bool bChgEnable = true, bEnableTo = true, bEnableFrom = true; m_pLbTableDbColumn->SetUpdateMode( false ); @@ -642,8 +638,6 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton ) } m_pLbTableDbColumn->SetUpdateMode( true ); m_pLbTableCol->SetUpdateMode( true ); - - return 0; } IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox ) @@ -662,7 +656,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox*, pBox ) return 0; } -IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, PushButton*, pButton ) +IMPL_LINK_TYPED( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void ) { SwWrtShell& rSh = pView->GetWrtShell(); bool bNewSet = false; @@ -777,11 +771,9 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, PushButton*, pButton ) delete pTableSet, pTableSet = 0; delete pRep, pRep = 0; } - - return 0; } -IMPL_LINK( SwInsertDBColAutoPilot, AutoFormatHdl, PushButton*, pButton ) +IMPL_LINK_TYPED( SwInsertDBColAutoPilot, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -790,7 +782,6 @@ IMPL_LINK( SwInsertDBColAutoPilot, AutoFormatHdl, PushButton*, pButton ) OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); - return 0; } IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox ) @@ -854,7 +845,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox*, pBox ) return 0; } -IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton, void ) { if( pButton == m_pCbTableHeadon ) { @@ -863,7 +854,6 @@ IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, Button*, pButton ) m_pRbHeadlColnms->Enable( bEnable ); m_pRbHeadlEmpty->Enable( bEnable ); } - return 0; } static void lcl_InsTextInArr( const OUString& rText, _DB_Columns& rColArr ) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 30aec2447f77..ed3096b74a04 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -89,7 +89,7 @@ SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pP m_pSettingsWIN->SetSelectHdl(LINK(this, SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl)); m_pHideEmptyParagraphsCB->SetClickHdl(LINK(this, SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl)); - Link<> aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl); + Link<Button*,void> aLink = LINK(this, SwMailMergeAddressBlockPage, InsertDataHdl_Impl); m_pPrevSetIB->SetClickHdl(aLink); m_pNextSetIB->SetClickHdl(aLink); } @@ -160,7 +160,7 @@ bool SwMailMergeAddressBlockPage::commitPage( ::svt::WizardTypes::CommitPageReas return true; } -IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeAddressBlockPage, AddressListHdl_Impl, Button*, void) { try { @@ -185,10 +185,9 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl) OSL_FAIL(OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr()); ScopedVclPtrInstance<MessageDialog>::Create(this, e.Message)->Execute(); } - return 0; } -IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, SettingsHdl_Impl, Button*, pButton, void) { VclPtr<SwSelectAddressBlockDialog> pDlg( VclPtr<SwSelectAddressBlockDialog>::Create(pButton, m_pWizard->GetConfigItem())); @@ -212,10 +211,9 @@ IMPL_LINK(SwMailMergeAddressBlockPage, SettingsHdl_Impl, PushButton*, pButton) pDlg.reset(); GetWizard()->UpdateRoadmap(); GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); - return 0; } -IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AssignHdl_Impl, Button*, pButton, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); const sal_uInt16 nSel = m_pSettingsWIN->GetSelectedAddress(); @@ -229,7 +227,6 @@ IMPL_LINK(SwMailMergeAddressBlockPage, AssignHdl_Impl, PushButton*, pButton) GetWizard()->UpdateRoadmap(); GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); } - return 0; } void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective) @@ -244,13 +241,12 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective) m_pStep4->Enable(bSelective); } -IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, Button*, pBox, void) { - EnableAddressBlock(pBox->IsEnabled(), pBox->IsChecked()); + EnableAddressBlock(pBox->IsEnabled(), static_cast<CheckBox*>(pBox)->IsChecked()); SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); rConfigItem.SetAddressBlock(m_pAddressCB->IsChecked()); m_pWizard->UpdateRoadmap(); - return 0; } IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl) @@ -266,14 +262,13 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl) return 0; } -IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, Button*, pBox, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); - rConfigItem.SetHideEmptyParagraphs( pBox->IsChecked() ); - return 0; + rConfigItem.SetHideEmptyParagraphs( static_cast<CheckBox*>(pBox)->IsChecked() ); } -IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, Button*, pButton, void) { //if no pButton is given, the first set has to be pre-set SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); @@ -320,7 +315,6 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton m_pAddressListPB->SetText(m_sChangeAddress); } EnableAddressBlock(bHasResultSet, m_pAddressCB->IsChecked()); - return 0; } SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( @@ -341,13 +335,13 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( get(m_pDependentRB, "dependent"); get(m_pCountryED, "country"); - Link<> aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, NewCustomizeHdl_Impl); + Link<Button*,void> aCustomizeHdl = LINK(this, SwSelectAddressBlockDialog, NewCustomizeHdl_Impl); m_pNewPB->SetClickHdl(aCustomizeHdl); m_pCustomizePB->SetClickHdl(aCustomizeHdl); m_pDeletePB->SetClickHdl(LINK(this, SwSelectAddressBlockDialog, DeleteHdl_Impl)); - Link<> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl); + Link<Button*,void> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl); m_pNeverRB->SetClickHdl(aLk); m_pAlwaysRB->SetClickHdl(aLk); m_pDependentRB->SetClickHdl(aLk); @@ -427,7 +421,7 @@ OUString SwSelectAddressBlockDialog::GetCountry() const return OUString(); } -IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwSelectAddressBlockDialog, DeleteHdl_Impl, Button*, pButton, void) { if(m_aAddressBlocks.getLength()) { @@ -445,10 +439,9 @@ IMPL_LINK(SwSelectAddressBlockDialog, DeleteHdl_Impl, PushButton*, pButton) pButton->Enable(false); m_pPreview->RemoveSelectedAddress(); } - return 0; } -IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, Button*, pButton, void) { bool bCustomize = pButton == m_pCustomizePB; SwCustomizeAddressBlockDialog::DialogType nType = bCustomize ? @@ -478,13 +471,11 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, PushButton*, pButton } m_pDeletePB->Enable( m_aAddressBlocks.getLength() > 1); } - return 0; } -IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwSelectAddressBlockDialog, IncludeHdl_Impl, Button*, pButton, void) { m_pCountryED->Enable(m_pDependentRB == pButton); - return 0; } #define USER_DATA_SALUTATION -1 @@ -562,7 +553,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( Link<> aFieldsLink = LINK(this, SwCustomizeAddressBlockDialog, FieldChangeHdl_Impl); m_pFieldCB->SetModifyHdl(aFieldsLink); m_pFieldCB->SetSelectHdl(aFieldsLink); - Link<> aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl); + Link<Button*,void> aImgButtonHdl = LINK(this, SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl); m_pInsertFieldIB->SetClickHdl(aImgButtonHdl); m_pRemoveFieldIB->SetClickHdl(aImgButtonHdl); m_pUpIB->SetClickHdl(aImgButtonHdl); @@ -596,10 +587,9 @@ void SwCustomizeAddressBlockDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) { EndDialog(RET_OK); - return 0; } IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox) @@ -617,7 +607,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl) return 0; } -IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pButton) +IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, Button*, pButton, void) { if (m_pInsertFieldIB == pButton) { @@ -643,7 +633,6 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pBut m_pDragED->MoveCurrentItem(nMove); } UpdateImageButtons_Impl(); - return 0; } sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl() @@ -1242,13 +1231,12 @@ uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments() return aAssignments; } -IMPL_LINK_NOARG(SwAssignFieldsDialog, OkHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAssignFieldsDialog, OkHdl_Impl, Button*, void) { m_rConfigItem.SetColumnAssignment( m_rConfigItem.GetCurrentDBData(), CreateAssignments() ); EndDialog(RET_OK); - return 0; } IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 2071361d0d76..2a18a5f7a46b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -63,13 +63,13 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK(AddressListHdl_Impl, void *); - DECL_LINK(SettingsHdl_Impl, PushButton*); - DECL_LINK(AssignHdl_Impl, PushButton*); - DECL_LINK(AddressBlockHdl_Impl, CheckBox*); - DECL_LINK(InsertDataHdl_Impl, ImageButton*); + DECL_LINK_TYPED(AddressListHdl_Impl, Button *, void); + DECL_LINK_TYPED(SettingsHdl_Impl, Button*, void); + DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); + DECL_LINK_TYPED(AddressBlockHdl_Impl, Button*, void); + DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); DECL_LINK(AddressBlockSelectHdl_Impl, void *); - DECL_LINK(HideParagraphsHdl_Impl, CheckBox*); + DECL_LINK_TYPED(HideParagraphsHdl_Impl, Button*, void); void EnableAddressBlock(bool bAll, bool bSelective); @@ -99,9 +99,9 @@ class SwSelectAddressBlockDialog : public SfxModalDialog com::sun::star::uno::Sequence< OUString> m_aAddressBlocks; SwMailMergeConfigItem& m_rConfig; - DECL_LINK(NewCustomizeHdl_Impl, PushButton*); - DECL_LINK(DeleteHdl_Impl, PushButton*); - DECL_LINK(IncludeHdl_Impl, RadioButton*); + DECL_LINK_TYPED(NewCustomizeHdl_Impl, Button*, void); + DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); + DECL_LINK_TYPED(IncludeHdl_Impl, Button*, void); using Window::SetSettings; @@ -220,10 +220,10 @@ private: SwMailMergeConfigItem& m_rConfigItem; DialogType m_eType; - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK(ListBoxSelectHdl_Impl, DDListBox*); DECL_LINK(EditModifyHdl_Impl, void *); - DECL_LINK(ImageButtonHdl_Impl, ImageButton*); + DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void); DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit*); DECL_LINK(FieldChangeHdl_Impl, void *); @@ -257,7 +257,7 @@ class SwAssignFieldsDialog : public SfxModalDialog SwMailMergeConfigItem& m_rConfigItem; ::com::sun::star::uno::Sequence< OUString > CreateAssignments(); - DECL_LINK(OkHdl_Impl, void *); + DECL_LINK_TYPED(OkHdl_Impl, Button*, void); DECL_LINK(AssignmentModifyHdl_Impl, void*); public: diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 15c91b1e365e..02188173c99b 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -61,14 +61,14 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pParent) m_pCurrentDocRB->Check(); DocSelectHdl(m_pNewDocRB); - Link<> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl); + Link<Button*,void> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl); m_pCurrentDocRB->SetClickHdl(aDocSelectLink); m_pNewDocRB->SetClickHdl(aDocSelectLink); m_pLoadDocRB->SetClickHdl(aDocSelectLink); m_pLoadTemplateRB->SetClickHdl(aDocSelectLink); m_pRecentDocRB->SetClickHdl(aDocSelectLink); - Link<> aFileSelectHdl = LINK(this, SwMailMergeDocSelectPage, FileSelectHdl); + Link<Button*,void> aFileSelectHdl = LINK(this, SwMailMergeDocSelectPage, FileSelectHdl); m_pBrowseDocPB->SetClickHdl(aFileSelectHdl); m_pBrowseTemplatePB->SetClickHdl(aFileSelectHdl); @@ -109,17 +109,15 @@ void SwMailMergeDocSelectPage::dispose() svt::OWizardPage::dispose(); } -IMPL_LINK(SwMailMergeDocSelectPage, DocSelectHdl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeDocSelectPage, DocSelectHdl, Button*, pButton, void) { m_pRecentDocLB->Enable(m_pRecentDocRB == pButton); m_pWizard->UpdateRoadmap(); m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE)); - - return 0; } -IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) { bool bTemplate = m_pBrowseTemplatePB == pButton; @@ -170,8 +168,6 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton) } m_pWizard->UpdateRoadmap(); m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_OUTPUTTYPETPAGE)); - - return 0; } bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 931fc4dbfce4..410494176489 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -44,8 +44,8 @@ class SwMailMergeDocSelectPage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK(DocSelectHdl, RadioButton*); - DECL_LINK(FileSelectHdl, PushButton*); + DECL_LINK_TYPED(DocSelectHdl, Button*, void); + DECL_LINK_TYPED(FileSelectHdl, Button*, void); virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 36fa922db9b4..0193f2de2a1a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -79,7 +79,7 @@ static void lcl_StoreGreetingsBox(ComboBox& rBox, rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); } -IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) { bool bIndividual = m_pPersonalizedCB->IsEnabled() && m_pPersonalizedCB->IsChecked(); m_pFemaleFT->Enable(bIndividual); @@ -101,10 +101,9 @@ IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl) m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_PREPAREMERGEPAGE)); } UpdatePreview(); - return 0; } -IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwGreetingsHandler, GreetingHdl_Impl, Button*, pButton, void) { VclPtr<SwCustomizeAddressBlockDialog> pDlg( VclPtr<SwCustomizeAddressBlockDialog>::Create(pButton, m_pWizard->GetConfigItem(), @@ -122,7 +121,6 @@ IMPL_LINK(SwGreetingsHandler, GreetingHdl_Impl, PushButton*, pButton) } UpdatePreview(); } - return 0; } void SwGreetingsHandler::UpdatePreview() @@ -130,7 +128,7 @@ void SwGreetingsHandler::UpdatePreview() //the base class does nothing } -IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void) { const OUString sPreview(m_pFemaleLB->GetSelectEntry() + "\n" + m_pMaleLB->GetSelectEntry()); VclPtr<SwAssignFieldsDialog> pDlg( @@ -141,7 +139,6 @@ IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, PushButton*, pButton) m_pWizard->UpdateRoadmap(); m_pWizard->enableButtons(WizardButtonFlags::NEXT, m_pWizard->isStateEnabled(MM_PREPAREMERGEPAGE)); } - return 0; } IMPL_LINK_NOARG(SwMailMergeGreetingsPage, GreetingSelectHdl_Impl) @@ -258,9 +255,9 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent) m_bIsTabPage = true; m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl)); - Link<> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); + Link<Button*,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); m_pPersonalizedCB->SetClickHdl(aIndividualLink); - Link<> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); + Link<Button*,void> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); m_pFemalePB->SetClickHdl(aGreetingLink); m_pMalePB->SetClickHdl(aGreetingLink); m_pAssignPB->SetClickHdl(LINK(this, SwMailMergeGreetingsPage, AssignHdl_Impl)); @@ -273,7 +270,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* _pParent) m_pNeutralCB->SetSelectHdl(aLBoxLink); m_pNeutralCB->SetModifyHdl(aLBoxLink); - Link<> aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl); + Link<Button*,void> aDataLink = LINK(this, SwMailMergeGreetingsPage, InsertDataHdl_Impl); m_pPrevSetIB->SetClickHdl(aDataLink); m_pNextSetIB->SetClickHdl(aDataLink); @@ -363,9 +360,9 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason return true; } -IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwMailMergeGreetingsPage, ContainsHdl_Impl, Button*, pBox, void) { - bool bContainsGreeting = pBox->IsChecked(); + bool bContainsGreeting = static_cast<CheckBox*>(pBox)->IsChecked(); SwGreetingsHandler::Contains(bContainsGreeting); m_pPreviewFI-> Enable(bContainsGreeting); m_pPreviewWIN->Enable(bContainsGreeting); @@ -376,10 +373,9 @@ IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, CheckBox*, pBox) SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); rConfig.SetGreetingLine(m_pGreetingLineCB->IsChecked(), false); m_pWizard->UpdateRoadmap(); - return 0; } -IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeGreetingsPage, InsertDataHdl_Impl, Button*, pButton, void) { //if no pButton is given, the first set has to be pre-set SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); @@ -406,7 +402,6 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) m_pNextSetIB->Enable(bEnable); m_pDocumentIndexFI->Enable(bEnable); m_pDocumentIndexFI->SetText(m_sDocument.replaceFirst("%1", OUString::number(nPos))); - return 0; } SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWizard) : @@ -447,9 +442,9 @@ SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWi m_pNeutralCB->SetHelpId( HID_MM_BODY_CB_NEUTRAL ); m_pGreetingLineCB->SetClickHdl(LINK(this, SwMailBodyDialog, ContainsHdl_Impl)); - Link<> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); + Link<Button*,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl); m_pPersonalizedCB->SetClickHdl(aIndividualLink); - Link<> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); + Link<Button*,void> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl); m_pFemalePB->SetClickHdl(aGreetingLink); m_pMalePB->SetClickHdl(aGreetingLink); m_pOK->SetClickHdl(LINK(this, SwMailBodyDialog, OKHdl)); @@ -495,14 +490,14 @@ void SwMailBodyDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwMailBodyDialog, ContainsHdl_Impl, Button*, pButton, void) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); SwGreetingsHandler::Contains(pBox->IsChecked()); m_pWizard->GetConfigItem().SetGreetingLine(pBox->IsChecked(), true); - return 0; } -IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) +IMPL_LINK_NOARG_TYPED(SwMailBodyDialog, OKHdl, Button*, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); rConfigItem.SetGreetingLine( @@ -527,7 +522,6 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) rConfigItem.SetFemaleGenderValue(m_pFemaleFieldCB->GetText()); EndDialog(RET_OK); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index d351191b6121..91c6332fe1f0 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -60,8 +60,8 @@ protected: ~SwGreetingsHandler() {} - DECL_LINK(IndividualHdl_Impl, void *); - DECL_LINK(GreetingHdl_Impl, PushButton*); + DECL_LINK_TYPED(IndividualHdl_Impl, Button*, void); + DECL_LINK_TYPED(GreetingHdl_Impl, Button*, void); void Contains(bool bContainsGreeting); virtual void UpdatePreview(); @@ -79,10 +79,10 @@ class SwMailMergeGreetingsPage : public svt::OWizardPage, OUString m_sDocument; - DECL_LINK(ContainsHdl_Impl, CheckBox*); - DECL_LINK(InsertDataHdl_Impl, ImageButton*); + DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); + DECL_LINK_TYPED(InsertDataHdl_Impl, Button*, void); DECL_LINK(GreetingSelectHdl_Impl, void *); - DECL_LINK(AssignHdl_Impl, PushButton*); + DECL_LINK_TYPED(AssignHdl_Impl, Button*, void); virtual void UpdatePreview() SAL_OVERRIDE; virtual void ActivatePage() SAL_OVERRIDE; @@ -101,8 +101,8 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler VclPtr<OKButton> m_pOK; - DECL_LINK(ContainsHdl_Impl, CheckBox*); - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(ContainsHdl_Impl, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); public: SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* pWizard); virtual ~SwMailBodyDialog(); diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index cc8e99ef03bf..0662cde60cf7 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -146,7 +146,7 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : ::SetFieldUnit( *m_pLeftMF, eFieldUnit ); ::SetFieldUnit( *m_pTopMF, eFieldUnit ); - Link<> aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl ); + Link<Button*,void> aUpDownHdl = LINK(this, SwMailMergeLayoutPage, GreetingsHdl_Impl ); m_pUpPB->SetClickHdl(aUpDownHdl); m_pDownPB->SetClickHdl(aUpDownHdl); m_pAlignToBodyCB->SetClickHdl(LINK(this, SwMailMergeLayoutPage, AlignToTextHdl_Impl)); @@ -704,7 +704,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl) return 0; } -IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeLayoutPage, GreetingsHdl_Impl, Button*, pButton, void) { bool bDown = pButton == m_pDownPB; bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 ); @@ -715,17 +715,14 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton) //insert a new paragraph before the greeting line m_pExampleWrtShell->SplitNode(); } - - return 0; } -IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwMailMergeLayoutPage, AlignToTextHdl_Impl, Button*, pBox, void) { - bool bCheck = pBox->IsChecked() && pBox->IsEnabled(); + bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pLeftFT->Enable(!bCheck); m_pLeftMF->Enable(!bCheck); ChangeAddressHdl_Impl( 0 ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index a5558103dadb..fcd387e2cd56 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -68,8 +68,8 @@ class SwMailMergeLayoutPage : public svt::OWizardPage DECL_LINK(PreviewLoadedHdl_Impl, void*); DECL_LINK(ZoomHdl_Impl, ListBox*); DECL_LINK(ChangeAddressHdl_Impl, void *); - DECL_LINK(GreetingsHdl_Impl, PushButton*); - DECL_LINK(AlignToTextHdl_Impl, CheckBox*); + DECL_LINK_TYPED(GreetingsHdl_Impl, Button*, void); + DECL_LINK_TYPED(AlignToTextHdl_Impl, Button*, void); static SwFrameFormat* InsertAddressFrame( SwWrtShell& rShell, diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index 98233636a574..ea355771cea6 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -69,14 +69,13 @@ void SwMailMergeMergePage::dispose() } -IMPL_LINK_NOARG(SwMailMergeMergePage, EditDocumentHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeMergePage, EditDocumentHdl_Impl, Button*, void) { m_pWizard->SetRestartPage(MM_MERGEPAGE); m_pWizard->EndDialog(RET_EDIT_RESULT_DOC); - return 0; } -IMPL_LINK_NOARG(SwMailMergeMergePage, FindHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeMergePage, FindHdl_Impl, Button*, void) { SvxSearchItem aSearchItem( SID_SEARCH_ITEM ); @@ -94,8 +93,6 @@ IMPL_LINK_NOARG(SwMailMergeMergePage, FindHdl_Impl) pTargetView->GetViewFrame()->GetDispatcher()->Execute( FID_SEARCH_NOW, SfxCallMode::SYNCHRON, &aSearchItem, &aQuiet, 0L ); } - - return 0; } IMPL_LINK_NOARG(SwMailMergeMergePage, EnteredFindStringHdl_Impl) diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index 2ff8187eff10..30d8d992ba02 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -41,8 +41,8 @@ class SwMailMergeMergePage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK(EditDocumentHdl_Impl, void *); - DECL_LINK(FindHdl_Impl, void *); + DECL_LINK_TYPED(EditDocumentHdl_Impl, Button*, void); + DECL_LINK_TYPED(FindHdl_Impl, Button*, void); DECL_LINK(EnteredFindStringHdl_Impl, void*); public: diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index d827c05e2879..b80389cd7774 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -271,7 +271,7 @@ SwMailMergeOutputPage::SwMailMergeOutputPage(SwMailMergeWizard* _pParent) if(!rConfigItem.IsMailAvailable()) m_pSendMailRB->Hide(); - Link<> aLink = LINK(this, SwMailMergeOutputPage, OutputTypeHdl_Impl); + Link<Button*,void> aLink = LINK(this, SwMailMergeOutputPage, OutputTypeHdl_Impl); m_pSaveStartDocRB->SetClickHdl(aLink); m_pSaveMergedDocRB->SetClickHdl(aLink); m_pPrintRB->SetClickHdl(aLink); @@ -392,7 +392,7 @@ bool SwMailMergeOutputPage::canAdvance() const return false; } -IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, OutputTypeHdl_Impl, Button*, pButton, void) { vcl::Window* aControls[] = { @@ -526,19 +526,17 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) m_pFromRB->GetClickHdl().Call(m_pFromRB->IsChecked() ? m_pFromRB.get() : 0); SetUpdateMode(false); - return 0; } -IMPL_LINK(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, DocumentSelectionHdl_Impl, Button*, pButton, void) { bool bEnableFromTo = pButton == m_pFromRB; m_pFromNF->Enable(bEnableFromTo); m_pToFT->Enable(bEnableFromTo); m_pToNF->Enable(bEnableFromTo); - return 0; } -IMPL_LINK(SwMailMergeOutputPage, CopyToHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, CopyToHdl_Impl, Button*, pButton, void) { ScopedVclPtrInstance< SwCopyToDialog > pDlg(pButton); pDlg->SetCC(m_sCC ); @@ -548,10 +546,9 @@ IMPL_LINK(SwMailMergeOutputPage, CopyToHdl_Impl, PushButton*, pButton) m_sCC = pDlg->GetCC() ; m_sBCC = pDlg->GetBCC(); } - return 0; } -IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, SaveStartHdl_Impl, Button*, pButton, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); SwView* pSourceView = rConfigItem.GetSourceView(); @@ -588,13 +585,11 @@ IMPL_LINK(SwMailMergeOutputPage, SaveStartHdl_Impl, PushButton*, pButton) } } - return 0; } -IMPL_LINK_NOARG(SwMailMergeOutputPage, SaveCancelHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeOutputPage, SaveCancelHdl_Impl, Button*, void) { m_bCancelSaving = true; - return 0; } int SwMailMergeOutputPage::documentStartPageNumber( int document ) const @@ -641,20 +636,20 @@ int SwMailMergeOutputPage::documentEndPageNumber( int document ) const } } -IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, SaveOutputHdl_Impl, Button*, pButton, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); SwView* pTargetView = rConfigItem.GetTargetView(); OSL_ENSURE(pTargetView, "no target view exists"); if(!pTargetView) - return 0; + return; if(m_pSaveAsOneRB->IsChecked()) { OUString sFilter; const OUString sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter); if (sPath.isEmpty()) - return 0; + return; uno::Sequence< beans::PropertyValue > aValues(1); beans::PropertyValue* pValues = aValues.getArray(); pValues[0].Name = "FilterName"; @@ -699,7 +694,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) OUString sFilter; OUString sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter); if (sPath.isEmpty()) - return 0; + return; OUString sTargetTempURL = URIHelper::SmartRel2Abs( INetURLObject(), utl::TempFile::CreateTempName(), URIHelper::GetMaybeFileHdl()); @@ -805,7 +800,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) else { xTempDocShell->DoClose(); - return 0; + return; } } else @@ -819,7 +814,6 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) } m_pWizard->enableButtons(WizardButtonFlags::CANCEL, true); m_pWizard->enableButtons(WizardButtonFlags::FINISH, true); - return 0; } IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox) @@ -865,12 +859,12 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterChangeHdl_Impl, ListBox*, pBox) return 0; } -IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeOutputPage, PrintHdl_Impl, Button*, void) { SwView* pTargetView = m_pWizard->GetConfigItem().GetTargetView(); OSL_ENSURE(pTargetView, "no target view exists"); if(!pTargetView) - return 0; + return; sal_uInt32 nBegin = 0; sal_uInt32 nEnd = 0; @@ -920,16 +914,14 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) pTargetView->SetMailMergeConfigItem(0, 0, false); m_pWizard->enableButtons(WizardButtonFlags::CANCEL, true); m_pWizard->enableButtons(WizardButtonFlags::FINISH, true); - return 0; } -IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, PrinterSetupHdl_Impl, Button*, pButton, void) { if( !m_pTempPrinter ) PrinterChangeHdl_Impl(m_pPrinterLB); if(m_pTempPrinter) m_pTempPrinter->Setup(pButton); - return 0; } IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox) @@ -958,7 +950,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox) return 0; } -IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, SendAsHdl_Impl, Button*, pButton, void) { VclPtr<SwMailBodyDialog> pDlg = VclPtr<SwMailBodyDialog>::Create(pButton, m_pWizard); pDlg->SetBody(m_sBody); @@ -966,11 +958,10 @@ IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton) { m_sBody = pDlg->GetBody(); } - return 0; } // Send documents as e-mail -IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) +IMPL_LINK_TYPED(SwMailMergeOutputPage, SendDocumentsHdl_Impl, Button*, pButton, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); @@ -978,7 +969,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) SwView* pTargetView = rConfigItem.GetTargetView(); OSL_ENSURE(pTargetView, "no target view exists"); if(!pTargetView) - return 0; + return; if(rConfigItem.GetMailServer().isEmpty() || !SwMailMergeHelper::CheckMailAddress(rConfigItem.GetMailAddress()) ) @@ -993,7 +984,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) } if(nRet != RET_OK && nRet != RET_YES) - return 0; + return; } //add the documents sal_uInt32 nBegin = 0; @@ -1072,7 +1063,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) pSfxFlt = pFilterContainer->GetFilter4Extension(sExtension, SfxFilterFlags::EXPORT); if(!pSfxFlt) - return 0; + return; OUString sMimeType = pSfxFlt->GetMimeType(); if(m_pSubjectED->GetText().isEmpty()) @@ -1087,7 +1078,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) m_pSubjectED->SetText(aQuery->GetValue()); } else - return 0; + return; } if(!bAsBody && m_pAttachmentED->GetText().isEmpty()) { @@ -1108,7 +1099,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) m_pAttachmentED->SetText(sAttach); } else - return 0; + return; } SfxStringItem aFilterName( SID_FILTER_NAME, pSfxFlt->GetFilterName() ); OUString sEMailColumn = m_pMailToLB->GetSelectEntry(); @@ -1116,7 +1107,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) Reference< sdbcx::XColumnsSupplier > xColsSupp( rConfigItem.GetResultSet(), UNO_QUERY); Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : 0; if(sEMailColumn.isEmpty() || !xColAccess.is() || !xColAccess->hasByName(sEMailColumn)) - return 0; + return; OUString sFilterOptions; if(MM_DOCTYPE_TEXT == nDocType) @@ -1309,9 +1300,6 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) ::osl::File::remove( sTargetTempURL ); m_pWizard->enableButtons(WizardButtonFlags::FINISH, true); - //the dialog deletes itself - //delete pDlg; - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index 7dc3061adc1d..9b564897e4d8 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -104,18 +104,18 @@ class SwMailMergeOutputPage : public svt::OWizardPage OUString m_sCC; OUString m_sBCC; - DECL_LINK(OutputTypeHdl_Impl, RadioButton*); - DECL_LINK(CopyToHdl_Impl, PushButton*); - DECL_LINK(SaveStartHdl_Impl, PushButton* ); - DECL_LINK(SaveOutputHdl_Impl, PushButton* ); + DECL_LINK_TYPED(OutputTypeHdl_Impl, Button*, void); + DECL_LINK_TYPED(CopyToHdl_Impl, Button*, void); + DECL_LINK_TYPED(SaveStartHdl_Impl, Button*, void ); + DECL_LINK_TYPED(SaveOutputHdl_Impl, Button* , void); DECL_LINK(PrinterChangeHdl_Impl, ListBox* ); - DECL_LINK(PrintHdl_Impl, void *); - DECL_LINK(PrinterSetupHdl_Impl, PushButton* ); + DECL_LINK_TYPED(PrintHdl_Impl, Button*, void); + DECL_LINK_TYPED(PrinterSetupHdl_Impl, Button*, void ); DECL_LINK(SendTypeHdl_Impl, ListBox*); - DECL_LINK(SendAsHdl_Impl, PushButton*); - DECL_LINK(SendDocumentsHdl_Impl, PushButton*); - DECL_LINK(DocumentSelectionHdl_Impl, RadioButton*); - DECL_LINK(SaveCancelHdl_Impl, void *); + DECL_LINK_TYPED(SendAsHdl_Impl, Button*, void); + DECL_LINK_TYPED(SendDocumentsHdl_Impl, Button*, void); + DECL_LINK_TYPED(DocumentSelectionHdl_Impl, Button*, void); + DECL_LINK_TYPED(SaveCancelHdl_Impl, Button*, void); int documentStartPageNumber( int document ) const; int documentEndPageNumber( int document ) const; @@ -178,8 +178,8 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog sal_Int32 m_nSendCount; sal_Int32 m_nErrorCount; - DECL_DLLPRIVATE_LINK( StopHdl_Impl, PushButton* ); - DECL_DLLPRIVATE_LINK( CloseHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( StopHdl_Impl, Button*, void ); + DECL_DLLPRIVATE_LINK_TYPED( CloseHdl_Impl, Button* , void); DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog* ); DECL_DLLPRIVATE_STATIC_LINK( SwSendMailDialog, StopSendMails, SwSendMailDialog* ); DECL_DLLPRIVATE_LINK_TYPED( RemoveThis, Idle*, void ); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index b1140d1562ce..46e34667986b 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -35,7 +35,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent) get(m_pLetterHint, "letterft"); get(m_pMailHint, "emailft"); - Link<> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl); + Link<Button*,void> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl); m_pLetterRB->SetClickHdl(aLink); m_pMailRB->SetClickHdl(aLink); @@ -64,7 +64,7 @@ void SwMailMergeOutputTypePage::dispose() } -IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergeOutputTypePage, TypeHdl_Impl, Button*, void) { bool bLetter = m_pLetterRB->IsChecked(); m_pLetterHint->Show(bLetter); @@ -72,7 +72,6 @@ IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl) m_pWizard->GetConfigItem().SetOutputToLetter(bLetter); m_pWizard->updateRoadmapItemLabel( MM_ADDRESSBLOCKPAGE ); m_pWizard->UpdateRoadmap(); - return 0; } @@ -364,7 +363,7 @@ void SwSendMailDialog::SetDocumentCount( sal_Int32 nAllDocuments ) UpdateTransferStatus(); } -IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton ) +IMPL_LINK_TYPED( SwSendMailDialog, StopHdl_Impl, Button*, pButton, void ) { m_bCancel = true; if(m_pImpl->xMailDispatcher.is()) @@ -382,13 +381,11 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, PushButton*, pButton ) m_pPaused->Show(false); } } - return 0; } -IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwSendMailDialog, CloseHdl_Impl, Button*, void) { ModelessDialog::Show( false ); - return 0; } IMPL_STATIC_LINK( SwSendMailDialog, StartSendMails, SwSendMailDialog*, pDialog ) diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 9c967c05f7fb..bc2d29f2ea59 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -35,7 +35,7 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK(TypeHdl_Impl, void *); + DECL_LINK_TYPED(TypeHdl_Impl, Button*, void); public: SwMailMergeOutputTypePage( SwMailMergeWizard* _pParent); diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 854922b433f3..cbcf5f8d47f3 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -50,14 +50,14 @@ SwMailMergePrepareMergePage::SwMailMergePrepareMergePage( SwMailMergeWizard* _pP get(m_pEditPB, "edit"); m_pEditPB->SetClickHdl( LINK( this, SwMailMergePrepareMergePage, EditDocumentHdl_Impl)); - Link<> aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl)); + Link<Button*,void> aMoveLink(LINK( this, SwMailMergePrepareMergePage, MoveClickHdl_Impl)); m_pFirstPB->SetClickHdl( aMoveLink ); m_pPrevPB->SetClickHdl( aMoveLink ); m_pNextPB->SetClickHdl( aMoveLink ); m_pLastPB->SetClickHdl( aMoveLink ); - m_pRecordED->SetModifyHdl( aMoveLink ); + m_pRecordED->SetModifyHdl( LINK( this, SwMailMergePrepareMergePage, MoveHdl_Impl) ); m_pExcludeCB->SetClickHdl(LINK(this, SwMailMergePrepareMergePage, ExcludeHdl_Impl)); - aMoveLink.Call(m_pRecordED); + MoveHdl_Impl(m_pRecordED); } SwMailMergePrepareMergePage::~SwMailMergePrepareMergePage() @@ -78,13 +78,16 @@ void SwMailMergePrepareMergePage::dispose() svt::OWizardPage::dispose(); } -IMPL_LINK_NOARG(SwMailMergePrepareMergePage, EditDocumentHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwMailMergePrepareMergePage, EditDocumentHdl_Impl, Button*, void) { m_pWizard->SetRestartPage(MM_PREPAREMERGEPAGE); m_pWizard->EndDialog(RET_EDIT_DOC); - return 0; } +IMPL_LINK_TYPED( SwMailMergePrepareMergePage, MoveClickHdl_Impl, Button*, pCtrl, void) +{ + MoveHdl_Impl(pCtrl); +} IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); @@ -135,11 +138,10 @@ IMPL_LINK( SwMailMergePrepareMergePage, MoveHdl_Impl, void*, pCtrl) return 0; } -IMPL_LINK( SwMailMergePrepareMergePage, ExcludeHdl_Impl, CheckBox*, pBox) +IMPL_LINK_TYPED( SwMailMergePrepareMergePage, ExcludeHdl_Impl, Button*, pBox, void) { SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem(); - rConfigItem.ExcludeRecord( rConfigItem.GetResultSetPosition(), pBox->IsChecked()); - return 0; + rConfigItem.ExcludeRecord( rConfigItem.GetResultSetPosition(), static_cast<CheckBox*>(pBox)->IsChecked()); }; void SwMailMergePrepareMergePage::ActivatePage() diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 8bfdfbe94158..7b0fb2cbe882 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -40,9 +40,10 @@ class SwMailMergePrepareMergePage : public svt::OWizardPage VclPtr<SwMailMergeWizard> m_pWizard; - DECL_LINK(EditDocumentHdl_Impl, void *); - DECL_LINK(ExcludeHdl_Impl, CheckBox*); + DECL_LINK_TYPED(EditDocumentHdl_Impl, Button*, void); + DECL_LINK_TYPED(ExcludeHdl_Impl, Button*, void); DECL_LINK(MoveHdl_Impl, void*); + DECL_LINK_TYPED(MoveClickHdl_Impl, Button*, void); virtual void ActivatePage() SAL_OVERRIDE; virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE; diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 24c3df4753c7..6ed6e3d6fae7 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -157,7 +157,7 @@ void SwSelectDBTableDialog::dispose() SfxModalDialog::dispose(); } -IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) +IMPL_LINK_TYPED(SwSelectDBTableDialog, PreviewHdl, Button*, pButton, void) { SvTreeListEntry* pEntry = m_pTable->FirstSelected(); if(pEntry) @@ -190,8 +190,6 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) VclPtrInstance< SwDBTablePreviewDialog > pDlg(pButton, aProperties); pDlg->Execute(); } - - return 0; } OUString SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable) diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index b02b74b2cb72..98ea8141e004 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -45,7 +45,7 @@ class SwSelectDBTableDialog : public SfxModalDialog css::uno::Reference<css::sdbc::XConnection> m_xConnection; - DECL_LINK(PreviewHdl, PushButton*); + DECL_LINK_TYPED(PreviewHdl, Button*, void); public: SwSelectDBTableDialog(vcl::Window* pParent, const css::uno::Reference<css::sdbc::XConnection>& xConnection); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 70909751a46e..1744d261c699 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -140,7 +140,7 @@ void SwDocStatPage::Update() SetData(aDocStat); } -IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl) +IMPL_LINK_NOARG_TYPED(SwDocStatPage, UpdateHdl, Button*, void) { Update(); SwDocShell* pDocShell = static_cast<SwDocShell*>( SfxObjectShell::Current()); @@ -148,7 +148,6 @@ IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl) if(pFEShell) m_pLineNo->SetText( OUString::number( pFEShell->GetLineCount(false))); //pButton->Disable(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 6415789f4b9e..ce894f43059a 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -161,11 +161,10 @@ OUString AbstractTabDialog_Impl::GetText() const return pDlg->GetText(); } -IMPL_LINK_NOARG(AbstractApplyTabDialog_Impl, ApplyHdl) +IMPL_LINK_NOARG_TYPED(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void) { if (pDlg->Apply()) m_aHandler.Call(NULL); - return 0; } void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<>& rLink ) diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index c0a2a0a4e00d..fa8f1044410c 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -135,7 +135,7 @@ public: : AbstractTabDialog_Impl(p) { } - DECL_LINK(ApplyHdl, void*); + DECL_LINK_TYPED(ApplyHdl, Button*, void); private: Link<> m_aHandler; virtual void SetApplyHdl( const Link<>& rLink ) SAL_OVERRIDE; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 5925834e27a9..b0785205aad2 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -754,7 +754,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) } // in OkHdl the modified settings are being applied and reversed regions are deleted -IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OkHdl, Button*, void) { // temp. Array because during changing of a region the position // inside of the "Core-Arrays" can be shifted: @@ -828,15 +828,14 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) rSh.EndUndo(); rSh.EndAllAction(); - - return 0; } // Toggle protect -IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, ChangeProtectHdl, Button *, pButton, void ) { + TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) - return 0; + return; pBox->EnableTriState(false); SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); @@ -853,14 +852,14 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) } m_pPasswdCB->Enable(bCheck); m_pPasswdPB->Enable(bCheck); - return 0; } // Toggle hide -IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, ChangeHideHdl, Button *, pButton, void ) { + TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) - return 0; + return; pBox->EnableTriState(false); SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); @@ -880,14 +879,14 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) bool bHide = TRISTATE_TRUE == pBox->GetState(); m_pConditionED->Enable(bHide); m_pConditionFT->Enable(bHide); - return 0; } // Toggle edit in readonly -IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, ChangeEditInReadonlyHdl, Button *, pButton, void ) { + TriStateBox* pBox = static_cast<TriStateBox*>(pButton); if(!CheckPasswd(pBox)) - return 0; + return; pBox->EnableTriState(false); SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); @@ -898,15 +897,13 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) TRISTATE_TRUE == pBox->GetState()); pEntry = m_pTree->NextSelected(pEntry); } - - return 0; } // clear selected region -IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) +IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, ChangeDismissHdl, Button*, void) { if(!CheckPasswd()) - return 0; + return; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); SvTreeListEntry* pChild; SvTreeListEntry* pParent; @@ -965,14 +962,14 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) m_pOK->GrabFocus(); UseFileHdl(m_pFileCB); } - return 0; } // link CheckBox to file? -IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); if(!CheckPasswd(pBox)) - return 0; + return; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); pBox->EnableTriState(false); bool bMulti = 1 < m_pTree->GetSelectionCount(); @@ -1022,27 +1019,25 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) m_pDDECB->Enable(false); m_pDDEFrame->Enable(false); } - return 0; } // call dialog paste file -IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl) +IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) { if(!CheckPasswd(0)) - return 0; + return; m_pOldDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( "swriter" ); m_pDocInserter->StartExecuteModal( LINK( this, SwEditRegionDlg, DlgClosedHdl ) ); - return 0; } -IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) +IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, OptionsHdl, Button*, void) { if(!CheckPasswd()) - return 0; + return; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); if(pEntry) @@ -1135,8 +1130,6 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) } } } - - return 0; } // Applying of the filename or the linked region @@ -1189,10 +1182,11 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) return 0; } -IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); if(!CheckPasswd(pBox)) - return 0; + return; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); if(pEntry) { @@ -1235,17 +1229,16 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) } m_pFilePB->Enable(bFile && !bDDE); } - return 0; } -IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { bool bChange = pBox == m_pPasswdPB; if(!CheckPasswd(0)) { if(!bChange) m_pPasswdCB->Check(!m_pPasswdCB->IsChecked()); - return 0; + return; } SvTreeListEntry* pEntry = m_pTree->FirstSelected(); bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked(); @@ -1288,7 +1281,6 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) } pEntry = m_pTree->NextSelected(pEntry); } - return 0; } // the current region name is being added to the TreeListBox immediately during @@ -1686,23 +1678,21 @@ VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( vcl::Window* pParent, return VclPtr<SwInsertSectionTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void ) { - bool bHide = pBox->IsChecked(); + bool bHide = static_cast<CheckBox*>(pBox)->IsChecked(); m_pConditionED->Enable(bHide); m_pConditionFT->Enable(bHide); - return 0; } -IMPL_LINK( SwInsertSectionTabPage, ChangeProtectHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangeProtectHdl, Button *, pBox, void ) { - bool bCheck = pBox->IsChecked(); + bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); m_pPasswdCB->Enable(bCheck); m_pPasswdPB->Enable(bCheck); - return 0; } -IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) +IMPL_LINK_TYPED( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) { bool bChange = pButton == m_pPasswdPB; bool bSet = bChange ? bChange : m_pPasswdCB->IsChecked(); @@ -1730,7 +1720,6 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) } else m_aNewPasswd.realloc(0); - return 0; } IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl) @@ -1741,8 +1730,9 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl) return 0; } -IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwInsertSectionTabPage, UseFileHdl, Button *, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); if( pBox->IsChecked() ) { if( m_pWrtSh->HasSelection() && @@ -1768,21 +1758,20 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) m_pDDECB->Check(false); DDEHdl(m_pDDECB); } - return 0; } -IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl) +IMPL_LINK_NOARG_TYPED(SwInsertSectionTabPage, FileSearchHdl, Button*, void) { m_pOldDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); delete m_pDocInserter; m_pDocInserter = new ::sfx2::DocumentInserter( "swriter" ); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); - return 0; } -IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SwInsertSectionTabPage, DDEHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); bool bDDE = pBox->IsChecked(); bool bFile = m_pFileCB->IsChecked(); m_pFilePB->Enable(!bDDE && bFile); @@ -1805,7 +1794,6 @@ IMPL_LINK( SwInsertSectionTabPage, DDEHdl, CheckBox*, pBox ) m_pSubRegionED->Enable(bFile); m_pFileNameED->SetAccessibleName(m_pFileNameFT->GetText()); } - return 0; } IMPL_LINK_TYPED( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, void ) @@ -1862,7 +1850,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage( vcl::Window *pParent, get(pEndSuffixFT,"endsuffix_label"); get(pEndSuffixED,"endsuffix"); - Link<> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl)); + Link<Button*,void> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl)); pFootnoteNtAtTextEndCB->SetClickHdl( aLk ); pFootnoteNtNumCB->SetClickHdl( aLk ); pEndNtAtTextEndCB->SetClickHdl( aLk ); @@ -2045,7 +2033,7 @@ VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent, return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void ) { bool bFoot = pFootnoteNtAtTextEndCB == pBox || pFootnoteNtNumCB == pBox || pFootnoteNtNumFormatCB == pBox ; @@ -2097,8 +2085,6 @@ IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, CheckBox *, pBox ) pSuffixED->Enable( bEnableNumFormat ); pPrefixFT->Enable( bEnableNumFormat ); pSuffixFT->Enable( bEnableNumFormat ); - - return 0; } SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 7184c39437ab..bebfe4f3870a 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -34,14 +34,13 @@ #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> -IMPL_STATIC_LINK_NOARG(SwWordCountFloatDlg, CloseHdl) +IMPL_STATIC_LINK_NOARG_TYPED(SwWordCountFloatDlg, CloseHdl, Button*, void) { SfxViewFrame* pVFrame = ::GetActiveView()->GetViewFrame(); if (pVFrame != NULL) { pVFrame->ToggleChildWindow(FN_WORDCOUNT_DIALOG); } - return 0; } SwWordCountFloatDlg::~SwWordCountFloatDlg() diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 37f6aac760a9..e24dbd09f427 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -266,7 +266,7 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox ) return 0; } -IMPL_LINK_NOARG(SwEnvPage, FieldHdl) +IMPL_LINK_NOARG_TYPED(SwEnvPage, FieldHdl, Button*, void) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + @@ -276,10 +276,9 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl) Selection aSel = m_pAddrEdit->GetSelection(); m_pAddrEdit->GrabFocus(); m_pAddrEdit->SetSelection(aSel); - return 0; } -IMPL_LINK_NOARG(SwEnvPage, SenderHdl) +IMPL_LINK_NOARG_TYPED(SwEnvPage, SenderHdl, Button*, void) { const bool bEnable = m_pSenderBox->IsChecked(); GetParentSwEnvDlg()->aEnvItem.bSend = bEnable; @@ -291,7 +290,6 @@ IMPL_LINK_NOARG(SwEnvPage, SenderHdl) m_pSenderEdit->SetText(MakeSender()); } m_pPreview->Invalidate(); - return 0; } void SwEnvPage::InitDatabaseBox() diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 17cf4ce5070f..649db1512e4a 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -84,7 +84,7 @@ void SwEnvPrtPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl) +IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, ClickHdl, Button*, void) { if (m_pBottomButton->IsChecked()) { @@ -106,10 +106,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl) m_pAlignBox->SetItemImage(m_aIds[ENV_VER_CNTR], Image(Bitmap(SW_RES(BMP_VER_CNTR_UPPER)))); m_pAlignBox->SetItemImage(m_aIds[ENV_VER_RGHT], Image(Bitmap(SW_RES(BMP_VER_RGHT_UPPER)))); } - return 0; } -IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwEnvPrtPage, ButtonHdl, Button *, pBtn, void ) { if (pBtn == m_pPrtSetup) { @@ -124,7 +123,6 @@ IMPL_LINK( SwEnvPrtPage, ButtonHdl, Button *, pBtn ) m_pPrinterInfo->SetText(pPrt->GetName()); } } - return 0; } IMPL_LINK_NOARG_TYPED(SwEnvPrtPage, AlignHdl, ToolBox *, void) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 33c553032802..5f386f7159f4 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -47,9 +47,9 @@ class SwEnvPrtPage : public SfxTabPage VclPtr<Printer> pPrt; - DECL_LINK(ClickHdl, void *); + DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK_TYPED(AlignHdl, ToolBox *, void); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED(ButtonHdl, Button *, void ); SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>( GetParentDialog());} diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 96c02c28caa3..8159a72c6a3a 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -327,7 +327,7 @@ void SwLabPage::SetToBusinessCard() m_pAddressFrame->Hide(); }; -IMPL_LINK_NOARG(SwLabPage, AddrHdl) +IMPL_LINK_NOARG_TYPED(SwLabPage, AddrHdl, Button*, void) { OUString aWriting; @@ -336,7 +336,6 @@ IMPL_LINK_NOARG(SwLabPage, AddrHdl) m_pWritingEdit->SetText( aWriting ); m_pWritingEdit->GrabFocus(); - return 0; } IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox ) @@ -352,7 +351,7 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox *, pListBox ) return 0; } -IMPL_LINK_NOARG(SwLabPage, FieldHdl) +IMPL_LINK_NOARG_TYPED(SwLabPage, FieldHdl, Button*, void) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + @@ -362,13 +361,11 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl) Selection aSel = m_pWritingEdit->GetSelection(); m_pWritingEdit->GrabFocus(); m_pWritingEdit->SetSelection(aSel); - return 0; } -IMPL_LINK_NOARG(SwLabPage, PageHdl) +IMPL_LINK_NOARG_TYPED(SwLabPage, PageHdl, Button*, void) { m_pMakeBox->GetSelectHdl().Call(m_pMakeBox); - return 0; } IMPL_LINK_NOARG(SwLabPage, MakeHdl) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 0d21573cf127..12297627e5bb 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -566,7 +566,7 @@ void SwLabFormatPage::Reset(const SfxItemSet* ) PreviewHdl(0); } -IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl) +IMPL_LINK_NOARG_TYPED(SwLabFormatPage, SaveHdl, Button*, void) { SwLabRec aRec; aRec.lHDist = static_cast< long >(GETFLDVAL(*m_pHDistField)); @@ -595,7 +595,6 @@ IMPL_LINK_NOARG(SwLabFormatPage, SaveHdl) m_pMakeFI->SetText(aItem.aMake); m_pTypeFI->SetText(aItem.aType); } - return 0; } SwSaveLabelDlg::SwSaveLabelDlg(SwLabFormatPage* pParent, SwLabRec& rRec) @@ -636,7 +635,7 @@ void SwSaveLabelDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(SwSaveLabelDlg, OkHdl, Button*, void) { SwLabelConfig& rCfg = pLabPage->GetParentSwLabDlg()->GetLabelsConfig(); OUString sMake(m_pMakeCB->GetText()); @@ -647,7 +646,7 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) { SAL_WARN( "sw.envelp", "label is predefined and cannot be overwritten" ); ScopedVclPtrInstance<MessageDialog>::Create(this, "CannotSaveLabelDialog", "modules/swriter/ui/cannotsavelabeldialog.ui")->Execute(); - return 0; + return; } ScopedVclPtrInstance<MessageDialog> aQuery(this, "QuerySaveLabelDialog", @@ -659,13 +658,12 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl) replaceAll("%1", sMake).replaceAll("%2", sType)); if (RET_YES != aQuery->Execute()) - return 0; + return; } rLabRec.aType = sType; rCfg.SaveLabel(sMake, sType, rLabRec); bSuccess = true; EndDialog(RET_OK); - return 0; } IMPL_LINK_NOARG(SwSaveLabelDlg, ModifyHdl) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 34f205d89909..67ad694dfbda 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -90,7 +90,7 @@ class SwLabFormatPage : public SfxTabPage DECL_LINK(ModifyHdl, void *); DECL_LINK_TYPED(PreviewHdl, Idle *, void); DECL_LINK( LoseFocusHdl, Control * ); - DECL_LINK(SaveHdl, void *); + DECL_LINK_TYPED(SaveHdl, Button*, void); void ChangeMinMax(); @@ -123,7 +123,7 @@ class SwSaveLabelDlg : public ModalDialog VclPtr<SwLabFormatPage> pLabPage; SwLabRec& rLabRec; - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK(ModifyHdl, void *); public: diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 59e3e06ed453..cd4b1404fdc9 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -45,7 +45,7 @@ SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); // Install handlers - Link<> aLk = LINK(this, SwLabPrtPage, CountHdl); + Link<Button*,void> aLk = LINK(this, SwLabPrtPage, CountHdl); m_pPageButton->SetClickHdl( aLk ); m_pSingleButton->SetClickHdl( aLk ); @@ -80,7 +80,7 @@ void SwLabPrtPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) +IMPL_LINK_TYPED( SwLabPrtPage, CountHdl, Button *, pButton, void ) { if (pButton == m_pPrtSetup) { @@ -94,7 +94,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) pDlg.disposeAndClear(); GrabFocus(); m_pPrinterInfo->SetText(pPrinter->GetName()); - return 0; + return; } const bool bEnable = pButton == m_pSingleButton; m_pSingleGrid->Enable(bEnable); @@ -105,7 +105,6 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) { m_pColField->GrabFocus(); } - return 0; } VclPtr<SfxTabPage> SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 45b5decffb5e..818273dc9f72 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -44,7 +44,7 @@ class SwLabPrtPage : public SfxTabPage VclPtr<FixedText> m_pPrinterInfo; VclPtr<PushButton> m_pPrtSetup; - DECL_LINK( CountHdl, Button * ); + DECL_LINK_TYPED( CountHdl, Button *, void ); SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetParentDialog());} diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 72e2cd7a1f18..ab90a22431ac 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -252,7 +252,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, m_pAllRB->Check(); // Install handlers - Link<> aLk = LINK(this, SwMailMergeDlg, ButtonHdl); + Link<Button*,void> aLk = LINK(this, SwMailMergeDlg, ButtonHdl); m_pOkBTN->SetClickHdl(aLk); m_pPathPB->SetClickHdl(LINK(this, SwMailMergeDlg, InsertPathHdl)); @@ -279,9 +279,9 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, m_pSaveIndividualRB->SetClickHdl( aLk ); aLk.Call( m_pSaveSingleDocRB ); - aLk = LINK(this, SwMailMergeDlg, ModifyHdl); - m_pFromNF->SetModifyHdl(aLk); - m_pToNF->SetModifyHdl(aLk); + Link<> aLk2 = LINK(this, SwMailMergeDlg, ModifyHdl); + m_pFromNF->SetModifyHdl(aLk2); + m_pToNF->SetModifyHdl(aLk2); m_pFromNF->SetMax(SAL_MAX_INT32); m_pToNF->SetMax(SAL_MAX_INT32); @@ -420,16 +420,15 @@ void SwMailMergeDlg::Apply() { } -IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwMailMergeDlg, ButtonHdl, Button *, pBtn, void ) { if (pBtn == m_pOkBTN) { if( ExecQryShell() ) EndDialog(RET_OK); } - return 0; } -IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, RadioButton *, pBtn ) +IMPL_LINK_TYPED( SwMailMergeDlg, OutputTypeHdl, Button *, pBtn, void ) { bool bPrint = pBtn == m_pPrinterRB; m_pSingleJobsCB->Enable(bPrint); @@ -450,11 +449,9 @@ IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, RadioButton *, pBtn ) m_pFilterLB->Enable(false); m_pGenerateFromDataBaseCB->Enable(false); } - - return 0; } -IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( SwMailMergeDlg, SaveTypeHdl, Button*, pBtn, void ) { bool bIndividual = pBtn == m_pSaveIndividualRB; @@ -470,12 +467,11 @@ IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*, pBtn ) m_pFilterFT->Enable( false ); m_pFilterLB->Enable( false ); } - return 0; } -IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SwMailMergeDlg, FilenameHdl, Button*, pBox, void ) { - bool bEnable = pBox->IsChecked(); + bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked(); m_pColumnFT->Enable( bEnable ); m_pColumnLB->Enable(bEnable); m_pPathFT->Enable( bEnable ); @@ -483,7 +479,6 @@ IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox ) m_pPathPB->Enable( bEnable ); m_pFilterFT->Enable( bEnable ); m_pFilterLB->Enable( bEnable ); - return 0; } IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl) @@ -585,7 +580,7 @@ bool SwMailMergeDlg::ExecQryShell() return true; } -IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl) +IMPL_LINK_NOARG_TYPED(SwMailMergeDlg, InsertPathHdl, Button*, void) { OUString sPath( m_pPathED->GetText() ); if( sPath.isEmpty() ) { @@ -603,7 +598,6 @@ IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl) else m_pPathED->SetText(aURL.GetFull()); } - return 0; } uno::Reference<XResultSet> SwMailMergeDlg::GetResultSet() const diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 6e7ec2e62e5b..7306303ae422 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -47,10 +47,10 @@ class SwLabPage : public SfxTabPage bool m_bLabel; - DECL_LINK(AddrHdl, void *); - DECL_LINK( DatabaseHdl, ListBox * ); - DECL_LINK(FieldHdl, void *); - DECL_LINK(PageHdl, void *); + DECL_LINK_TYPED(AddrHdl, Button*, void); + DECL_LINK(DatabaseHdl, ListBox * ); + DECL_LINK_TYPED(FieldHdl, Button *, void); + DECL_LINK_TYPED(PageHdl, Button *, void); DECL_LINK(MakeHdl, void *); DECL_LINK(TypeHdl, void *); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 6263190669aa..0886666bc541 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -44,7 +44,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r get(m_pNextPB, "next"); get(m_pEditPB, "edit"); - Link<> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl); + Link<Button*,void> aButtonLk = LINK(this, DropDownFieldDialog, ButtonHdl); m_pEditPB->SetClickHdl(aButtonLk); if( bNextButton ) { @@ -106,10 +106,9 @@ void sw::DropDownFieldDialog::Apply() } } -IMPL_LINK(sw::DropDownFieldDialog, ButtonHdl, PushButton*, pButton) +IMPL_LINK_TYPED(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void) { EndDialog(m_pNextPB == pButton ? RET_OK : RET_YES ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index a5f61470f534..0ab326297cfe 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -217,7 +217,7 @@ void SwChangeDBDlg::UpdateFields() pSh->EndAllAction(); } -IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl) +IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) { OUString sTableName; OUString sColumnName; @@ -229,8 +229,6 @@ IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl) pSh->ChgDBData(aData); ShowDBName(pSh->GetDBData()); EndDialog(RET_OK); - - return 0; } IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) @@ -261,12 +259,11 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) } } -IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl) +IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, AddDBHdl, Button*, void) { const OUString sNewDB = SwDBManager::LoadAndRegisterDataSource(); if (!sNewDB.isEmpty()) m_pAvailDBTLB->AddDataSource(sNewDB); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 96ceb81cd274..f433a5e414ff 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -475,14 +475,13 @@ IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) return 0; } -IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) { OUString sNewDB = SwDBManager::LoadAndRegisterDataSource(); if(!sNewDB.isEmpty()) { m_pDatabaseTLB->AddDataSource(sNewDB); } - return 0; } // Modify diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 220d531d8b2d..b663cc4956ad 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -58,7 +58,7 @@ class SwFieldDBPage : public SwFieldPage DECL_LINK( NumSelectHdl, NumFormatListBox* ); DECL_LINK( TreeSelectHdl, SvTreeListBox* ); DECL_LINK(ModifyHdl, void *); - DECL_LINK(AddDBHdl, void *); + DECL_LINK_TYPED(AddDBHdl, Button*, void); void CheckInsert(); diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index e95edece3efc..91c2dcc4b272 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -240,7 +240,7 @@ void SwFieldEditDlg::InsertHdl() } // kick off changing of the field -IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, OKHdl, Button*, void) { if (GetOKButton()->IsEnabled()) { @@ -249,8 +249,6 @@ IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl) pTabPage->FillItemSet(0); EndDialog( RET_OK ); } - - return 0; } short SwFieldEditDlg::Execute() @@ -260,7 +258,7 @@ short SwFieldEditDlg::Execute() } // Traveling between fields of the same type -IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton ) +IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void ) { bool bNext = pButton == m_pNextBT; @@ -292,11 +290,9 @@ IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton ) pTabPage->EditNewField(); Init(); - - return 0; } -IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl) +IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void) { SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage()); SwFieldMgr& rMgr = pTabPage->GetFieldMgr(); @@ -341,7 +337,6 @@ IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl) { pSh->UpdateFields( *pCurField ); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index dd4e8e64ce2f..f028af35d3b4 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -168,12 +168,12 @@ void SwFieldFuncPage::Reset(const SfxItemSet* ) m_pSelectionLB->SetDoubleClickHdl (LINK(this, SwFieldFuncPage, InsertMacroHdl)); m_pFormatLB->SetDoubleClickHdl (LINK(this, SwFieldFuncPage, InsertHdl)); m_pMacroBT->SetClickHdl (LINK(this, SwFieldFuncPage, MacroHdl)); - Link<> aListModifyLk( LINK(this, SwFieldFuncPage, ListModifyHdl)); + Link<Button*,void> aListModifyLk( LINK(this, SwFieldFuncPage, ListModifyHdl)); m_pListAddPB->SetClickHdl(aListModifyLk); m_pListRemovePB->SetClickHdl(aListModifyLk); m_pListUpPB->SetClickHdl(aListModifyLk); m_pListDownPB->SetClickHdl(aListModifyLk); - m_pListItemED->SetReturnActionLink(aListModifyLk); + m_pListItemED->SetReturnActionLink(LINK(this, SwFieldFuncPage, ListModifyReturnActionHdl)); Link<> aListEnableLk = LINK(this, SwFieldFuncPage, ListEnableHdl); m_pListItemED->SetModifyHdl(aListEnableLk); m_pListItemsLB->SetSelectHdl(aListEnableLk); @@ -417,13 +417,17 @@ IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl) IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl) { - SelectHdl(); + SelectHdl(NULL); InsertHdl(); return 0; } -IMPL_LINK( SwFieldFuncPage, ListModifyHdl, Control*, pControl) +IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyHdl, Button*, pControl, void) +{ + ListModifyReturnActionHdl(pControl); +} +IMPL_LINK( SwFieldFuncPage, ListModifyReturnActionHdl, Control*, pControl) { m_pListItemsLB->SetUpdateMode(false); if(pControl == m_pListAddPB || @@ -528,7 +532,7 @@ void SwFieldFuncPage::UpdateSubType() } // call MacroBrowser, fill Listbox with Macros -IMPL_LINK( SwFieldFuncPage, MacroHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwFieldFuncPage, MacroHdl, Button *, pBtn, void ) { vcl::Window* pDefModalDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); @@ -537,8 +541,6 @@ IMPL_LINK( SwFieldFuncPage, MacroHdl, Button *, pBtn ) UpdateSubType(); Application::SetDefDialogParent( pDefModalDlgParent ); - - return 0; } bool SwFieldFuncPage::FillItemSet(SfxItemSet* ) @@ -599,7 +601,7 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* ) InsertField( nTypeId, nSubType, aName, aVal, nFormat ); } - ModifyHdl(); // enable/disable Insert if applicable + ModifyHdl(NULL); // enable/disable Insert if applicable return false; } diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 468f5fdf0bd8..bedaaa51c2f1 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -67,14 +67,15 @@ class SwFieldFuncPage : public SwFieldPage bool bDropDownLBChanged; DECL_LINK(TypeHdl, void *); - DECL_LINK(SelectHdl, void * = 0); + DECL_LINK(SelectHdl, void *); DECL_LINK(InsertMacroHdl, void *); - DECL_LINK(ModifyHdl, void * = 0); - DECL_LINK( ListModifyHdl, Control*); + DECL_LINK(ModifyHdl, void *); + DECL_LINK(ListModifyReturnActionHdl, Control *); + DECL_LINK_TYPED( ListModifyHdl, Button*, void); DECL_LINK( ListEnableHdl, void*); // select Macro - DECL_LINK( MacroHdl, Button * ); + DECL_LINK_TYPED( MacroHdl, Button *, void ); void UpdateSubType(); static OUString TurnMacroString(const OUString &rMacro); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 06ddf5f9a973..87d9b1cb2157 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -180,7 +180,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID ) } // kick off inserting of new fields -IMPL_LINK_NOARG(SwFieldDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void) { if (GetOKButton().IsEnabled()) { @@ -189,14 +189,11 @@ IMPL_LINK_NOARG(SwFieldDlg, OKHdl) GetOKButton().GrabFocus(); // because of InputField-Dlg } - - return 0; } -IMPL_LINK_NOARG(SwFieldDlg, CancelHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDlg, CancelHdl, Button*, void) { Close(); - return 0; } // newly initialise dialog after Doc-Switch diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index c225195c8029..c261f584830a 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -164,10 +164,9 @@ void SwFieldInputDlg::Apply() rSh.EndAllAction(); } -IMPL_LINK_NOARG(SwFieldInputDlg, NextHdl) +IMPL_LINK_NOARG_TYPED(SwFieldInputDlg, NextHdl, Button*, void) { EndDialog(RET_OK); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index c193ba567edf..ef953516cedd 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -64,7 +64,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : m_pNextBtn->SetClickHdl( LINK( this, SwJavaEditDialog, NextHdl ) ); m_pOKBtn->SetClickHdl( LINK( this, SwJavaEditDialog, OKHdl ) ); - Link<> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl); + Link<Button*,void> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl); m_pUrlRB->SetClickHdl(aLk); m_pEditRB->SetClickHdl(aLk); m_pUrlPB->SetClickHdl(LINK(this, SwJavaEditDialog, InsertFileHdl)); @@ -110,7 +110,7 @@ void SwJavaEditDialog::dispose() SvxStandardDialog::dispose(); } -IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl) +IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void) { pSh->EnterStdMode(); @@ -119,11 +119,9 @@ IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl) pField = static_cast<SwScriptField*>(pMgr->GetCurField()); CheckTravel(); RadioButtonHdl(NULL); - - return 0; } -IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl) +IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void) { pSh->EnterStdMode(); @@ -132,15 +130,12 @@ IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl) pField = static_cast<SwScriptField*>(pMgr->GetCurField()); CheckTravel(); RadioButtonHdl(NULL); - - return 0; } -IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl) +IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, OKHdl, Button*, void) { SetField(); EndDialog( RET_OK ); - return 0; } void SwJavaEditDialog::Apply() @@ -237,7 +232,7 @@ bool SwJavaEditDialog::IsUpdate() const return pField && ( sal_uInt32(bIsUrl ? 1 : 0) != pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText ); } -IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl) +IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void) { bool bEnable = m_pUrlRB->IsChecked(); m_pUrlPB->Enable(bEnable); @@ -254,10 +249,9 @@ IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl) if( m_pUrlPB->IsEnabled() && !bEnable ) m_pUrlPB->Enable( false ); } - return 0; } -IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn ) +IMPL_LINK_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, pBtn, void ) { if ( !pFileDlg ) { @@ -270,7 +264,6 @@ IMPL_LINK( SwJavaEditDialog, InsertFileHdl, PushButton *, pBtn ) } pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) ); - return 0; } IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 8dadbbafcf74..afc851598507 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -293,7 +293,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) return 0; } -IMPL_LINK_NOARG(SwColumnDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(SwColumnDlg, OkHdl, Button*, void) { // evaluate current selection SfxItemSet* pSet = 0; @@ -371,7 +371,6 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl) rWrtShell.EndAction(); } EndDialog(RET_OK); - return 0; } #if OSL_DEBUG_LEVEL < 2 @@ -1076,8 +1075,9 @@ IMPL_LINK( SwColumnPage, EdModify, MetricField *, pMetricField ) // Handler behind the Checkbox for automatic width. When the box is checked // no expicit values for the column width can be entered. -IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwColumnPage, AutoWidthHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); long nDist = static_cast< long >(aDistEd1.DenormalizePercent(aDistEd1.GetValue(FUNIT_TWIP))); pColMgr->SetCount(nCols, (sal_uInt16)nDist); for(sal_uInt16 i = 0; i < nCols; i++) @@ -1090,11 +1090,10 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox ) pColMgr->SetAutoWidth(pBox->IsChecked(), sal_uInt16(nDist)); UpdateCols(); Update(NULL); - return 0; } // scroll up the contents of the edits -IMPL_LINK_NOARG(SwColumnPage, Up) +IMPL_LINK_NOARG_TYPED(SwColumnPage, Up, Button*, void) { if( nFirstVis ) { @@ -1102,11 +1101,10 @@ IMPL_LINK_NOARG(SwColumnPage, Up) SetLabels( nFirstVis ); Update(NULL); } - return 0; } // scroll down the contents of the edits. -IMPL_LINK_NOARG(SwColumnPage, Down) +IMPL_LINK_NOARG_TYPED(SwColumnPage, Down, Button*, void) { if( nFirstVis + nVisCols < nCols ) { @@ -1114,7 +1112,6 @@ IMPL_LINK_NOARG(SwColumnPage, Down) SetLabels( nFirstVis ); Update(NULL); } - return 0; } // relict from ancient times - now directly without time handler; triggered by diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 76eba6969af3..d68c0b6c9d1d 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -280,7 +280,7 @@ void SwCaptionDialog::Apply() our_aSepTextSave = m_pSepEdit->GetText(); } -IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwCaptionDialog, OptionHdl, Button*, pButton, void ) { OUString sFieldTypeName = m_pCategoryBox->GetText(); if(sFieldTypeName == m_sNone) @@ -300,7 +300,6 @@ IMPL_LINK( SwCaptionDialog, OptionHdl, Button*, pButton ) ApplyCaptionOrder(); } DrawSample(); - return 0; } IMPL_LINK_NOARG(SwCaptionDialog, SelectHdl) @@ -334,13 +333,11 @@ IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl) return 0; } -IMPL_LINK_NOARG(SwCaptionDialog, CaptionHdl) +IMPL_LINK_NOARG_TYPED(SwCaptionDialog, CaptionHdl, Button*, void) { SfxItemSet aSet( rView.GetDocShell()->GetDoc()->GetAttrPool() ); ScopedVclPtrInstance< SwCaptionOptDlg > aDlg( this, aSet ); aDlg->Execute(); - - return 0; } void SwCaptionDialog::DrawSample() diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index a6ac4ab1aebf..582537cd6638 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -682,7 +682,7 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) m_aHeightED.SetLoseFocusHdl( aLk ); m_pAtHorzPosED->SetLoseFocusHdl( aLk ); m_pAtVertPosED->SetLoseFocusHdl( aLk ); - m_pFollowTextFlowCB->SetClickHdl( aLk ); + m_pFollowTextFlowCB->SetClickHdl( LINK(this, SwFrmPage, RangeModifyClickHdl) ); aLk = LINK(this, SwFrmPage, ModifyHdl); m_aWidthED.SetModifyHdl( aLk ); @@ -690,12 +690,12 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pAtHorzPosED->SetModifyHdl( aLk ); m_pAtVertPosED->SetModifyHdl( aLk ); - aLk = LINK(this, SwFrmPage, AnchorTypeHdl); - m_pAnchorAtPageRB->SetClickHdl( aLk ); - m_pAnchorAtParaRB->SetClickHdl( aLk ); - m_pAnchorAtCharRB->SetClickHdl( aLk ); - m_pAnchorAsCharRB->SetClickHdl( aLk ); - m_pAnchorAtFrameRB->SetClickHdl( aLk ); + Link<Button*,void> aLk2 = LINK(this, SwFrmPage, AnchorTypeHdl); + m_pAnchorAtPageRB->SetClickHdl( aLk2 ); + m_pAnchorAtParaRB->SetClickHdl( aLk2 ); + m_pAnchorAtCharRB->SetClickHdl( aLk2 ); + m_pAnchorAsCharRB->SetClickHdl( aLk2 ); + m_pAnchorAtFrameRB->SetClickHdl( aLk2 ); m_pHorizontalDLB->SetSelectHdl(LINK(this, SwFrmPage, PosHdl)); m_pVerticalDLB-> SetSelectHdl(LINK(this, SwFrmPage, PosHdl)); @@ -705,9 +705,9 @@ SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pMirrorPagesCB->SetClickHdl(LINK(this, SwFrmPage, MirrorHdl)); - aLk = LINK(this, SwFrmPage, RelSizeClickHdl); - m_pRelWidthCB->SetClickHdl( aLk ); - m_pRelHeightCB->SetClickHdl( aLk ); + aLk2 = LINK(this, SwFrmPage, RelSizeClickHdl); + m_pRelWidthCB->SetClickHdl( aLk2 ); + m_pRelHeightCB->SetClickHdl( aLk2 ); m_pAutoWidthCB->SetClickHdl( LINK( this, SwFrmPage, AutoWidthClickHdl ) ); m_pAutoHeightCB->SetClickHdl( LINK( this, SwFrmPage, AutoHeightClickHdl ) ); @@ -1761,16 +1761,15 @@ SfxTabPage::sfxpg SwFrmPage::DeactivatePage(SfxItemSet * _pSet) } // swap left/right with inside/outside -IMPL_LINK_NOARG(SwFrmPage, MirrorHdl) +IMPL_LINK_NOARG_TYPED(SwFrmPage, MirrorHdl, Button*, void) { RndStdIds eId = GetAnchor(); InitPos( eId, -1, 0, -1, 0, LONG_MAX, LONG_MAX); - - return 0; } -IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) +IMPL_LINK_TYPED( SwFrmPage, RelSizeClickHdl, Button *, p, void ) { + CheckBox* pBtn = static_cast<CheckBox*>(p); if (pBtn == m_pRelWidthCB) { m_aWidthED.ShowPercent(pBtn->IsChecked()); @@ -1792,11 +1791,13 @@ IMPL_LINK( SwFrmPage, RelSizeClickHdl, CheckBox *, pBtn ) ModifyHdl(m_aWidthED.get()); else // pBtn == m_pRelHeightCB ModifyHdl(m_aHeightED.get()); - - return 0; } // range check +IMPL_LINK_NOARG_TYPED(SwFrmPage, RangeModifyClickHdl, Button*, void) +{ + RangeModifyHdl(NULL); +} IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl) { if (bNoModifyHdl) @@ -1918,7 +1919,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl) return 0; } -IMPL_LINK_NOARG(SwFrmPage, AnchorTypeHdl) +IMPL_LINK_NOARG_TYPED(SwFrmPage, AnchorTypeHdl, Button*, void) { m_pMirrorPagesCB->Enable(!m_pAnchorAsCharRB->IsChecked()); @@ -1943,8 +1944,6 @@ IMPL_LINK_NOARG(SwFrmPage, AnchorTypeHdl) EnableVerticalPositioning( !(m_bIsMathOLE && m_bIsMathBaselineAlignment && FLY_AS_CHAR == eId) ); - - return 0; } IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) @@ -2082,27 +2081,24 @@ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) return 0; } -IMPL_LINK_NOARG(SwFrmPage, RealSizeHdl) +IMPL_LINK_NOARG_TYPED(SwFrmPage, RealSizeHdl, Button*, void) { m_aWidthED.SetUserValue( m_aWidthED. NormalizePercent(aGrfSize.Width() ), FUNIT_TWIP); m_aHeightED.SetUserValue(m_aHeightED.NormalizePercent(aGrfSize.Height()), FUNIT_TWIP); fWidthHeightRatio = aGrfSize.Height() ? double(aGrfSize.Width()) / double(aGrfSize.Height()) : 1.0; UpdateExample(); - return 0; } -IMPL_LINK_NOARG(SwFrmPage, AutoWidthClickHdl) +IMPL_LINK_NOARG_TYPED(SwFrmPage, AutoWidthClickHdl, Button*, void) { if( !IsInGraficMode() ) HandleAutoCB( m_pAutoWidthCB->IsChecked(), *m_pWidthFT, *m_pWidthAutoFT, *m_aWidthED.get() ); - return 0; } -IMPL_LINK_NOARG(SwFrmPage, AutoHeightClickHdl) +IMPL_LINK_NOARG_TYPED(SwFrmPage, AutoHeightClickHdl, Button*, void) { if( !IsInGraficMode() ) HandleAutoCB( m_pAutoHeightCB->IsChecked(), *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() ); - return 0; } IMPL_LINK( SwFrmPage, ModifyHdl, Edit *, pEdit ) @@ -2576,7 +2572,7 @@ SfxTabPage::sfxpg SwGrfExtPage::DeactivatePage(SfxItemSet *_pSet) return LEAVE_PAGE; } -IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) +IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void) { if(!pGrfDlg) { @@ -2619,10 +2615,9 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) m_pLeftPagesRB->Enable(bEnable); m_pRightPagesRB->Enable(bEnable); } - return 0; } -IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl) +IMPL_LINK_NOARG_TYPED(SwGrfExtPage, MirrorHdl, Button*, void) { bool bEnable = m_pMirrorHorzBox->IsChecked(); @@ -2635,8 +2630,6 @@ IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl) if (!m_pAllPagesRB->IsChecked() && !m_pLeftPagesRB->IsChecked() && !m_pRightPagesRB->IsChecked()) m_pAllPagesRB->Check(); - - return 0; } // example window @@ -2851,7 +2844,7 @@ VclPtr<SfxTabPage> SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet * return VclPtr<SwFrmURLPage>::Create( pParent, *rSet ); } -IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) +IMPL_LINK_NOARG_TYPED(SwFrmURLPage, InsertFileHdl, Button*, void) { FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); uno::Reference < ui::dialogs::XFilePicker > xFP = aDlgHelper.GetFilePicker(); @@ -2870,8 +2863,6 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) { pURLED->SetText( xFP->getFiles().getConstArray()[0] ); } - - return 0; } SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index c7574f6cef03..d5f83eecfa9a 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -120,13 +120,13 @@ SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pBottomMarginED->SetLastHdl(aLk); m_pBottomMarginED->SetLoseFocusHdl(aLk); - aLk = LINK(this, SwWrapTabPage, WrapTypeHdl); - m_pNoWrapRB->SetClickHdl(aLk); - m_pWrapLeftRB->SetClickHdl(aLk); - m_pWrapRightRB->SetClickHdl(aLk); - m_pWrapParallelRB->SetClickHdl(aLk); - m_pWrapThroughRB->SetClickHdl(aLk); - m_pIdealWrapRB->SetClickHdl(aLk); + Link<Button*,void> aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl); + m_pNoWrapRB->SetClickHdl(aLk2); + m_pWrapLeftRB->SetClickHdl(aLk2); + m_pWrapRightRB->SetClickHdl(aLk2); + m_pWrapParallelRB->SetClickHdl(aLk2); + m_pWrapThroughRB->SetClickHdl(aLk2); + m_pIdealWrapRB->SetClickHdl(aLk2); ApplyImageList(); m_pWrapOutlineCB->SetClickHdl(LINK(this, SwWrapTabPage, ContourHdl)); } @@ -612,7 +612,7 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit ) return 0; } -IMPL_LINK( SwWrapTabPage, WrapTypeHdl, RadioButton *, pBtn ) +IMPL_LINK_TYPED( SwWrapTabPage, WrapTypeHdl, Button *, pBtn, void ) { bool bWrapThrough = (pBtn == m_pWrapThroughRB); m_pWrapTransparentCB->Enable( bWrapThrough && !m_bHtmlMode ); @@ -624,10 +624,9 @@ IMPL_LINK( SwWrapTabPage, WrapTypeHdl, RadioButton *, pBtn ) (pBtn != m_pNoWrapRB) ); ContourHdl(0); - return 0; } -IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl) +IMPL_LINK_NOARG_TYPED(SwWrapTabPage, ContourHdl, Button*, void) { bool bEnable = !(m_pWrapOutlineCB->IsChecked() && m_pWrapOutlineCB->IsEnabled()); @@ -639,8 +638,6 @@ IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl) m_bContourImage = !bEnable; ApplyImageList(); } - - return 0; } void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 76bbb9d8562f..e27d2d9a1b09 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -196,7 +196,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog bool bCreateMode; - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); public: SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, bool bCreate); @@ -473,7 +473,7 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase( return pDesc; } -IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl ) +IMPL_LINK_NOARG_TYPED( SwMultiTOXTabDialog, ShowPreviewHdl, Button*, void ) { if(m_pShowExampleCB->IsChecked()) { @@ -514,8 +514,6 @@ IMPL_LINK_NOARG( SwMultiTOXTabDialog, ShowPreviewHdl ) SetViewWindow( bSetViewWindow ? m_pExampleContainerWIN.get() : 0 ); setOptimalLayoutSize(); - - return 0; } bool SwMultiTOXTabDialog::IsNoNum(SwWrtShell& rSh, const OUString& rName) @@ -636,8 +634,8 @@ class SwAddStylesDlg_Impl : public SfxModalDialog OUString* pStyleArr; - DECL_LINK(OkHdl, void *); - DECL_LINK(LeftRightHdl, PushButton*); + DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK_TYPED(LeftRightHdl, Button*, void); DECL_LINK(HeaderDragHdl, void *); public: @@ -730,7 +728,7 @@ void SwAddStylesDlg_Impl::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl) +IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, OkHdl, Button*, void) { for(sal_uInt16 i = 0; i < MAXLEVEL; i++) pStyleArr[i].clear(); @@ -750,7 +748,6 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl) //TODO write back style names EndDialog(RET_OK); - return 0; } IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl) @@ -759,7 +756,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl) return 0; } -IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) +IMPL_LINK_TYPED(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) { bool bLeft = pBtn == m_pLeftPB; SvTreeListEntry* pEntry = m_pHeaderTree->FirstSelected(); @@ -783,7 +780,6 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) pEntry->SetUserData(reinterpret_cast<void*>(nLevel)); m_pHeaderTree->Invalidate(); } - return 0; } SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) @@ -874,7 +870,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& r pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl)); pMenu->SetSelectHdl(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl)); - Link<> aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); + Link<Button*,void> aLk = LINK(this, SwTOXSelectTabPage, CheckBoxHdl); m_pAddStylesCB->SetClickHdl(aLk); m_pFromHeadingsCB->SetClickHdl(aLk); m_pTOXMarksCB->SetClickHdl(aLk); @@ -1395,8 +1391,9 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl) return 0; } -IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED(SwTOXSelectTabPage, CheckBoxHdl, Button*, pButton, void ) { + CheckBox* pBox = static_cast<CheckBox*>(pButton); SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog()); const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); if(TOX_CONTENT == aCurType.eType) @@ -1421,10 +1418,9 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) m_pCaseSensitiveCB->Enable(m_pCollectSameCB->IsChecked()); } ModifyHdl(0); - return 0; }; -IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl) +IMPL_LINK_NOARG_TYPED(SwTOXSelectTabPage, RadioButtonHdl, Button*, void) { bool bEnable = m_pFromCaptionsRB->IsChecked(); m_pCaptionSequenceFT->Enable(bEnable); @@ -1432,7 +1428,6 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl) m_pDisplayTypeFT->Enable(bEnable); m_pDisplayTypeLB->Enable(bEnable); ModifyHdl(0); - return 0; } IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) @@ -1475,7 +1470,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox) return 0; }; -IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton) +IMPL_LINK_TYPED(SwTOXSelectTabPage, AddStylesHdl, Button*, pButton, void) { ScopedVclPtrInstance<SwAddStylesDlg_Impl> pDlg( pButton, static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(), @@ -1483,7 +1478,6 @@ IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton) pDlg->Execute(); pDlg.disposeAndClear(); ModifyHdl(0); - return 0; } IMPL_LINK_TYPED(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu, bool) @@ -1910,9 +1904,9 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAt m_pSortContentRB->SetClickHdl(LINK(this, SwTOXEntryTabPage, SortKeyHdl)); m_pAllLevelsPB->SetClickHdl(LINK(this, SwTOXEntryTabPage, AllLevelsHdl)); - m_pAlphaDelimCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl)); - m_pCommaSeparatedCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl)); - m_pRelToStyleCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl)); + m_pAlphaDelimCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyClickHdl)); + m_pCommaSeparatedCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyClickHdl)); + m_pRelToStyleCB->SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyClickHdl)); FieldUnit aMetric = ::GetDfltMetric(false); SetMetric(*m_pTabPosMF, aMetric); @@ -2013,6 +2007,10 @@ void SwTOXEntryTabPage::dispose() // pVoid is used as signal to change all levels of the example +IMPL_LINK_TYPED(SwTOXEntryTabPage, ModifyClickHdl, Button*, pVoid, void) +{ + ModifyHdl(pVoid); +} IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid) { UpdateDescriptor(); @@ -2214,7 +2212,7 @@ VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const Sf return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) +IMPL_LINK_TYPED(SwTOXEntryTabPage, EditStyleHdl, Button*, pBtn, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos()) { @@ -2228,10 +2226,9 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) &aStyle, &aFamily, 0L); Application::SetDefDialogParent( pDefDlgParent ); } - return 0; } -IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) +IMPL_LINK_TYPED(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) { bool bInsert = pButton == m_pAuthInsertPB; if(bInsert) @@ -2257,7 +2254,6 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton) } } ModifyHdl(0); - return 0; } void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken) @@ -2294,7 +2290,7 @@ bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) // This function initializes the default value in the Token // put here the UI dependent initializations -IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn) +IMPL_LINK_TYPED(SwTOXEntryTabPage, InsertTokenHdl, Button*, pBtn, void) { OUString sText; FormTokenType eTokenType = TOKEN_ENTRY_NO; @@ -2346,10 +2342,9 @@ IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn) aInsert.nChapterFormat = nChapterFormat; // i89791 m_pTokenWIN->InsertAtSelection(sText, aInsert); ModifyHdl(0); - return 0; } -IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl) +IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, AllLevelsHdl, Button*, void) { //get current level //write it into all levels @@ -2361,7 +2356,6 @@ IMPL_LINK_NOARG(SwTOXEntryTabPage, AllLevelsHdl) ModifyHdl(this); } - return 0; } void SwTOXEntryTabPage::WriteBackLevel() @@ -2419,11 +2413,10 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) return 0; } -IMPL_LINK(SwTOXEntryTabPage, SortKeyHdl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void) { bool bEnable = m_pSortContentRB == pButton; m_pSortKeyFrame->Enable(bEnable); - return 0; } IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken) @@ -2642,7 +2635,7 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, ComboBox*, pBox) return 0; } -IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox) +IMPL_LINK_TYPED(SwTOXEntryTabPage, AutoRightHdl, Button*, pBox, void) { //the most right style::TabStop is usually right aligned Control* pCurCtrl = m_pTokenWIN->GetActiveControl(); @@ -2651,14 +2644,13 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox) "no style::TabStop selected!"); const SwFormToken& rToken = static_cast<SwTOXButton*>(pCurCtrl)->GetFormToken(); - bool bChecked = pBox->IsChecked(); + bool bChecked = static_cast<CheckBox*>(pBox)->IsChecked(); if(rToken.eTokenType == TOKEN_TAB_STOP) static_cast<SwTOXButton*>(pCurCtrl)->SetTabAlign( bChecked ? SVX_TAB_ADJUST_END : SVX_TAB_ADJUST_LEFT); m_pTabPosFT->Enable(!bChecked); m_pTabPosMF->Enable(!bChecked); ModifyHdl(0); - return 0; } void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) @@ -2730,7 +2722,7 @@ SwTokenWindow::SwTokenWindow(vcl::Window* pParent) sAdditionalAccnameString2 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING2); sAdditionalAccnameString3 = SW_RESSTR(STR_ADDITIONAL_ACCNAME_STRING3); - Link<> aLink(LINK(this, SwTokenWindow, ScrollHdl)); + Link<Button*,void> aLink(LINK(this, SwTokenWindow, ScrollHdl)); m_pLeftScrollWin->SetClickHdl(aLink); m_pRightScrollWin->SetClickHdl(aLink); } @@ -3287,10 +3279,10 @@ void SwTokenWindow::AdjustScrolling() } } -IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) +IMPL_LINK_TYPED(SwTokenWindow, ScrollHdl, Button*, pBtn, void ) { if(aControlList.empty()) - return 0; + return; const long nSpace = m_pCtrlParentWin->GetSizePixel().Width(); #if OSL_DEBUG_LEVEL > 1 @@ -3382,8 +3374,6 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) pCtrl = *(aControlList.rbegin()); m_pRightScrollWin->Enable((pCtrl->GetPosPixel().X() + pCtrl->GetSizePixel().Width()) > nSpace); } - - return 0; } OUString SwTokenWindow::GetPattern() const @@ -3752,7 +3742,7 @@ VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent, return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet); } -IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn, void ) { if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos()) { @@ -3766,11 +3756,10 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) &aStyle, &aFamily, 0L); Application::SetDefDialogParent( pDefDlgParent ); } - return 0; } // allocate templates -IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl) +IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, AssignHdl, Button*, void) { sal_Int32 nLevPos = m_pLevelLB->GetSelectEntryPos(); sal_Int32 nTemplPos = m_pParaLayLB->GetSelectEntryPos(); @@ -3789,10 +3778,9 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl) m_pLevelLB->SelectEntry(aStr); Modify(); } - return 0; } -IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl) +IMPL_LINK_NOARG_TYPED(SwTOXStylesTabPage, StdHdl, Button*, void) { const sal_Int32 nPos = m_pLevelLB->GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) @@ -3804,7 +3792,6 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl) m_pCurrentForm->SetTemplate(nPos, aEmptyOUStr); Modify(); } - return 0; } IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl) @@ -4219,7 +4206,7 @@ void SwAutoMarkDlg_Impl::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl) +IMPL_LINK_NOARG_TYPED(SwAutoMarkDlg_Impl, OkHdl, Button*, void) { bool bError = false; if(m_pEntriesBB->IsModified() || bCreateMode) @@ -4239,7 +4226,6 @@ IMPL_LINK_NOARG(SwAutoMarkDlg_Impl, OkHdl) } if( !bError ) EndDialog(RET_OK); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index ab1283f2959b..85584e0ff2f8 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -582,7 +582,7 @@ IMPL_LINK( SwNewUserIdxDlg, ModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NewUserIdxHdl, Button*, void) { ScopedVclPtrInstance< SwNewUserIdxDlg > pDlg(this); if(RET_OK == pDlg->Execute()) @@ -591,27 +591,24 @@ IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl) m_pTypeDCB->InsertEntry(sNewName); m_pTypeDCB->SelectEntry(sNewName); } - return 0; } -IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, CheckBox*, pBox) +IMPL_LINK_TYPED( SwIndexMarkPane, SearchTypeHdl, Button*, pBox, void) { - bool bEnable = pBox->IsChecked() && pBox->IsEnabled(); + bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked() && pBox->IsEnabled(); m_pSearchCaseWordOnlyCB->Enable(bEnable); m_pSearchCaseSensitiveCB->Enable(bEnable); - return 0; } -IMPL_LINK( SwIndexMarkPane, InsertHdl, Button *, pButton ) +IMPL_LINK_TYPED( SwIndexMarkPane, InsertHdl, Button *, pButton, void ) { Apply(); //close the dialog if only one entry is available if(!bNewMark && !m_pPrevBT->IsVisible() && !m_pNextBT->IsVisible()) CloseHdl(pButton); - return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, CloseHdl, Button*, void) { if(bNewMark) { @@ -623,7 +620,6 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl) { m_rDialog.EndDialog(); } - return 0; } // select index type only when inserting @@ -702,40 +698,35 @@ IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox ) return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, NextHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextHdl, Button*, void) { InsertUpdate(); pTOXMgr->NextTOXMark(); UpdateDialog(); - return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, NextSameHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, NextSameHdl, Button*, void) { InsertUpdate(); pTOXMgr->NextTOXMark(true); UpdateDialog(); - return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, PrevHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, PrevHdl, Button*, void) { InsertUpdate(); pTOXMgr->PrevTOXMark(); UpdateDialog(); - return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, PrevSameHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, PrevSameHdl, Button*, void) { InsertUpdate(); pTOXMgr->PrevTOXMark(true); UpdateDialog(); - - return 0; } -IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl) +IMPL_LINK_NOARG_TYPED(SwIndexMarkPane, DelHdl, Button*, void) { bDel = true; InsertUpdate(); @@ -748,7 +739,6 @@ IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl) CloseHdl(m_pCloseBT); SfxViewFrame::Current()->GetBindings().Invalidate(FN_EDIT_IDX_ENTRY_DLG); } - return 0; } // renew dialog view @@ -1110,7 +1100,7 @@ void SwAuthorMarkPane::ReInitDlg(SwWrtShell& rWrtShell) InitControls(); } -IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl) +IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, CloseHdl, Button*, void) { if(bNewEntry) { @@ -1122,7 +1112,6 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, CloseHdl) { m_rDialog.EndDialog(); } - return 0; } static OUString lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int32 nLen, const OUString& rColumnTitle) @@ -1184,7 +1173,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox) return 0; } -IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) +IMPL_LINK_NOARG_TYPED(SwAuthorMarkPane, InsertHdl, Button*, void) { //insert or update the SwAuthorityField... if(pSh) @@ -1206,7 +1195,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) { ScopedVclPtrInstance< MessageDialog > aQuery(&m_rDialog, SW_RES(STR_QUERY_CHANGE_AUTH_ENTRY), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if(RET_YES != aQuery->Execute()) - return 0; + return; } } @@ -1235,10 +1224,9 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) } if(!bNewEntry) CloseHdl(0); - return 0; } -IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton) +IMPL_LINK_TYPED(SwAuthorMarkPane, CreateEntryHdl, Button*, pButton, void) { bool bCreate = pButton == m_pCreateEntryPB; OUString sOldId = m_sCreatedEntry[0]; @@ -1280,10 +1268,9 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton) m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]); m_pActionBT->Enable(); } - return 0; } -IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwAuthorMarkPane, ChangeSourceHdl, Button*, pButton, void) { bool bFromComp = (pButton == m_pFromComponentRB); bIsFromComponent = bFromComp; @@ -1342,7 +1329,6 @@ IMPL_LINK(SwAuthorMarkPane, ChangeSourceHdl, RadioButton*, pButton) } m_pEntryLB->SelectEntryPos(0); CompEntryHdl(m_pEntryLB); - return 0; } IMPL_LINK(SwAuthorMarkPane, EditModifyHdl, Edit*, pEdit) diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index fb980579f171..353f2e9a1357 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -65,7 +65,7 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox ) } // callback to delete a text mark -IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) +IMPL_LINK_NOARG_TYPED(SwInsertBookmarkDlg, DeleteHdl, Button*, void) { // remove text marks from the ComboBox @@ -76,7 +76,6 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl) m_pDeleteBtn->Enable(false); // no further entries there m_pOkBtn->Enable(); // the OK handler deletes - return 0; } // callback for OKButton. Inserts a new text mark to the current position. diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 797ba4e6d35b..56d0beeb8d41 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -56,7 +56,7 @@ void SwFootNoteOptionDlg::PageCreated( sal_uInt16 /*nId*/, SfxTabPage &rPage ) static_cast<SwEndNoteOptionPage&>(rPage).SetShell( rSh ); } -IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwFootNoteOptionDlg, OkHdl, Button *, pBtn, void ) { SfxItemSet aDummySet(rSh.GetAttrPool(), 1, 1 ); SfxTabPage *pPage = GetTabPage( m_nFootNoteId ); @@ -66,7 +66,6 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) if ( pPage ) pPage->FillItemSet( &aDummySet ); aOldOkHdl.Call( pBtn ); - return 0; } SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN, @@ -297,7 +296,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell ) // Handler behind the button to collect the footnote at the page. In this case // all kinds of numbering can be used. -IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) +IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosPageHdl, Button*, void) { const SwFootnoteNum eNum = (const SwFootnoteNum)GetNumbering(); bPosDoc = false; @@ -309,8 +308,6 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl) } m_pPageTemplLbl->Enable(false); m_pPageTemplBox->Enable(false); - - return 0; } IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl) @@ -328,7 +325,7 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl) // Handler behind the button to collect the footnote at the chapter or end of // the document. In this case no pagewise numbering can be used. -IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl) +IMPL_LINK_NOARG_TYPED(SwEndNoteOptionPage, PosChapterHdl, Button*, void) { if ( !bPosDoc ) SelectNumbering(FTNNUM_DOC); @@ -338,7 +335,6 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosChapterHdl) m_pNumCountBox->RemoveEntry(aNumChapter); m_pPageTemplLbl->Enable(); m_pPageTemplBox->Enable(); - return 0; } static SwCharFormat* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFormatName ) diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 7444167bf911..c3f031e9861e 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -208,7 +208,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, ) return 0; } -IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) +IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) { OUString sGroup = m_pNameED->GetText() + OUStringLiteral1<GLOS_DELIM>() @@ -225,17 +225,15 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) m_pGroupTLB->Select(pEntry); m_pGroupTLB->MakeVisible(pEntry); m_pGroupTLB->GetModel()->Resort(); - - return 0; } -IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton, void ) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); if(!pEntry) { pButton->Enable(false); - return 0; + return; } GlosBibUserData* pUserData = static_cast<GlosBibUserData*>(pEntry->GetUserData()); OUString const sEntry(pUserData->sGroupName); @@ -276,10 +274,9 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) pButton->Enable(false); //the content must be deleted - otherwise the new handler would be called in Apply() m_pNameED->SetText(aEmptyOUStr); - return 0; } -IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) +IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, RenameHdl, Button*, void) { SvTreeListEntry* pEntry = m_pGroupTLB->FirstSelected(); GlosBibUserData* pUserData = static_cast<GlosBibUserData*>(pEntry->GetUserData()); @@ -322,7 +319,6 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) m_pGroupTLB->Select(pEntry); m_pGroupTLB->MakeVisible(pEntry); m_pGroupTLB->GetModel()->Resort(); - return 0; } IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 175e05992183..1b4a79b30503 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -125,7 +125,7 @@ class SwNewGlosNameDlg : public ModalDialog protected: DECL_LINK( Modify, Edit * ); - DECL_LINK(Rename, void *); + DECL_LINK_TYPED(Rename, Button*, void); public: SwNewGlosNameDlg( vcl::Window* pParent, @@ -614,7 +614,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) } // dialog manage regions -IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) +IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, BibHdl, Button*, void) { SwGlossaries* pGloss = ::GetGlossaries(); if( pGloss->IsGlosPathErr() ) @@ -687,7 +687,6 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) PathHdl(m_pPathBtn); } } - return 0; } // initialisation; from Ctor and after editing regions @@ -810,7 +809,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox ) return 0; } -IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename) +IMPL_LINK_NOARG_TYPED(SwNewGlosNameDlg, Rename, Button*, void) { SwGlossaryDlg* pDlg = static_cast<SwGlossaryDlg*>(GetParent()); OUString sNew = GetAppCharClass().uppercase(m_pNewShort->GetText()); @@ -822,13 +821,12 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename) } else EndDialog(RET_OK); - return 0; } -IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwGlossaryDlg, CheckBoxHdl, Button *, pBox, void ) { SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); - bool bCheck = pBox->IsChecked(); + bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); if (pBox == m_pInsertTipCB) rCfg.SetAutoTextTip(bCheck); else if(pBox == m_pFileRelCB) @@ -836,7 +834,6 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) else rCfg.SetSaveRelNet(bCheck); rCfg.Commit(); - return 0; } // TreeListBox for groups and blocks @@ -1034,7 +1031,7 @@ OUString SwGlossaryDlg::GetCurrGrpName() const return OUString(); } -IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwGlossaryDlg, PathHdl, Button *, pBtn, void ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -1055,13 +1052,11 @@ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn ) } } } - return 0; } -IMPL_LINK_NOARG(SwGlossaryDlg, InsertHdl) +IMPL_LINK_NOARG_TYPED(SwGlossaryDlg, InsertHdl, Button*, void) { EndDialog(RET_OK); - return 0; } void SwGlossaryDlg::ShowPreview() diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index c7390af9449d..53dd61b593cb 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -62,8 +62,8 @@ class SwEndNoteOptionPage : public SfxTabPage inline void SelectNumbering(int eNum); int GetNumbering() const; - DECL_LINK(PosPageHdl, void *); - DECL_LINK(PosChapterHdl, void *); + DECL_LINK_TYPED(PosPageHdl, Button*, void); + DECL_LINK_TYPED(PosChapterHdl, Button*, void); DECL_LINK(NumCountHdl, void *); public: diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index cbed5a87f647..86ccba7b3b26 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -82,11 +82,10 @@ void SwInsFootNoteDlg::Apply() bFootnote = m_pFootnoteBtn->IsChecked(); } -IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberCharHdl) +IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberCharHdl, Button*, void) { m_pNumberCharEdit->GrabFocus(); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() || bExtCharAvailable ); - return 0; } IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl) @@ -97,13 +96,12 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl) return 0; } -IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberAutoBtnHdl) +IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberAutoBtnHdl, Button*, void) { m_pOkBtn->Enable( true ); - return 0; } -IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) +IMPL_LINK_NOARG_TYPED(SwInsFootNoteDlg, NumberExtCharHdl, Button*, void) { m_pNumberCharBtn->Check(); @@ -140,11 +138,9 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) m_pOkBtn->Enable(!m_pNumberCharEdit->GetText().isEmpty()); } } - - return 0; } -IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn, void ) { Apply(); @@ -156,8 +152,6 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn ) rSh.GotoPrevFootnoteAnchor(); Init(); - - return 0; } SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, bool bEd) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 47a7b7c182e9..1eb0e1413f94 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -193,7 +193,7 @@ void SwLineNumberingDlg::dispose() } -IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, OKHdl, Button*, void) { SwLineNumberInfo aInf(pSh->GetLineNumberInfo()); @@ -252,8 +252,6 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl) m_pNumberingOnFooterHeader->SetState(TRISTATE_FALSE); EndDialog( RET_OK ); - - return 0; } // modify @@ -269,12 +267,11 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl) } // On/Off -IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl) +IMPL_LINK_NOARG_TYPED(SwLineNumberingDlg, LineOnOffHdl, Button*, void) { bool bEnable = m_pNumberingOnCB->IsChecked(); m_pBodyContent->Enable(bEnable); ModifyHdl(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index c9eabce7157c..59f4935189d3 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -719,9 +719,9 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pField ) return 0; } -IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox ) +IMPL_LINK_TYPED( SwNumPositionTabPage, RelativeHdl, Button *, pBox, void ) { - bool bOn = pBox->IsChecked(); + bool bOn = static_cast<CheckBox*>(pBox)->IsChecked(); bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl; bool bSetValue = false; long nValue = 0; @@ -755,7 +755,6 @@ IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox ) m_pDistBorderMF->SetText(aEmptyOUStr); m_pDistBorderMF->Enable(bOn || bSingleSelection || pOutlineDlg); bLastRelative = bOn; - return 0; } IMPL_LINK_NOARG(SwNumPositionTabPage, LabelFollowedByHdl_Impl) @@ -893,7 +892,7 @@ IMPL_LINK( SwNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pField ) return 0; } -IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl) +IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, StandardHdl, Button*, void) { sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < MAXLEVEL; i++) @@ -927,7 +926,6 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl) InitControls(); SetModified(); - return 0; } #ifdef DBG_UTIL @@ -1022,10 +1020,9 @@ short SwSvxNumBulletTabDialog::Ok() return nRet; } -IMPL_LINK_NOARG(SwSvxNumBulletTabDialog, RemoveNumberingHdl) +IMPL_LINK_NOARG_TYPED(SwSvxNumBulletTabDialog, RemoveNumberingHdl, Button*, void) { EndDialog(RET_USER); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 76d56893dc0b..6b71cdecde9a 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -159,6 +159,7 @@ static sal_uInt16 lcl_BitToLevel(sal_uInt16 nActLevel) } sal_uInt16 SwOutlineTabDialog::nNumLevel = 1; + SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &rSh) : SfxTabDialog(pParent, "OutlineNumberingDialog", @@ -229,15 +230,14 @@ void SwOutlineTabDialog::PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) } } -IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(SwOutlineTabDialog, CancelHdl, Button*, void) { if (!bModified) rWrtSh.ResetModified(); EndDialog(); - return 0; } -IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwOutlineTabDialog, FormHdl, Button *, pBtn, void ) { PopupMenu *pFormMenu = get_menu("form"); // fill PopupMenu @@ -257,7 +257,6 @@ IMPL_LINK( SwOutlineTabDialog, FormHdl, Button *, pBtn ) pFormMenu->SetSelectHdl(LINK(this, SwOutlineTabDialog, MenuSelectHdl)); pFormMenu->Execute(pBtn, Rectangle(Point(0,0), pBtn->GetSizePixel()), PopupMenuFlags::ExecuteDown); - return 0; } IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu ) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index cbe3a891b340..ff28147f2523 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -52,17 +52,15 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = { // handler to switch between the different possibilities how the footnote // region's height can be set. -IMPL_LINK_NOARG(SwFootNotePage, HeightPage) +IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightPage, Button*, void) { m_pMaxHeightEdit->Enable(false); - return 0; } -IMPL_LINK_NOARG(SwFootNotePage, HeightMetric) +IMPL_LINK_NOARG_TYPED(SwFootNotePage, HeightMetric, Button*, void) { m_pMaxHeightEdit->Enable(); m_pMaxHeightEdit->GrabFocus(); - return 0; } // handler limit values diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index ef7823c3b61d..cdcba665ccbe 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -95,15 +95,14 @@ SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : m_pCharWidthMF->SetDownHdl(aSizeLink); m_pCharWidthMF->SetLoseFocusHdl(aSizeLink); - Link<> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); + Link<Button*,void> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl); m_pNoGridRB->SetClickHdl(aGridTypeHdl); m_pLinesGridRB->SetClickHdl(aGridTypeHdl); m_pCharsGridRB->SetClickHdl(aGridTypeHdl); - Link<> aModifyLk = LINK(this, SwTextGridPage, GridModifyHdl); - m_pColorLB->SetSelectHdl(aModifyLk); - m_pPrintCB->SetClickHdl(aModifyLk); - m_pRubyBelowCB->SetClickHdl(aModifyLk); + m_pColorLB->SetSelectHdl(LINK(this, SwTextGridPage, GridModifyHdl)); + m_pPrintCB->SetClickHdl(LINK(this, SwTextGridPage, GridModifyClickHdl)); + m_pRubyBelowCB->SetClickHdl(LINK(this, SwTextGridPage, GridModifyClickHdl)); m_pDisplayCB->SetClickHdl(LINK(this, SwTextGridPage, DisplayGridHdl)); @@ -485,7 +484,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField) return 0; } -IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) +IMPL_LINK_TYPED(SwTextGridPage, GridTypeHdl, Button*, pButton, void) { bool bEnable = m_pNoGridRB.get() != pButton; m_pLayoutFL->Enable(bEnable); @@ -509,17 +508,19 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton) } GridModifyHdl(0); - return 0; } -IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl) +IMPL_LINK_NOARG_TYPED(SwTextGridPage, DisplayGridHdl, Button*, void) { bool bChecked = m_pDisplayCB->IsChecked(); m_pPrintCB->Enable(bChecked); m_pPrintCB->Check(bChecked); - return 0; } +IMPL_LINK_NOARG_TYPED(SwTextGridPage, GridModifyClickHdl, Button*, void) +{ + GridModifyHdl(0); +} IMPL_LINK_NOARG(SwTextGridPage, GridModifyHdl) { const SfxItemSet& rOldSet = GetItemSet(); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 535d1b69b473..d86b6bfc5e65 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -180,7 +180,7 @@ SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) } // initialise - Link<> aLk = LINK(this,SwSortDlg, CheckHdl); + Link<Button*,void> aLk = LINK(this,SwSortDlg, CheckHdl); m_pKeyCB1->SetClickHdl( aLk ); m_pKeyCB2->SetClickHdl( aLk ); m_pKeyCB3->SetClickHdl( aLk ); @@ -385,15 +385,14 @@ void SwSortDlg::Apply() ScopedVclPtrInstance<MessageDialog>::Create( this->GetParent(), SW_RES(STR_SRTERR), VCL_MESSAGE_INFO)->Execute(); } -IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton ) +IMPL_LINK_TYPED( SwSortDlg, DelimHdl, Button*, pButton, void ) { bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled(); m_pDelimEdt->Enable( bEnable ); m_pDelimPB->Enable( bEnable ); - return 0; } -IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) +IMPL_LINK_NOARG_TYPED(SwSortDlg, DelimCharHdl, Button*, void) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) @@ -409,10 +408,9 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl) m_pDelimEdt->SetText( OUString(sal_Unicode(pItem->GetValue())) ); } } - return 0; } -IMPL_LINK( SwSortDlg, CheckHdl, void *, pControl ) +IMPL_LINK_TYPED( SwSortDlg, CheckHdl, Button*, pControl, void ) { if( pControl == m_pRowRB.get()) { @@ -440,7 +438,6 @@ IMPL_LINK( SwSortDlg, CheckHdl, void *, pControl ) !m_pKeyCB2->IsChecked() && !m_pKeyCB3->IsChecked()) static_cast<CheckBox *>(pControl)->Check(); - return 0; } IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox ) diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 59980d53005a..fd432e1e4167 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -216,7 +216,7 @@ SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : m_pDocumentStartRB->Check(); m_pPageStartNF->Enable(false); m_pPageStartNF->SetValue(lcl_GetCurrentPage(mpSh)); - Link<> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl); + Link<Button*,void> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl); m_pDocumentStartRB->SetClickHdl(aStartPageHdl); m_pPageStartRB->SetClickHdl(aStartPageHdl); @@ -250,22 +250,19 @@ IMPL_LINK_NOARG(SwTitlePageDlg, DownHdl) return 0; } -IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl) +IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, RestartNumberingHdl, Button*, void) { m_pRestartNumberingNF->Enable(m_pRestartNumberingCB->IsChecked()); - return 0; } -IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl) +IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, SetPageNumberHdl, Button*, void) { m_pSetPageNumberNF->Enable(m_pSetPageNumberCB->IsChecked()); - return 0; } -IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl) +IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, StartPageHdl, Button*, void) { m_pPageStartNF->Enable(m_pPageStartRB->IsChecked()); - return 0; } SwTitlePageDlg::~SwTitlePageDlg() @@ -291,16 +288,14 @@ void SwTitlePageDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl) +IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, EditHdl, Button*, void) { SwView& rView = mpSh->GetView(); rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), "page", *mpSh); rView.InvalidateRulerPos(); - - return 0; } -IMPL_LINK_NOARG(SwTitlePageDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(SwTitlePageDlg, OKHdl, Button*, void) { lcl_PushCursor(mpSh); @@ -350,7 +345,6 @@ IMPL_LINK_NOARG(SwTitlePageDlg, OKHdl) if (!m_pUseExistingPagesRB->IsChecked()) mpSh->GotoPage(GetInsertPosition(), false); EndDialog( RET_OK ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 866c2f006e76..e8f166506de4 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -147,7 +147,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) } mpKeepColumn->SaveValue(); - Link<> aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); + Link<Button*,void> aLk( LINK(this, SwConvertTableDlg, BtnHdl) ); mpTabBtn->SetClickHdl( aLk ); mpSemiBtn->SetClickHdl( aLk ); mpParaBtn->SetClickHdl( aLk ); @@ -197,7 +197,7 @@ void SwConvertTableDlg::dispose() SfxModalDialog::dispose(); } -IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton ) +IMPL_LINK_TYPED( SwConvertTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -206,10 +206,9 @@ IMPL_LINK( SwConvertTableDlg, AutoFormatHdl, PushButton*, pButton ) OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); - return 0; } -IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) +IMPL_LINK_TYPED( SwConvertTableDlg, BtnHdl, Button*, pButton, void ) { if( pButton == mpTabBtn ) mpKeepColumn->SetState( mpKeepColumn->GetSavedValue() ); @@ -221,22 +220,18 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) } mpKeepColumn->Enable( mpTabBtn->IsChecked() ); mpOtherEd->Enable( mpOtherBtn->IsChecked() ); - return 0; } -IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, CheckBoxHdl, Button*, void) { mpRepeatHeaderCB->Enable(mpHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); - - return 0; } -IMPL_LINK_NOARG(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwConvertTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { bool bEnable = mpHeaderCB->IsChecked() && mpRepeatHeaderCB->IsChecked(); mpRepeatRows->Enable(bEnable); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index e471c9cf5d59..ad62d2def1e7 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -129,10 +129,9 @@ SwInsTableDlg::SwInsTableDlg( SwView& rView ) m_pRepeatHeaderNF->SetMax( nMax ); } -IMPL_LINK_NOARG(SwInsTableDlg, OKHdl) +IMPL_LINK_NOARG_TYPED(SwInsTableDlg, OKHdl, Button*, void) { EndDialog(RET_OK); - return 0; } SwInsTableDlg::~SwInsTableDlg() @@ -200,7 +199,7 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, NumericField *, pField ) return 0; } -IMPL_LINK( SwInsTableDlg, AutoFormatHdl, PushButton*, pButton ) +IMPL_LINK_TYPED( SwInsTableDlg, AutoFormatHdl, Button*, pButton, void ) { SwAbstractDialogFactory* pFact = swui::GetFactory(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); @@ -209,22 +208,17 @@ IMPL_LINK( SwInsTableDlg, AutoFormatHdl, PushButton*, pButton ) OSL_ENSURE(pDlg, "Dialog creation failed!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFormatOfIndex( pTAutoFormat ); - return 0; } -IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwInsTableDlg, CheckBoxHdl, Button*, void) { m_pRepeatHeaderCB->Enable(m_pHeaderCB->IsChecked()); ReapeatHeaderCheckBoxHdl(); - - return 0; } -IMPL_LINK_NOARG(SwInsTableDlg, ReapeatHeaderCheckBoxHdl) +IMPL_LINK_NOARG_TYPED(SwInsTableDlg, ReapeatHeaderCheckBoxHdl, Button*, void) { m_pRepeatGroup->Enable(m_pHeaderCB->IsChecked() && m_pRepeatHeaderCB->IsChecked()); - - return 0; } IMPL_LINK_NOARG(SwInsTableDlg, ModifyRepeatHeaderNF_Hdl) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 1a490e2b2bf9..d16675521945 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -137,15 +137,15 @@ void SwFormatTablePage::Init() m_aRightMF.SetMetricFieldMin(-999999); //handler - Link<> aLk = LINK( this, SwFormatTablePage, AutoClickHdl ); - m_pFullBtn->SetClickHdl( aLk ); - m_pFreeBtn->SetClickHdl( aLk ); - m_pLeftBtn->SetClickHdl( aLk ); - m_pFromLeftBtn->SetClickHdl( aLk ); - m_pRightBtn->SetClickHdl( aLk ); - m_pCenterBtn->SetClickHdl( aLk ); - - aLk = LINK( this, SwFormatTablePage, UpDownLoseFocusHdl ); + Link<Button*,void> aLk2 = LINK( this, SwFormatTablePage, AutoClickHdl ); + m_pFullBtn->SetClickHdl( aLk2 ); + m_pFreeBtn->SetClickHdl( aLk2 ); + m_pLeftBtn->SetClickHdl( aLk2 ); + m_pFromLeftBtn->SetClickHdl( aLk2 ); + m_pRightBtn->SetClickHdl( aLk2 ); + m_pCenterBtn->SetClickHdl( aLk2 ); + + Link<> aLk = LINK( this, SwFormatTablePage, UpDownLoseFocusHdl ); m_pTopMF->SetUpHdl( aLk ); m_pBottomMF->SetUpHdl( aLk ); m_aRightMF.SetUpHdl( aLk ); @@ -167,8 +167,9 @@ void SwFormatTablePage::Init() m_pRelWidthCB->SetClickHdl(LINK( this, SwFormatTablePage, RelWidthClickHdl )); } -IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn ) +IMPL_LINK_TYPED( SwFormatTablePage, RelWidthClickHdl, Button*, p, void ) { + CheckBox* pBtn = static_cast<CheckBox*>(p); OSL_ENSURE(pTableData, "table data not available?"); bool bIsChecked = pBtn->IsChecked(); sal_Int64 nLeft = m_aLeftMF.DenormalizePercent(m_aLeftMF.GetValue(FUNIT_TWIP )); @@ -199,11 +200,9 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, CheckBox *, pBtn ) m_pRightFT->Enable(bEnable); } bModified = true; - - return 0; } -IMPL_LINK( SwFormatTablePage, AutoClickHdl, void *, pControl ) +IMPL_LINK_TYPED( SwFormatTablePage, AutoClickHdl, Button*, pControl, void ) { bool bRestore = true, bLeftEnable = false, @@ -265,7 +264,6 @@ IMPL_LINK( SwFormatTablePage, AutoClickHdl, void *, pControl ) } ModifyHdl(m_aWidthMF.get()); bModified = true; - return 0; } void SwFormatTablePage::RightModify() @@ -858,7 +856,7 @@ void SwTableColumnPage::Init(bool bWeb) } SetMetric(*m_pSpaceED, aMetric); - Link<> aLk = LINK( this, SwTableColumnPage, AutoClickHdl ); + Link<Button*,void> aLk = LINK( this, SwTableColumnPage, AutoClickHdl ); m_pUpBtn->SetClickHdl( aLk ); m_pDownBtn->SetClickHdl( aLk ); @@ -867,7 +865,7 @@ void SwTableColumnPage::Init(bool bWeb) m_pProportionalCB->SetClickHdl( aLk ); } -IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl ) +IMPL_LINK_TYPED( SwTableColumnPage, AutoClickHdl, Button*, pControl, void ) { //move display window if(pControl == m_pDownBtn.get()) @@ -902,7 +900,6 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, void *, pControl ) m_pDownBtn->Enable(aValueTable[0] > 0); m_pUpBtn->Enable(aValueTable[ MET_FIELDS -1 ] < nNoOfVisibleCols -1 ); UpdateCols(0); - return 0; } IMPL_LINK( SwTableColumnPage, UpHdl, MetricField*, pEdit ) @@ -929,16 +926,15 @@ IMPL_LINK( SwTableColumnPage, LoseFocusHdl, MetricField*, pEdit ) return 0; } -IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SwTableColumnPage, ModeHdl, Button*, pBox, void ) { - bool bCheck = pBox->IsChecked(); + bool bCheck = static_cast<CheckBox*>(pBox)->IsChecked(); if (pBox == m_pProportionalCB) { if(bCheck) m_pModifyTableCB->Check(); m_pModifyTableCB->Enable(!bCheck && bModifyTable); } - return 0; } bool SwTableColumnPage::FillItemSet( SfxItemSet* ) @@ -1692,7 +1688,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh) } } -IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwTextFlowPage, PageBreakHdl_Impl, Button*, void) { if( m_pPgBrkCB->IsChecked() ) { @@ -1727,10 +1723,9 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl) m_pPgBrkBeforeRB-> Enable(false); m_pPgBrkAfterRB-> Enable(false); } - return 0; } -IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwTextFlowPage, ApplyCollClickHdl_Impl, Button*, void) { bool bEnable = false; if ( m_pPageCollCB->IsChecked() && @@ -1749,10 +1744,9 @@ IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl) m_pPageNoFT->Enable(bEnable); m_pPageNoNF->Enable(bEnable); } - return 0; } -IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( SwTextFlowPage, PageBreakPosHdl_Impl, Button*, pBtn, void ) { if ( m_pPgBrkCB->IsChecked() ) { @@ -1779,10 +1773,9 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn ) m_pPageNoNF->Enable(false); } } - return 0; } -IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn ) +IMPL_LINK_TYPED( SwTextFlowPage, PageBreakTypeHdl_Impl, Button*, pBtn, void ) { if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() ) { @@ -1794,27 +1787,22 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn ) } else if ( m_pPgBrkBeforeRB->IsChecked() ) PageBreakPosHdl_Impl(m_pPgBrkBeforeRB); - return 0; } -IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox ) +IMPL_LINK_TYPED( SwTextFlowPage, SplitHdl_Impl, Button*, pBox, void ) { - m_pSplitRowCB->Enable(pBox->IsChecked()); - return 0; + m_pSplitRowCB->Enable(static_cast<CheckBox*>(pBox)->IsChecked()); } -IMPL_STATIC_LINK( - SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox ) +IMPL_STATIC_LINK_TYPED( + SwTextFlowPage, SplitRowHdl_Impl, Button*, pBox, void ) { - pBox->EnableTriState(false); - return 0; + static_cast<TriStateBox*>(pBox)->EnableTriState(false); } -IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl) +IMPL_LINK_NOARG_TYPED(SwTextFlowPage, HeadLineCBClickHdl, Button*, void) { m_pRepeatHeaderCombo->Enable(m_pHeadLineCB->IsChecked()); - - return 0; } void SwTextFlowPage::DisablePageBreak() diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 87123fde207a..4d9c25b3c572 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -207,7 +207,7 @@ void SwAutoFormatDlg::dispose() void SwAutoFormatDlg::Init( const SwTableAutoFormat* pSelFormat ) { - Link<> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) ); + Link<Button*,void> aLk( LINK( this, SwAutoFormatDlg, CheckHdl ) ); m_pBtnBorder->SetClickHdl( aLk ); m_pBtnFont->SetClickHdl( aLk ); m_pBtnPattern->SetClickHdl( aLk ); @@ -277,7 +277,7 @@ void SwAutoFormatDlg::FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const // Handler: -IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwAutoFormatDlg, CheckHdl, Button *, pBtn, void ) { SwTableAutoFormat* pData = &(*pTableTable)[nIndex]; bool bCheck = static_cast<CheckBox*>(pBtn)->IsChecked(), bDataChgd = true; @@ -305,10 +305,9 @@ IMPL_LINK( SwAutoFormatDlg, CheckHdl, Button *, pBtn ) m_pWndPreview->NotifyChange( *pData ); } - return 0; } -IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) +IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, AddHdl, Button*, void) { bool bOk = false, bFormatInserted = false; while( !bOk ) @@ -363,10 +362,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, AddHdl) else bOk = true; } - return 0; } -IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl) +IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RemoveHdl, Button*, void) { OUString aMessage = aStrDelMsg; aMessage += "\n\n"; @@ -399,11 +397,9 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl) pBox.reset(); SelFormatHdl( 0 ); - - return 0; } -IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl) +IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, RenameHdl, Button*, void) { bool bOk = false; while( !bOk ) @@ -463,7 +459,6 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl) else bOk = true; } - return 0; } IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl) @@ -500,12 +495,11 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl) return 0; } -IMPL_LINK_NOARG(SwAutoFormatDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(SwAutoFormatDlg, OkHdl, Button*, void) { if( bSetAutoFormat ) pShell->SetTableAutoFormat( (*pTableTable)[ nIndex ] ); EndDialog( RET_OK ); - return sal_IntPtr(true); } AutoFormatPreview::AutoFormatPreview(vcl::Window* pParent, WinBits nStyle) : diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index f2ebdb3a6df5..4442f018552e 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -86,7 +86,7 @@ void SwRenameXNamedDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl) +IMPL_LINK_NOARG_TYPED(SwRenameXNamedDlg, OkHdl, Button*, void) { try { @@ -97,7 +97,6 @@ IMPL_LINK_NOARG(SwRenameXNamedDlg, OkHdl) OSL_FAIL("name wasn't changed"); } EndDialog(RET_OK); - return 0; } IMPL_LINK(SwRenameXNamedDlg, ModifyHdl, Edit*, pEdit) diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 912f27407f41..8f021cdc92c1 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1591,11 +1591,10 @@ void SwDBManager::MergeCancel() bCancel = true; } -IMPL_LINK( SwDBManager, PrtCancelHdl, Button *, pButton ) +IMPL_LINK_TYPED( SwDBManager, PrtCancelHdl, Button *, pButton, void ) { pButton->GetParent()->Hide(); MergeCancel(); - return 0; } // determine the column's Numberformat and transfer to the forwarded Formatter, diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index a23431460407..5c7de4e813c1 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -127,7 +127,7 @@ void CancelableDialog::dispose() Dialog::dispose(); } -void CancelableDialog::SetCancelHdl( const Link<>& rLink ) +void CancelableDialog::SetCancelHdl( const Link<Button*,void>& rLink ) { m_pCancelButton->SetClickHdl( rLink ); } diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index fe5984f65bce..8a446b80af98 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -79,10 +79,9 @@ void SwSyncBtnDlg::dispose() SfxFloatingWindow::dispose(); } -IMPL_STATIC_LINK_NOARG(SwSyncBtnDlg, BtnHdl) +IMPL_STATIC_LINK_NOARG_TYPED(SwSyncBtnDlg, BtnHdl, Button*, void) { SfxViewFrame::Current()->GetDispatcher()->Execute(FN_UPDATE_ALL_LINKS, SfxCallMode::ASYNCHRON); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index a7ef05f126f1..a0f9ea850467 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -43,7 +43,7 @@ class DropDownFieldDialog : public SvxStandardDialog SwWrtShell &rSh; SwDropDownField* pDropField; - DECL_LINK(ButtonHdl, PushButton*); + DECL_LINK_TYPED(ButtonHdl, Button*, void); virtual void Apply() SAL_OVERRIDE; public: DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 1185317191d6..d350197882d6 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -56,7 +56,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog SfxRequest& rReq; DECL_LINK(ModifyHdl, BookmarkCombo *); - DECL_LINK(DeleteHdl, void *); + DECL_LINK_TYPED(DeleteHdl, Button*, void); virtual void Apply() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 85ce67b0ce26..49664253dc9c 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -51,10 +51,11 @@ class SwBreakDlg: public SvxStandardDialog bool bHtmlMode; - DECL_LINK( ClickHdl, void * ); - DECL_LINK( PageNumHdl, CheckBox * ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( SelectHdl, void * ); + DECL_LINK_TYPED( PageNumHdl, Button*, void ); DECL_LINK(PageNumModifyHdl, void *); - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); void CheckEnable(); diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 8a3f95a3003c..6efb9212dd7a 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -47,8 +47,8 @@ class SwChangeDBDlg: public SvxStandardDialog SwFieldMgr *pMgr; DECL_LINK(TreeSelectHdl, void * = 0); - DECL_LINK(ButtonHdl, void *); - DECL_LINK(AddDBHdl, void *); + DECL_LINK_TYPED(ButtonHdl, Button*, void); + DECL_LINK_TYPED(AddDBHdl, Button*, void); virtual void Apply() SAL_OVERRIDE; void UpdateFields(); diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 58366f7c3baa..8da147d50546 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -74,8 +74,8 @@ class SwCharURLPage : public SfxTabPage SvxMacroItem* pINetItem; bool bModified; - DECL_LINK(InsertFileHdl, void *); - DECL_LINK(EventHdl, void *); + DECL_LINK_TYPED(InsertFileHdl, Button*, void); + DECL_LINK_TYPED(EventHdl, Button*, void); public: SwCharURLPage( vcl::Window* pParent, diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 3150b3fc8e74..18985b33ed1b 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -61,7 +61,7 @@ class SwColumnDlg : public SfxModalDialog bool bFrameChanged : 1; DECL_LINK(ObjectHdl, ListBox*); - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); public: SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); @@ -141,11 +141,11 @@ class SwColumnPage : public SfxTabPage DECL_LINK( ColModify, NumericField * ); DECL_LINK( GapModify, MetricField * ); DECL_LINK( EdModify, MetricField * ); - DECL_LINK( AutoWidthHdl, CheckBox * ); + DECL_LINK_TYPED( AutoWidthHdl, Button *, void ); DECL_LINK( SetDefaultsHdl, ValueSet * ); - DECL_LINK(Up, void *); - DECL_LINK(Down, void *); + DECL_LINK_TYPED(Up, Button *, void); + DECL_LINK_TYPED(Down, Button *, void); DECL_LINK( UpdateColMgr, void* ); void Timeout(); diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 39d4e4745182..aa57f2360343 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -55,10 +55,10 @@ class SwConvertTableDlg: public SfxModalDialog SwTableAutoFormat* pTAutoFormat; SwWrtShell* pShell; - DECL_LINK( AutoFormatHdl, PushButton* ); - DECL_LINK( BtnHdl, Button* ); - DECL_LINK(CheckBoxHdl, void * = 0); - DECL_LINK( ReapeatHeaderCheckBoxHdl, void* = 0); + DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK_TYPED( CheckBoxHdl, Button* = 0, void ); + DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = 0, void ); public: SwConvertTableDlg( SwView& rView, bool bToTable ); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 541bf43ee551..77927246d5ac 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -96,8 +96,8 @@ class SwCaptionDialog : public SvxStandardDialog DECL_LINK(SelectHdl, void *); DECL_LINK(ModifyHdl, void *); - DECL_LINK(OptionHdl, Button *); - DECL_LINK(CaptionHdl, void *); + DECL_LINK_TYPED(OptionHdl, Button *, void); + DECL_LINK_TYPED(CaptionHdl, Button *, void); virtual void Apply() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 789b197684a8..53088dea74b7 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -133,14 +133,14 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem SwTableRep* pRep; sal_Int32 nGBFormatLen; - DECL_LINK( PageHdl, Button* ); - DECL_LINK( AutoFormatHdl, PushButton* ); - DECL_LINK( TableFormatHdl, PushButton* ); - DECL_LINK( DBFormatHdl, Button* ); - DECL_LINK( TableToFromHdl, Button* ); + DECL_LINK_TYPED( PageHdl, Button*, void ); + DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); + DECL_LINK_TYPED( TableFormatHdl, Button*, void ); + DECL_LINK_TYPED( DBFormatHdl, Button*, void ); + DECL_LINK_TYPED( TableToFromHdl, Button*, void ); DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( DblClickHdl, ListBox* ); - DECL_LINK( HeaderHdl, Button* ); + DECL_LINK_TYPED( HeaderHdl, Button*, void ); bool SplitTextToColArr( const OUString& rText, _DB_Columns& rColArr, bool bInsField ); using SfxModalDialog::Notify; diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index 3d9c2d9d47f2..d6d81ba9d3e8 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -40,7 +40,7 @@ public: virtual ~CancelableDialog(); virtual void dispose() SAL_OVERRIDE; - void SetCancelHdl( const Link<>& rLink ); + void SetCancelHdl( const Link<Button*,void>& rLink ); void Show(); }; diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 8d0eec4ff2b8..9c87e66af780 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -26,14 +26,14 @@ class SwWrtShell; class SwFootNoteOptionDlg :public SfxTabDialog { SwWrtShell &rSh; - Link<> aOldOkHdl; + Link<Button*, void> aOldOkHdl; sal_uInt16 m_nFootNoteId; sal_uInt16 m_nEndNoteId; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - DECL_LINK( OkHdl, Button * ); + DECL_LINK_TYPED( OkHdl, Button *, void ); public: SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh ); diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index ce769478e3b2..8cd7251e9ef2 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -40,7 +40,7 @@ protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE; - DECL_LINK(UpdateHdl, void *); + DECL_LINK_TYPED(UpdateHdl, Button*, void); private: VclPtr<FixedText> m_pPageNo; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 75b395717459..511ecc76b359 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -69,10 +69,10 @@ friend class SwDropCapsPict; virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; void FillSet( SfxItemSet &rSet ); - DECL_LINK(ClickHdl, void *); + DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK(SelectHdl, void *); - DECL_LINK(WholeWordHdl, void *); + DECL_LINK_TYPED(WholeWordHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 44595cb91444..853ffc8e6196 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -91,8 +91,8 @@ class SwEnvPage : public SfxTabPage OUString sActDBName; DECL_LINK( DatabaseHdl, ListBox * ); - DECL_LINK(FieldHdl, void *); - DECL_LINK(SenderHdl, void *); + DECL_LINK_TYPED(FieldHdl, Button*, void ); + DECL_LINK_TYPED(SenderHdl, Button*, void ); void InitDatabaseBox(); diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx index b7bf377fcd9a..04bc3dab649f 100644 --- a/sw/source/uibase/inc/fldedt.hxx +++ b/sw/source/uibase/inc/fldedt.hxx @@ -32,8 +32,8 @@ class SwFieldEditDlg : public SfxSingleTabDialog VclPtr<PushButton> m_pNextBT; VclPtr<PushButton> m_pAddressBT; - DECL_LINK(AddressHdl, void *); - DECL_LINK(NextPrevHdl, Button *); + DECL_LINK_TYPED(AddressHdl, Button *, void); + DECL_LINK_TYPED(NextPrevHdl, Button *, void); void Init(); VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup); @@ -45,7 +45,7 @@ public: virtual ~SwFieldEditDlg(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); virtual short Execute() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index cab774e12dd0..3f89dc6a8cee 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -50,8 +50,8 @@ public: SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); virtual ~SwFieldDlg(); - DECL_LINK(OKHdl, void *); - DECL_LINK(CancelHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(CancelHdl, Button*, void); void Initialize(SfxChildWinInfo *pInfo); void ReInitDlg(); diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index b603d5b70430..37332fb75c1a 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -131,19 +131,20 @@ class SwFrmPage: public SfxTabPage virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK(RangeModifyHdl, void *); - DECL_LINK(AnchorTypeHdl, void *); + DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); + DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); void InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel, sal_Int16 nV, sal_Int16 nVRel, long nX, long nY); - DECL_LINK(RealSizeHdl, void *); - DECL_LINK( RelSizeClickHdl, CheckBox * ); - DECL_LINK(MirrorHdl, void *); + DECL_LINK_TYPED(RealSizeHdl, Button *, void); + DECL_LINK_TYPED( RelSizeClickHdl, Button *, void ); + DECL_LINK_TYPED(MirrorHdl, Button *, void); - DECL_LINK( AutoWidthClickHdl, void* ); - DECL_LINK( AutoHeightClickHdl, void* ); + DECL_LINK_TYPED( AutoWidthClickHdl, Button *, void); + DECL_LINK_TYPED( AutoHeightClickHdl, Button *, void); // update example void UpdateExample(); @@ -221,8 +222,8 @@ class SwGrfExtPage: public SfxTabPage bool bHtmlMode; // handler for mirroring - DECL_LINK(MirrorHdl, void *); - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(MirrorHdl, Button*, void); + DECL_LINK_TYPED(BrowseHdl, Button*, void); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual ~SwGrfExtPage(); @@ -253,7 +254,7 @@ class SwFrmURLPage : public SfxTabPage VclPtr<CheckBox> pServerCB; VclPtr<CheckBox> pClientCB; - DECL_LINK(InsertFileHdl, void *); + DECL_LINK_TYPED(InsertFileHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index bcfe4a229eae..1808a47fca21 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -92,10 +92,10 @@ class SwGlossaryGroupDlg : public SvxStandardDialog protected: virtual void Apply() SAL_OVERRIDE; DECL_LINK( SelectHdl, SvTabListBox* ); - DECL_LINK(NewHdl, void *); - DECL_LINK( DeleteHdl, Button* ); + DECL_LINK_TYPED(NewHdl, Button *, void); + DECL_LINK_TYPED( DeleteHdl, Button*, void ); DECL_LINK(ModifyHdl, void *); - DECL_LINK(RenameHdl, void *); + DECL_LINK_TYPED(RenameHdl, Button *, void); public: SwGlossaryGroupDlg(vcl::Window * pParent, diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index d71b7922953b..f8cd535738f0 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -128,11 +128,11 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( GrpSelect, SvTreeListBox * ); DECL_LINK( MenuHdl, Menu * ); DECL_LINK_TYPED( EnableHdl, Menu *, bool ); - DECL_LINK(BibHdl, void *); + DECL_LINK_TYPED(BibHdl, Button *, void); DECL_LINK_TYPED(EditHdl, MenuButton *, void); - DECL_LINK(InsertHdl, void *); - DECL_LINK( PathHdl, Button * ); - DECL_LINK( CheckBoxHdl, CheckBox * ); + DECL_LINK_TYPED(InsertHdl, Button *, void); + DECL_LINK_TYPED( PathHdl, Button *, void ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK( PreviewLoadedHdl, void * ); virtual void Apply() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 2be62a3e1a8e..187a02c1b320 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -49,7 +49,7 @@ class SwFieldInputDlg: public SvxStandardDialog VclPtr<OKButton> m_pOKBT; VclPtr<PushButton> m_pNextBT; - DECL_LINK(NextHdl, void *); + DECL_LINK_TYPED(NextHdl, Button*, void); public: SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 4ae31b247d34..b292f3106c66 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -54,11 +54,11 @@ class SwInsFootNoteDlg: public SvxStandardDialog VclPtr<PushButton> m_pPrevBT; VclPtr<PushButton> m_pNextBT; - DECL_LINK(NumberCharHdl, void *); + DECL_LINK_TYPED(NumberCharHdl, Button *, void); DECL_LINK(NumberEditHdl, void *); - DECL_LINK(NumberAutoBtnHdl, void *); - DECL_LINK(NumberExtCharHdl, void *); - DECL_LINK(NextPrevHdl, Button *); + DECL_LINK_TYPED(NumberAutoBtnHdl, Button *, void); + DECL_LINK_TYPED(NumberExtCharHdl, Button *, void); + DECL_LINK_TYPED(NextPrevHdl, Button *, void); virtual void Apply() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index b10625b96087..ba9b57958d53 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -55,12 +55,12 @@ class SwInsTableDlg : public SfxModalDialog SwTableAutoFormat* pTAutoFormat; sal_Int64 nEnteredValRepeatHeaderNF; - DECL_LINK( ModifyName, Edit * ); - DECL_LINK( ModifyRowCol, NumericField * ); - DECL_LINK( AutoFormatHdl, PushButton* ); - DECL_LINK(OKHdl, void*); - DECL_LINK(CheckBoxHdl, void * = 0); - DECL_LINK( ReapeatHeaderCheckBoxHdl, void* = 0); + DECL_LINK( ModifyName, Edit* ); + DECL_LINK( ModifyRowCol, NumericField* ); + DECL_LINK_TYPED( AutoFormatHdl, Button*, void ); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(CheckBoxHdl, Button* = 0, void); + DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = 0, void); DECL_LINK( ModifyRepeatHeaderNF_Hdl, void* ); public: diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 1958fce891b2..f436557ae5f3 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -56,11 +56,11 @@ private: sfx2::FileDialogHelper* pFileDlg; VclPtr<vcl::Window> pOldDefDlgParent; - DECL_LINK(OKHdl, void *); - DECL_LINK(PrevHdl, void *); - DECL_LINK(NextHdl, void *); - DECL_LINK(RadioButtonHdl, void *); - DECL_LINK(InsertFileHdl, PushButton *); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(PrevHdl, Button*, void); + DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK_TYPED(RadioButtonHdl, Button*, void); + DECL_LINK_TYPED(InsertFileHdl, Button *, void); DECL_LINK_TYPED(DlgClosedHdl, sfx2::FileDialogHelper *, void); virtual void Apply() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index d73af8c83916..2d18ef619da8 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -48,8 +48,8 @@ private: VclPtr<CheckBox> m_pRestartEachPageCB; VclPtr<CheckBox> m_pNumberingOnCB; VclPtr<CheckBox> m_pNumberingOnFooterHeader; - DECL_LINK(OKHdl, void *); - DECL_LINK(LineOnOffHdl, void * = 0); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(LineOnOffHdl, Button* = 0, void); DECL_LINK(ModifyHdl, void * = 0); public: diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index e502ea9fef8c..81f4588a13f6 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -50,9 +50,9 @@ class SwMailConfigPage : public SfxTabPage SwMailMergeConfigItem* m_pConfigItem; - DECL_LINK(ReplyToHdl, CheckBox*); - DECL_LINK(AuthenticationHdl, void *); - DECL_LINK(TestHdl, void *); + DECL_LINK_TYPED(ReplyToHdl, Button*, void); + DECL_LINK_TYPED(AuthenticationHdl, Button*, void); + DECL_LINK_TYPED(TestHdl, Button*, void); public: SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 8c221b5e7d07..085b535d0642 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -104,12 +104,12 @@ class SwMailMergeDlg : public SvxStandardDialog Size m_aDialogSize; OUString m_sSaveFilter; - DECL_LINK( ButtonHdl, Button* ); - DECL_LINK(InsertPathHdl, void *); - DECL_LINK( OutputTypeHdl, RadioButton* ); - DECL_LINK( FilenameHdl, CheckBox* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK_TYPED( InsertPathHdl, Button*, void); + DECL_LINK_TYPED( OutputTypeHdl, Button*, void ); + DECL_LINK_TYPED( FilenameHdl, Button*, void ); DECL_LINK(ModifyHdl, void *); - DECL_LINK( SaveTypeHdl, RadioButton* ); + DECL_LINK_TYPED( SaveTypeHdl, Button*, void ); virtual void Apply() SAL_OVERRIDE; bool ExecQryShell(); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index c4fa047b9440..00c198be33bf 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -94,8 +94,8 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK( LevelHdl, ListBox * ); DECL_LINK(EditModifyHdl, void *); DECL_LINK( DistanceHdl, MetricField * ); - DECL_LINK( RelativeHdl, CheckBox * ); - DECL_LINK(StandardHdl, void *); + DECL_LINK_TYPED( RelativeHdl, Button*, void ); + DECL_LINK_TYPED(StandardHdl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); @@ -150,7 +150,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog protected: virtual short Ok() SAL_OVERRIDE; virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; - DECL_LINK(RemoveNumberingHdl, void *); + DECL_LINK_TYPED(RemoveNumberingHdl, Button*, void); public: SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 2ca04b2b582b..ed3630c368a3 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -53,10 +53,10 @@ class SwParagraphNumTabPage : public SfxTabPage bool bModified : 1; bool bCurNumrule : 1; - DECL_LINK(NewStartHdl_Impl, void *); + DECL_LINK_TYPED(NewStartHdl_Impl, Button*, void); DECL_LINK( StyleHdl_Impl, ListBox* ); - DECL_LINK(LineCountHdl_Impl, void *); - DECL_LINK(EditNumStyleHdl_Impl, void *); + DECL_LINK_TYPED(LineCountHdl_Impl, Button*, void); + DECL_LINK_TYPED(EditNumStyleHdl_Impl, Button*, void); DECL_LINK(EditNumStyleSelectHdl_Impl, void *); static const sal_uInt16 aPageRg[]; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index d48bf227ef1c..f247d6c76af1 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -51,7 +51,7 @@ private: // handler DECL_LINK(SelectHdl, void *); - DECL_LINK(UseAsDefaultHdl, void *); + DECL_LINK_TYPED(UseAsDefaultHdl, Button*, void); // private methods void InitControls( const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 5ac39f582816..ce91d28fcff1 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -60,7 +60,7 @@ private: sal_Int32 m_nOldLinkMode; DECL_LINK(MetricHdl, void *); - DECL_LINK(StandardizedPageCountCheckHdl, void *); + DECL_LINK_TYPED(StandardizedPageCountCheckHdl, Button*, void); public: SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 1d096fa8fb28..e6b6a89a50e1 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -60,7 +60,7 @@ class SwContentOptPage : public SfxTabPage VclPtr<FixedText> m_pMetricLabel; VclPtr<ListBox> m_pMetricLB; - DECL_LINK(VertRulerHdl, CheckBox*); + DECL_LINK_TYPED(VertRulerHdl, Button*, void); public: SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwContentOptPage(); @@ -105,7 +105,7 @@ class SwAddPrinterTabPage : public SfxTabPage bool bAttrModified; bool bPreview; - DECL_LINK(AutoClickHdl, void *); + DECL_LINK_TYPED(AutoClickHdl, Button*, void); DECL_LINK(SelectHdl, void *); public: @@ -173,7 +173,7 @@ class SwStdFontTabPage : public SfxTabPage OUString sScriptAsian; OUString sScriptComplex; - DECL_LINK(StandardHdl, void *); + DECL_LINK_TYPED(StandardHdl, Button*, void); DECL_LINK(ModifyHdl, ComboBox * ); DECL_LINK(ModifyHeightHdl, FontSizeBox * ); DECL_LINK(LoseFocusHdl, ComboBox * ); @@ -219,7 +219,7 @@ class SwTableOptionsTabPage : public SfxTabPage SwWrtShell* pWrtShell; bool bHTMLMode; - DECL_LINK(CheckBoxHdl, void *); + DECL_LINK_TYPED(CheckBoxHdl, Button*, void); public: SwTableOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -388,7 +388,7 @@ private: bool bAttrModified; void Init(); - DECL_LINK(AutoClickHdl, void*); + DECL_LINK_TYPED(AutoClickHdl, Button*, void); }; #endif // DBG_UTIL @@ -403,8 +403,8 @@ class SwCompareOptionsTabPage : public SfxTabPage VclPtr<NumericField> m_pLenNF; VclPtr<CheckBox> m_pStoreRsidCB; - DECL_LINK(ComparisonHdl, void *); - DECL_LINK(IgnoreHdl, void *); + DECL_LINK_TYPED(ComparisonHdl, Button*, void); + DECL_LINK_TYPED(IgnoreHdl, Button*, void); public: SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 78f96c8c0dbb..bbb1dc8bca31 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -59,8 +59,8 @@ class SwOutlineTabDialog : public SfxTabDialog bool bModified : 1; protected: - DECL_LINK(CancelHdl, void *); - DECL_LINK( FormHdl, Button * ); + DECL_LINK_TYPED(CancelHdl, Button*, void); + DECL_LINK_TYPED( FormHdl, Button *, void ); DECL_LINK( MenuSelectHdl, Menu * ); virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 223fe3851f7a..dfc2227327d7 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -57,8 +57,8 @@ private: VclPtr<MetricField> m_pLineLengthEdit; VclPtr<MetricField> m_pLineDistEdit; - DECL_LINK(HeightPage, void *); - DECL_LINK(HeightMetric, void *); + DECL_LINK_TYPED(HeightPage, Button*, void); + DECL_LINK_TYPED(HeightMetric, Button*, void); DECL_LINK(HeightModify, void *); DECL_LINK( LineWidthChanged_Impl, void * ); DECL_LINK( LineColorSelected_Impl, void * ); diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 86aae8d5637c..0274619df91b 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -71,11 +71,12 @@ class SwTextGridPage: public SfxTabPage void PutGridItem(SfxItemSet& rSet); static void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue ); - DECL_LINK(GridTypeHdl, RadioButton*); + DECL_LINK_TYPED(GridTypeHdl, Button*, void); DECL_LINK(CharorLineChangedHdl, SpinField*); DECL_LINK(TextSizeChangedHdl, SpinField*); DECL_LINK(GridModifyHdl, void*); - DECL_LINK(DisplayGridHdl, void *); + DECL_LINK_TYPED(GridModifyClickHdl, Button*, void); + DECL_LINK_TYPED(DisplayGridHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 7b4d1dec3c61..368509214b22 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -108,21 +108,21 @@ class SwEditRegionDlg : public SfxModalDialog DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); DECL_LINK( DeselectHdl, SvTreeListBox * ); - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK(NameEditHdl, void *); DECL_LINK( ConditionEditHdl, Edit * ); - DECL_LINK( ChangePasswdHdl, Button * ); - DECL_LINK( ChangeProtectHdl, TriStateBox * ); - DECL_LINK( ChangeHideHdl, TriStateBox * ); + DECL_LINK_TYPED( ChangePasswdHdl, Button *, void ); + DECL_LINK_TYPED( ChangeProtectHdl, Button *, void ); + DECL_LINK_TYPED( ChangeHideHdl, Button *, void ); // #114856# edit in readonly sections - DECL_LINK( ChangeEditInReadonlyHdl, TriStateBox * ); - DECL_LINK(ChangeDismissHdl, void *); - DECL_LINK( UseFileHdl, CheckBox* ); - DECL_LINK(FileSearchHdl, void *); - DECL_LINK(OptionsHdl, void *); + DECL_LINK_TYPED( ChangeEditInReadonlyHdl, Button *, void ); + DECL_LINK_TYPED(ChangeDismissHdl, Button*, void); + DECL_LINK_TYPED( UseFileHdl, Button*, void ); + DECL_LINK_TYPED(FileSearchHdl, Button*, void); + DECL_LINK_TYPED(OptionsHdl, Button*, void); DECL_LINK( FileNameHdl, Edit* ); - DECL_LINK( DDEHdl, CheckBox* ); + DECL_LINK_TYPED( DDEHdl, Button*, void ); DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void ); DECL_LINK( SubRegionEventHdl, VclWindowEvent * ); @@ -171,13 +171,13 @@ class SwInsertSectionTabPage : public SfxTabPage sfx2::DocumentInserter* m_pDocInserter; VclPtr<vcl::Window> m_pOldDefDlgParent; - DECL_LINK( ChangeHideHdl, CheckBox * ); - DECL_LINK( ChangeProtectHdl, CheckBox * ); - DECL_LINK( ChangePasswdHdl, Button * ); + DECL_LINK_TYPED( ChangeHideHdl, Button *, void ); + DECL_LINK_TYPED( ChangeProtectHdl, Button *, void ); + DECL_LINK_TYPED( ChangePasswdHdl, Button *, void ); DECL_LINK(NameEditHdl, void *); - DECL_LINK( UseFileHdl, CheckBox* ); - DECL_LINK(FileSearchHdl, void *); - DECL_LINK( DDEHdl, CheckBox* ); + DECL_LINK_TYPED( UseFileHdl, Button*, void ); + DECL_LINK_TYPED(FileSearchHdl, Button*, void ); + DECL_LINK_TYPED( DDEHdl, Button*, void ); DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void ); public: @@ -222,7 +222,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage VclPtr<FixedText> pEndSuffixFT; VclPtr<Edit> pEndSuffixED; - DECL_LINK( FootEndHdl, CheckBox * ); + DECL_LINK_TYPED( FootEndHdl, Button*, void ); void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 44d912562767..69de0e969bed 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -77,10 +77,10 @@ class SwSortDlg : public SvxStandardDialog virtual void Apply() SAL_OVERRIDE; sal_Unicode GetDelimChar() const; - DECL_LINK( CheckHdl, void * ); - DECL_LINK( DelimHdl, RadioButton* ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK_TYPED( DelimHdl, Button*, void ); DECL_LINK( LanguageHdl, ListBox* ); - DECL_LINK(DelimCharHdl, void *); + DECL_LINK_TYPED(DelimCharHdl, Button*,void); public: SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index 84967e6fd9df..523dcce86a26 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -41,7 +41,7 @@ class SwRenameXNamedDlg : public ModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xSecondAccess; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xThirdAccess; - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK(ModifyHdl, Edit*); public: diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 6934ec058952..99ef88a13a60 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -52,8 +52,9 @@ class SwCondCollPage : public SfxTabPage virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - DECL_LINK( OnOffHdl, CheckBox* ); + DECL_LINK_TYPED( OnOffHdl, Button*, void ); DECL_LINK( AssignRemoveHdl, PushButton*); + DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void); DECL_LINK( SelectHdl, ListBox* ); using SfxTabPage::ActivatePage; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 3a82b385040b..2f08b236cb40 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -94,7 +94,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog SwTOXDescription* CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, void*); - DECL_LINK(ShowPreviewHdl, void*); + DECL_LINK_TYPED(ShowPreviewHdl, Button*, void); public: SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, @@ -203,13 +203,13 @@ class SwTOXSelectTabPage : public SfxTabPage bool m_bWaitingInitialSettings; DECL_LINK(TOXTypeHdl, ListBox* ); - DECL_LINK(AddStylesHdl, PushButton* ); + DECL_LINK_TYPED(AddStylesHdl, Button*, void ); DECL_LINK_TYPED(MenuEnableHdl, Menu*, bool); DECL_LINK(MenuExecuteHdl, Menu*); DECL_LINK(LanguageHdl, ListBox*); - DECL_LINK(CheckBoxHdl, CheckBox* ); - DECL_LINK(RadioButtonHdl, void *); + DECL_LINK_TYPED(CheckBoxHdl, Button*, void ); + DECL_LINK_TYPED(RadioButtonHdl, Button*, void); DECL_LINK(ModifyHdl, void*); void ApplyTOXDescription(); @@ -272,7 +272,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer DECL_LINK(TbxFocusHdl, SwTOXEdit* ); DECL_LINK(NextItemBtnHdl, SwTOXButton* ); DECL_LINK(TbxFocusBtnHdl, SwTOXButton* ); - DECL_LINK(ScrollHdl, ImageButton* ); + DECL_LINK_TYPED(ScrollHdl, Button*, void ); void SetActiveControl(Control* pSet); @@ -411,24 +411,25 @@ class SwTOXEntryTabPage : public SfxTabPage bool bInLevelHdl; DECL_LINK(StyleSelectHdl, ListBox*); - DECL_LINK(EditStyleHdl, PushButton*); - DECL_LINK(InsertTokenHdl, PushButton*); + DECL_LINK_TYPED(EditStyleHdl, Button*, void); + DECL_LINK_TYPED(InsertTokenHdl, Button*, void); DECL_LINK(LevelHdl, SvTreeListBox*); - DECL_LINK(AutoRightHdl, CheckBox*); + DECL_LINK_TYPED(AutoRightHdl, Button*, void); DECL_LINK(TokenSelectedHdl, SwFormToken*); DECL_LINK(TabPosHdl, MetricField*); DECL_LINK(FillCharHdl, ComboBox*); - DECL_LINK(RemoveInsertAuthHdl, PushButton*); - DECL_LINK(SortKeyHdl, RadioButton*); + DECL_LINK_TYPED(RemoveInsertAuthHdl, Button*, void); + DECL_LINK_TYPED(SortKeyHdl, Button*, void); DECL_LINK(ChapterInfoHdl, ListBox*); DECL_LINK(ChapterInfoOutlineHdl, NumericField*); DECL_LINK(NumberFormatHdl, ListBox*); - DECL_LINK(AllLevelsHdl, void *); + DECL_LINK_TYPED(AllLevelsHdl, Button*, void); void WriteBackLevel(); void UpdateDescriptor(); DECL_LINK(ModifyHdl, void*); + DECL_LINK_TYPED(ModifyClickHdl, Button*, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -464,11 +465,11 @@ class SwTOXStylesTabPage : public SfxTabPage SwForm* m_pCurrentForm; - DECL_LINK( EditStyleHdl, Button *); - DECL_LINK(StdHdl, void *); + DECL_LINK_TYPED( EditStyleHdl, Button *, void); + DECL_LINK_TYPED(StdHdl, Button*, void); DECL_LINK(EnableSelectHdl, void *); DECL_LINK(DoubleClickHdl, void *); - DECL_LINK(AssignHdl, void *); + DECL_LINK_TYPED(AssignHdl, Button*, void); void Modify(); SwForm& GetForm() diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index 60558569af64..40772ab5519d 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -107,17 +107,17 @@ class SwIndexMarkPane void InsertMark(); void UpdateMark(); - DECL_LINK( InsertHdl, Button * ); - DECL_LINK(CloseHdl, void *); - DECL_LINK(DelHdl, void *); - DECL_LINK(NextHdl, void *); - DECL_LINK(NextSameHdl, void *); - DECL_LINK(PrevHdl, void *); - DECL_LINK(PrevSameHdl, void *); - DECL_LINK( ModifyHdl, ListBox* ); + DECL_LINK_TYPED( InsertHdl, Button *, void ); + DECL_LINK_TYPED(CloseHdl, Button*, void); + DECL_LINK_TYPED(DelHdl, Button*, void); + DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK_TYPED(NextSameHdl, Button*, void); + DECL_LINK_TYPED(PrevHdl, Button*, void); + DECL_LINK_TYPED(PrevSameHdl, Button*, void); + DECL_LINK( ModifyHdl, ListBox* pBox ); DECL_LINK( KeyDCBModifyHdl, ComboBox * ); - DECL_LINK(NewUserIdxHdl, void *); - DECL_LINK( SearchTypeHdl, CheckBox*); + DECL_LINK_TYPED(NewUserIdxHdl, Button*, void); + DECL_LINK_TYPED( SearchTypeHdl, Button*, void); DECL_LINK( PhoneticEDModifyHdl, Edit * ); //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' @@ -205,11 +205,11 @@ class SwAuthorMarkPane ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; - DECL_LINK(InsertHdl, void *); - DECL_LINK(CloseHdl, void *); - DECL_LINK(CreateEntryHdl, PushButton*); + DECL_LINK_TYPED(InsertHdl, Button*, void); + DECL_LINK_TYPED(CloseHdl, Button*, void); + DECL_LINK_TYPED(CreateEntryHdl, Button*, void); DECL_LINK(CompEntryHdl, ListBox*); - DECL_LINK(ChangeSourceHdl, RadioButton*); + DECL_LINK_TYPED(ChangeSourceHdl, Button*, void); DECL_LINK(IsEntryAllowedHdl, Edit*); DECL_LINK(EditModifyHdl, Edit*); diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index e2fa361c4ea9..6f6d8f5c7d12 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -27,7 +27,7 @@ class SwSyncBtnDlg : public SfxFloatingWindow { VclPtr<PushButton> m_pSyncBtn; - DECL_STATIC_LINK( SwSyncBtnDlg, BtnHdl, void* ); + DECL_STATIC_LINK_TYPED( SwSyncBtnDlg, BtnHdl, Button*, void ); public: SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 72e62c2fe631..4c619b112027 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -70,11 +70,11 @@ class SwAutoFormatDlg : public SfxModalDialog void Init( const SwTableAutoFormat* pSelFormat ); void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn ); - DECL_LINK( CheckHdl, Button * ); - DECL_LINK(OkHdl, void *); - DECL_LINK( AddHdl, void * ); - DECL_LINK( RemoveHdl, void * ); - DECL_LINK( RenameHdl, void * ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK_TYPED(OkHdl, Button*, void); + DECL_LINK_TYPED( AddHdl, Button*, void ); + DECL_LINK_TYPED( RemoveHdl, Button*, void ); + DECL_LINK_TYPED( RenameHdl, Button*, void ); DECL_LINK( SelFormatHdl, void * ); public: diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index 40789e8ca2c3..d461e5a5fda5 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -53,13 +53,13 @@ private: sal_uInt16 GetInsertPosition() const; - DECL_LINK(OKHdl, void *); - DECL_LINK(EditHdl, void *); - DECL_LINK(RestartNumberingHdl, void *); - DECL_LINK(SetPageNumberHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(EditHdl, Button*, void); + DECL_LINK_TYPED(RestartNumberingHdl, Button*, void); + DECL_LINK_TYPED(SetPageNumberHdl, Button*, void); DECL_LINK(UpHdl, void *); DECL_LINK(DownHdl, void *); - DECL_LINK(StartPageHdl, void *); + DECL_LINK_TYPED(StartPageHdl, Button*, void); public: SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg(); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 1ac17c1910e6..0b52b2d230b7 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -50,7 +50,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog VclPtr<CloseButton> m_pClosePB; - DECL_STATIC_LINK( SwWordCountFloatDlg, CloseHdl, void* ); + DECL_STATIC_LINK_TYPED( SwWordCountFloatDlg, CloseHdl, Button*, void ); public: SwWordCountFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 9b19cf1092b7..c38a1cc107ab 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -86,8 +86,8 @@ class SwWrapTabPage: public SfxTabPage virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; DECL_LINK( RangeModifyHdl, MetricField * ); - DECL_LINK( WrapTypeHdl, RadioButton * ); - DECL_LINK(ContourHdl, void *); + DECL_LINK_TYPED( WrapTypeHdl, Button *, void ); + DECL_LINK_TYPED( ContourHdl, Button *, void); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index d1a675e29900..6c9e7bd3e89d 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -105,12 +105,11 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl) return 0; } -IMPL_LINK_NOARG(PageColumnControl, MoreButtonClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(PageColumnControl, MoreButtonClickHdl_Impl, Button*, void) { mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_COLUMN_DLG, SfxCallMode::ASYNCHRON ); mrPagePropPanel.ClosePageColumnPopup(); - return 0; } } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index 955323c10159..3989ea9ae2d6 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -56,7 +56,7 @@ private: PagePropertyPanel& mrPagePropPanel; DECL_LINK(ImplColumnHdl, void*); - DECL_LINK(MoreButtonClickHdl_Impl, void*); + DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 621d18f9bc8c..88484f26b143 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -173,12 +173,11 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl) return 0; } -IMPL_LINK_NOARG(PageSizeControl, MoreButtonClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void) { mrPagePropPanel.GetBindings()->GetDispatcher()->Execute( FN_FORMAT_PAGE_SETTING_DLG, SfxCallMode::ASYNCHRON ); mrPagePropPanel.ClosePageSizePopup(); - return 0; } } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index ae4756af6604..7bb7e08ccdd2 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -62,7 +62,7 @@ private: PagePropertyPanel& mrPagePropPanel; DECL_LINK(ImplSizeHdl, void*); - DECL_LINK(MoreButtonClickHdl_Impl, void*); + DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void); }; } } // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index a0457f0b5b02..c0457bbef5eb 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -491,8 +491,8 @@ ThemePanel::ThemePanel(vcl::Window* pParent, get(mpApplyButton, "apply"); mpApplyButton->SetClickHdl(LINK(this, ThemePanel, ClickHdl)); - mpListBoxFonts->SetDoubleClickHdl(LINK(this, ThemePanel, ClickHdl)); - mpListBoxColors->SetDoubleClickHdl(LINK(this, ThemePanel, ClickHdl)); + mpListBoxFonts->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl)); + mpListBoxColors->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl)); std::vector<FontSet> aFontSets = initFontSets(); for (size_t i = 0; i < aFontSets.size(); ++i) @@ -521,7 +521,11 @@ void ThemePanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_NOARG(ThemePanel, ClickHdl) +IMPL_LINK_NOARG_TYPED(ThemePanel, ClickHdl, Button*, void) +{ + DoubleClickHdl(NULL); +} +IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl) { SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current()); if (pDocSh) diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index d4f9faff7094..0e95c5e0f205 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -66,7 +66,8 @@ private: VclPtr<ListBox> mpListBoxColors; VclPtr<PushButton> mpApplyButton; - DECL_LINK(ClickHdl, void*); + DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(DoubleClickHdl, void*); }; }} // end of namespace sw::sidebar diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index 62d28b665e21..d312cedb4b36 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -113,7 +113,7 @@ void WrapPropertyPanel::dispose() void WrapPropertyPanel::Initialize() { - Link<> aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl); + Link<Button*,void> aLink = LINK(this, WrapPropertyPanel, WrapTypeHdl); mpRBNoWrap->SetClickHdl(aLink); mpRBWrapLeft->SetClickHdl(aLink); mpRBWrapRight->SetClickHdl(aLink); @@ -164,7 +164,7 @@ void WrapPropertyPanel::Initialize() mpBindings->Update( FN_FRAME_WRAP_IDEAL ); } -IMPL_LINK_NOARG(WrapPropertyPanel, WrapTypeHdl) +IMPL_LINK_NOARG_TYPED(WrapPropertyPanel, WrapTypeHdl, Button*, void) { sal_uInt16 nSlot = 0; if ( mpRBWrapLeft->IsChecked() ) @@ -193,8 +193,6 @@ IMPL_LINK_NOARG(WrapPropertyPanel, WrapTypeHdl) } SfxBoolItem bStateItem( nSlot, true ); mpBindings->GetDispatcher()->Execute( nSlot, SfxCallMode::RECORD, &bStateItem, 0L ); - - return 0; } void WrapPropertyPanel::NotifyItemUpdate( diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index bd1f27ad0931..9edcb9cb7764 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -78,7 +78,7 @@ namespace sw { namespace sidebar { void Initialize(); - DECL_LINK(WrapTypeHdl, void*); + DECL_LINK_TYPED(WrapTypeHdl, Button*, void); }; } } // end of namespace ::sw::sidebar diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 3d6833a7db1f..e75484b138a1 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -71,8 +71,8 @@ class SwFormatTablePage : public SfxTabPage void Init(); void ModifyHdl(const Edit* pEdit); - DECL_LINK( AutoClickHdl, void * ); - DECL_LINK( RelWidthClickHdl, CheckBox * ); + DECL_LINK_TYPED( AutoClickHdl, Button*, void ); + DECL_LINK_TYPED( RelWidthClickHdl, Button*, void ); void RightModify(); DECL_LINK( UpDownLoseFocusHdl, MetricField * ); @@ -117,12 +117,12 @@ class SwTableColumnPage : public SfxTabPage bool bPercentMode:1; void Init(bool bWeb); - DECL_LINK( AutoClickHdl, void * ); + DECL_LINK_TYPED( AutoClickHdl, Button *, void ); void ModifyHdl( MetricField* pEdit ); DECL_LINK( UpHdl, MetricField * ); DECL_LINK( DownHdl, MetricField * ); DECL_LINK( LoseFocusHdl, MetricField * ); - DECL_LINK( ModeHdl, CheckBox * ); + DECL_LINK_TYPED( ModeHdl, Button *, void ); void UpdateCols( sal_uInt16 nAktPos ); SwTwips GetVisibleWidth(sal_uInt16 nPos); void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth); @@ -172,13 +172,13 @@ class SwTextFlowPage : public SfxTabPage bool bPageBreak; bool bHtmlMode; - DECL_LINK(PageBreakHdl_Impl, void *); - DECL_LINK(ApplyCollClickHdl_Impl, void *); - DECL_LINK( PageBreakPosHdl_Impl, RadioButton* ); - DECL_LINK( PageBreakTypeHdl_Impl, RadioButton* ); - DECL_LINK( SplitHdl_Impl, CheckBox* ); - DECL_STATIC_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox* ); - DECL_LINK( HeadLineCBClickHdl, void* = 0 ); + DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); + DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); + DECL_LINK_TYPED( PageBreakPosHdl_Impl, Button*, void ); + DECL_LINK_TYPED( PageBreakTypeHdl_Impl, Button*, void ); + DECL_LINK_TYPED( SplitHdl_Impl, Button*, void ); + DECL_STATIC_LINK_TYPED( SwTextFlowPage, SplitRowHdl_Impl, Button*, void ); + DECL_LINK_TYPED( HeadLineCBClickHdl, Button* = 0, void ); public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index 216d2c32c184..3acbc2ffcbe3 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -47,14 +47,12 @@ void AuthFallbackDlg::dispose() ModalDialog::dispose(); } -IMPL_LINK ( AuthFallbackDlg, OKHdl, Button *, ) +IMPL_LINK_NOARG_TYPED ( AuthFallbackDlg, OKHdl, Button *, void) { EndDialog( RET_OK ); - return 1; } -IMPL_LINK ( AuthFallbackDlg, CancelHdl, Button *, ) +IMPL_LINK_NOARG_TYPED ( AuthFallbackDlg, CancelHdl, Button *, void) { EndDialog(); - return 0; } diff --git a/uui/source/authfallbackdlg.hxx b/uui/source/authfallbackdlg.hxx index 29634d1f69b0..6442f74c0237 100644 --- a/uui/source/authfallbackdlg.hxx +++ b/uui/source/authfallbackdlg.hxx @@ -35,8 +35,8 @@ public: private: - DECL_LINK ( OKHdl, Button * ); - DECL_LINK ( CancelHdl, Button * ); + DECL_LINK_TYPED ( OKHdl, Button *, void ); + DECL_LINK_TYPED ( CancelHdl, Button *, void ); }; #endif // INCLUDED_SVTOOLS_AUTHFALLBACKDLG_HXX diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index ca44729e15f0..8cf4e58d2699 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -128,16 +128,15 @@ void LoginDialog::EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ) m_pAccountED->Enable( !bUseSysCredsEnabled ); } -IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(LoginDialog, OKHdl_Impl, Button*, void) { // trim the strings m_pNameED->SetText(comphelper::string::strip(m_pNameED->GetText(), ' ')); m_pPasswordED->SetText(comphelper::string::strip(m_pPasswordED->GetText(), ' ')); EndDialog( RET_OK ); - return 1; } -IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl) +IMPL_LINK_NOARG_TYPED(LoginDialog, PathHdl_Impl, Button*, void) { try { @@ -157,14 +156,11 @@ IMPL_LINK_NOARG(LoginDialog, PathHdl_Impl) { SAL_WARN("uui", "LoginDialog::PathHdl_Impl: caught UNO exception: " << e.Message); } - - return 1; } -IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl) +IMPL_LINK_NOARG_TYPED(LoginDialog, UseSysCredsHdl_Impl, Button*, void) { EnableUseSysCredsControls_Impl( m_pUseSysCredsCB->IsChecked() ); - return 1; } LoginDialog::LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 96304a0359ed..a8c34646bf04 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -62,9 +62,9 @@ class LoginDialog : public ModalDialog void HideControls_Impl( sal_uInt16 nFlags ); void EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ); - DECL_LINK(OKHdl_Impl, void *); - DECL_LINK(PathHdl_Impl, void *); - DECL_LINK(UseSysCredsHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK_TYPED(PathHdl_Impl, Button*, void); + DECL_LINK_TYPED(UseSysCredsHdl_Impl, Button*, void); public: LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 85ddf2754b81..06ded1599cb1 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -33,7 +33,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl) return 0; } -IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(MasterPasswordCreateDialog, OKHdl_Impl, Button*, void) { // compare both passwords and show message box if there are not equal!! if( m_pEDMasterPasswordCrt->GetText() == m_pEDMasterPasswordRepeat->GetText() ) @@ -47,7 +47,6 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl) m_pEDMasterPasswordRepeat->SetText( OUString() ); m_pEDMasterPasswordCrt->GrabFocus(); } - return 1; } MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, ResMgr* pResMgr) diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index b8279fcec363..d363cb60e600 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -37,7 +37,7 @@ private: VclPtr<OKButton> m_pOKBtn; - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK(EditHdl_Impl, void *); public: diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index 924112b088c7..b45f588552a0 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -26,10 +26,9 @@ -IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void) { EndDialog( RET_OK ); - return 1; } diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 1d37d0d93d78..c1d945eee6f6 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -33,7 +33,7 @@ class MasterPasswordDialog : public ModalDialog VclPtr<Edit> m_pEDMasterPassword; VclPtr<OKButton> m_pOKBtn; - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); public: MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index 0911605a7863..e299b2709233 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -25,7 +25,7 @@ // NameClashDialog --------------------------------------------------------- -IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) +IMPL_LINK_TYPED( NameClashDialog, ButtonHdl_Impl, Button *, pBtn, void ) { long nRet = (long) ABORT; if ( m_pBtnRename == pBtn ) @@ -36,7 +36,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) { ScopedVclPtrInstance< MessageDialog > aError(nullptr, maSameName); aError->Execute(); - return 1; + return; } maNewName = aNewName; } @@ -44,8 +44,6 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) nRet = (long) OVERWRITE; EndDialog( nRet ); - - return 1; } @@ -63,7 +61,7 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, get(m_pBtnRename, "rename"); get(m_pBtnCancel, "cancel"); - Link<> aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) ); + Link<Button*,void> aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) ); m_pBtnOverwrite->SetClickHdl( aLink ); m_pBtnRename->SetClickHdl( aLink ); m_pBtnCancel->SetClickHdl( aLink ); diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index 545f581dd077..3e050f6953d9 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -40,7 +40,7 @@ class NameClashDialog : public ModalDialog OUString maSameName; OUString maNewName; - DECL_LINK( ButtonHdl_Impl, PushButton * ); + DECL_LINK_TYPED( ButtonHdl_Impl, Button *, void ); public: NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 2563ea745de7..c993ac201871 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -97,7 +97,7 @@ void PasswordDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(PasswordDialog, OKHdl_Impl, Button*, void) { bool bEDPasswdValid = m_pEDPassword->GetText().getLength() >= nMinLen; bool bPasswdMismatch = m_pEDConfirmPassword->GetText() != m_pEDPassword->GetText(); @@ -111,8 +111,6 @@ IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl) } else if (bValid) EndDialog( RET_OK ); - - return 1; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index 712bcfae0ee3..d013dcac6725 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -41,7 +41,7 @@ class PasswordDialog : public ModalDialog OUString aPasswdMismatch; - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); public: PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index cb661be0d97d..39fbda6af57f 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -113,7 +113,7 @@ void MacroWarning::SetDocumentURL( const OUString& rDocURL ) mpDocNameFI->SetText( rDocURL ); } -IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl) +IMPL_LINK_NOARG_TYPED(MacroWarning, ViewSignsBtnHdl, Button*, void) { DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" ); @@ -126,11 +126,9 @@ IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl) else if( mxStore.is() ) xD->showScriptingContentSignatures( mxStore, uno::Reference< io::XInputStream >() ); } - - return 0; } -IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl) +IMPL_LINK_NOARG_TYPED(MacroWarning, EnableBtnHdl, Button*, void) { if( mbSignedMode && mpAlwaysTrustCB->IsChecked() ) { // insert path into trusted path list @@ -149,22 +147,18 @@ IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl) } EndDialog( RET_OK ); - return 0; } -IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl) +IMPL_LINK_NOARG_TYPED(MacroWarning, DisableBtnHdl, Button*, void) { EndDialog(); - return 0; } -IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl) +IMPL_LINK_NOARG_TYPED(MacroWarning, AlwaysTrustCheckHdl, Button*, void) { bool bEnable = ( mnActSecLevel < 2 || mpAlwaysTrustCB->IsChecked() ); mpEnableBtn->Enable( bEnable ); mpDisableBtn->Enable( !mpAlwaysTrustCB->IsChecked() ); - - return 0; } void MacroWarning::InitControls() diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index f51bb9078dff..8a81afaad3f4 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -59,10 +59,10 @@ private: const bool mbShowSignatures; sal_Int32 mnActSecLevel; - DECL_LINK( ViewSignsBtnHdl, void* ); - DECL_LINK( EnableBtnHdl, void* ); - DECL_LINK( DisableBtnHdl, void* ); - DECL_LINK( AlwaysTrustCheckHdl, void* ); + DECL_LINK_TYPED( ViewSignsBtnHdl, Button*, void ); + DECL_LINK_TYPED( EnableBtnHdl, Button*, void ); + DECL_LINK_TYPED( DisableBtnHdl, Button*, void ); + DECL_LINK_TYPED( AlwaysTrustCheckHdl, Button*, void ); void InitControls(); diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index f51606e39c80..8d0ac80904df 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -29,7 +29,7 @@ using namespace css; -IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl) +IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, OKHdl_Impl, Button*, void) { if ( m_pOptionButtonAccept->IsChecked() ) { @@ -38,13 +38,11 @@ IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl) { EndDialog(); } - - return 1; } -IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) +IMPL_LINK_NOARG_TYPED(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void) { uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures; @@ -52,8 +50,6 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) css::security::DocumentDigitalSignatures::createDefault(m_xContext) ); xDocumentDigitalSignatures.get()->showCertificate(getCert()); - - return 0; } diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 2eafe5e3b5f0..fa6ce667ab42 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -39,8 +39,8 @@ private: const css::uno::Reference< css::uno::XComponentContext >& m_xContext; const css::uno::Reference< css::security::XCertificate >& m_rXCert; - DECL_LINK(OKHdl_Impl, void *); - DECL_LINK(ViewCertHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_LINK_TYPED(ViewCertHdl_Impl, Button*, void); public: UnknownAuthDialog(vcl::Window* pParent, diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 8c1a10a82c26..576a24fe27f1 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -97,7 +97,7 @@ namespace VclPtr<Edit> m_pEdit; OUString& m_rReturnValue; - DECL_LINK( ClickBtnHdl, Button* ); + DECL_LINK_TYPED( ClickBtnHdl, Button*, void ); public: // parent window, Query text, initial value @@ -130,7 +130,7 @@ namespace SetText(rQuery); } - IMPL_LINK( QueryString, ClickBtnHdl, Button*, pButton ) + IMPL_LINK_TYPED( QueryString, ClickBtnHdl, Button*, pButton, void ) { if (pButton == m_pOKButton) { @@ -139,7 +139,6 @@ namespace } else EndDialog(); - return 0; } int QueryFaxNumber(OUString& rNumber) diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index 8e2799cca27f..8e06a6f3a54a 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -133,7 +133,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl ) return 0; } -IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) +IMPL_LINK_TYPED( RTSDialog, ClickButton, Button*, pButton, void ) { if( pButton == m_pOKButton ) { @@ -155,8 +155,6 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton ) } else if( pButton == m_pCancelButton ) EndDialog(); - - return 0; } /* diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx index 766237e5e25c..a9da270408cc 100644 --- a/vcl/generic/print/prtsetup.hxx +++ b/vcl/generic/print/prtsetup.hxx @@ -59,7 +59,7 @@ class RTSDialog : public TabDialog bool mbDataModified; DECL_LINK( ActivatePage, TabControl* ); - DECL_LINK( ClickButton, Button* ); + DECL_LINK_TYPED( ClickButton, Button*, void ); // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 1f4f555223e9..65fbc597b3b0 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -241,7 +241,8 @@ namespace vcl virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( ClickHdl, Button* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ToggleHdl, void* ); DECL_LINK( ModifyHdl, Edit* ); DECL_LINK( UIOptionsChanged, void* ); @@ -274,7 +275,7 @@ namespace vcl sal_Int32 mnCur; sal_Int32 mnMax; - DECL_LINK( ClickHdl, Button* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); public: PrintProgressDialog(vcl::Window* i_pParent, int i_nMax); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index a1c0dea3ccae..59fb68a01535 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -109,7 +109,7 @@ void Button::dispose() void Button::SetCommandHandler(const OUString& aCommand) { maCommand = aCommand; - SetClickHdl(Link<>(NULL, dispatchCommandHandler)); + SetClickHdl( LINK( this, Button, dispatchCommandHandler) ); } void Button::Click() @@ -609,16 +609,12 @@ bool Button::set_property(const OString &rKey, const OString &rValue) return true; } -sal_IntPtr Button::dispatchCommandHandler(void *, void *pCaller) +IMPL_STATIC_LINK_TYPED( Button, dispatchCommandHandler, Button*, pButton, void ) { - const Button *pButton = static_cast<Button*>(pCaller); if (pButton == NULL) - return 0; - - if (!comphelper::dispatchCommand(pButton->maCommand, uno::Sequence<beans::PropertyValue>())) - return 0; + return; - return 1; + comphelper::dispatchCommand(pButton->maCommand, uno::Sequence<beans::PropertyValue>()); } void PushButton::ImplInitPushButtonData() diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 145b02f2df1d..9c02cf943922 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -211,7 +211,7 @@ void ButtonDialog::ImplPosControls() mbFormat = false; } -IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn ) +IMPL_LINK_TYPED( ButtonDialog, ImplClickHdl, Button*, pBtn, void ) { for (auto & it : m_ItemList) { @@ -222,8 +222,6 @@ IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn ) break; } } - - return 0; } void ButtonDialog::Resize() diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 090a70c9e570..ddc3a7a5c73b 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2053,10 +2053,9 @@ void MessageDialog::response(short nResponseId) EndDialog(nResponseId); } -IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton) +IMPL_LINK_TYPED(MessageDialog, ButtonHdl, Button *, pButton, void) { response(get_response(pButton)); - return 0; } short MessageDialog::get_response(const vcl::Window *pWindow) const diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 2fcc536d09df..3a346827d7b9 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -289,14 +289,16 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent ) return 0; } -IMPL_LINK_NOARG(MenuBarWindow, FloatHdl) +IMPL_LINK_NOARG_TYPED(MenuBarWindow, FloatHdl, Button*, void) { - return pMenu ? static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu ) : 0; + if (pMenu) + static_cast<MenuBar*>(pMenu)->GetFloatButtonClickHdl().Call( pMenu ); } -IMPL_LINK_NOARG(MenuBarWindow, HideHdl) +IMPL_LINK_NOARG_TYPED(MenuBarWindow, HideHdl, Button*, void) { - return pMenu ? static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0; + if (pMenu) + static_cast<MenuBar*>(pMenu)->GetHideButtonClickHdl().Call( pMenu ); } void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 579e03b687f1..269651d6b12f 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -27,6 +27,8 @@ #include <vcl/toolbox.hxx> #include <vcl/window.hxx> +class Button; + /** Toolbox that holds the close button (right hand side of the menubar). This is also used by the online update check; when an update is available, it @@ -101,9 +103,9 @@ private: virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; - DECL_LINK_TYPED(CloseHdl, ToolBox *, void); - DECL_LINK(FloatHdl, void *); - DECL_LINK(HideHdl, void *); + DECL_LINK_TYPED(CloseHdl, ToolBox*, void); + DECL_LINK_TYPED(FloatHdl, Button*, void); + DECL_LINK_TYPED(HideHdl, Button*, void); DECL_LINK( ToolboxEventHdl, VclWindowEvent* ); DECL_LINK( ShowHideListener, VclWindowEvent* ); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 05db2cf5bf87..c7995ac3c90e 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -673,14 +673,14 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC mpForwardBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) ); mpBackwardBtn->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) ); - maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); + maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); maJobPage.mpSetupButton->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) ); maNUpPage.mpBorderCB->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) ); - maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); - maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); - maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); - maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); - maNUpPage.mpPagesBtn->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); + maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); + maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); + maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); + maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); + maNUpPage.mpPagesBtn->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); // setup modify hdl mpPageEdit->SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) ); maJobPage.mpCopyCountField->SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) ); @@ -1006,7 +1006,7 @@ void PrintDialog::setupOptionalUI() pVal->Value >>= bVal; maNUpPage.mpBrochureBtn->Check( bVal ); maNUpPage.mpBrochureBtn->Enable( maPController->isUIOptionEnabled( aPropertyName ) && pVal != NULL ); - maNUpPage.mpBrochureBtn->SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) ); + maNUpPage.mpBrochureBtn->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) ); maPropertyToWindowMap[ aPropertyName ].push_back( maNUpPage.mpBrochureBtn ); maControlToPropertyMap[maNUpPage.mpBrochureBtn] = aPropertyName; @@ -1546,7 +1546,13 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox ) return 0; } -IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) +IMPL_LINK( PrintDialog, ToggleHdl, void*, pButton ) +{ + ClickHdl(static_cast<Button*>(pButton)); + return 0; +} + +IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void ) { if( pButton == mpOKButton || pButton == mpCancelButton ) { @@ -1639,7 +1645,6 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) } checkControlDependencies(); } - return 0; } IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) @@ -1932,12 +1937,10 @@ void PrintProgressDialog::dispose() ModelessDialog::dispose(); } -IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton ) +IMPL_LINK_TYPED( PrintProgressDialog, ClickHdl, Button*, pButton, void ) { if( pButton == mpButton ) mbCanceled = true; - - return 0; } void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax ) diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 183b018a3983..0a0dad1ec222 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -113,9 +113,9 @@ public: void parseList( const OString& rList ); static OString processCommand( const OString& rCommand ); - DECL_LINK( ListHdl, Button* ); + DECL_LINK_TYPED( ListHdl, Button*, void ); DECL_LINK( SelectHdl, ListBox* ); - DECL_STATIC_LINK( MyWin, QuitHdl, Button* ); + DECL_STATIC_LINK_TYPED( MyWin, QuitHdl, Button*, void ); }; void Main() @@ -231,16 +231,14 @@ OString MyWin::processCommand( const OString& rCommand ) return aAnswer.makeStringAndClear(); } -IMPL_LINK( MyWin, ListHdl, Button*, ) +IMPL_LINK_NOARG_TYPED( MyWin, ListHdl, Button*, void) { parseList( processCommand( "list" ) ); - return 0; } -IMPL_STATIC_LINK( MyWin, QuitHdl, Button*, ) +IMPL_STATIC_LINK_NOARG_TYPED( MyWin, QuitHdl, Button*, void) { processCommand( "quit" ); - return 0; } IMPL_LINK( MyWin, SelectHdl, ListBox*, ) diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index e9c22eb1ab5c..4706d29f8a33 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1463,7 +1463,7 @@ class DemoWidgets : public WorkWindow VclPtr<ComboBox> mpGLCombo; VclPtr<PushButton> mpGLButton; - DECL_LINK(GLTestClick, void *); + DECL_LINK_TYPED(GLTestClick, Button*, void); public: DemoWidgets() : @@ -1554,7 +1554,7 @@ public: static void leave() { OpenGLZone::leave(); } }; -IMPL_LINK_NOARG(DemoWidgets,GLTestClick) +IMPL_LINK_NOARG_TYPED(DemoWidgets, GLTestClick, Button*, void) { sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos(); @@ -1584,8 +1584,6 @@ IMPL_LINK_NOARG(DemoWidgets,GLTestClick) if (bEnterLeave) OpenGLZoneTest::leave(); - - return 0; } class DemoPopup : public FloatingWindow diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx index 2d3a63a302fa..69f409885df4 100644 --- a/writerperfect/inc/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -43,7 +43,7 @@ private: bool m_userHasCancelled; private: DECL_LINK(DoubleClickHdl, ListBox *); - DECL_LINK(CancelHdl, void *); + DECL_LINK_TYPED(CancelHdl, Button*, void); void dispose() SAL_OVERRIDE; diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index 238df4a1c97d..4cd5b75161be 100644 --- a/writerperfect/source/common/WPFTEncodingDialog.cxx +++ b/writerperfect/source/common/WPFTEncodingDialog.cxx @@ -189,11 +189,10 @@ OUString WPFTEncodingDialog::GetEncoding() const return getEncoding(m_pLbCharset); } -IMPL_LINK_NOARG(WPFTEncodingDialog, CancelHdl) +IMPL_LINK_NOARG_TYPED(WPFTEncodingDialog, CancelHdl, Button*, void) { m_userHasCancelled=true; Close(); - return 0; } IMPL_LINK(WPFTEncodingDialog, DoubleClickHdl, ListBox *, pLb) diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 353473ca6c8d..887338c32818 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -55,7 +55,7 @@ private: bool mbInitialized; sal_uInt16 GetSelectedEntryPos() const; - DECL_LINK(ViewButtonHdl, void *); + DECL_LINK_TYPED(ViewButtonHdl, Button*, void); DECL_LINK( CertificateHighlightHdl, void* ); DECL_LINK( CertificateSelectHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 2a0134a0d5a9..b3b6de53ece5 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -129,7 +129,7 @@ private: OUString msCertOK; OUString msCertNotValidated; - DECL_LINK( ViewCertHdl, void* ); + DECL_LINK_TYPED( ViewCertHdl, Button*, void ); DECL_LINK( CertSelectHdl, void* ); void Clear(); SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index a3cdb392bb45..843d450f9cb4 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -88,13 +88,13 @@ private: bool m_bHasDocumentSignature; bool m_bWarningShowSignMacro; - DECL_LINK(ViewButtonHdl, void *); - DECL_LINK(AddButtonHdl, void *); - DECL_LINK(RemoveButtonHdl, void *); + DECL_LINK_TYPED(ViewButtonHdl, Button*, void); + DECL_LINK_TYPED(AddButtonHdl, Button*, void); + DECL_LINK_TYPED(RemoveButtonHdl, Button*, void); DECL_LINK( SignatureHighlightHdl, void* ); DECL_LINK( SignatureSelectHdl, void* ); DECL_LINK( StartVerifySignatureHdl, void* ); - DECL_LINK( OKButtonHdl, void* ); + DECL_LINK_TYPED( OKButtonHdl, Button*, void ); void ImplGetSignatureInformations(bool bUseTempStream); void ImplFillSignaturesBox(); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 1d0b18addae5..ae1bca6a2183 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -61,7 +61,7 @@ private: VclPtr<MacroSecurityTP> mpLevelTP; VclPtr<MacroSecurityTP> mpTrustSrcTP; - DECL_LINK( OkBtnHdl, void* ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); public: MacroSecurity(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext>& rxCtx, @@ -99,7 +99,7 @@ private: sal_uInt16 mnCurLevel; protected: - DECL_LINK(RadioButtonHdl, void *); + DECL_LINK_TYPED(RadioButtonHdl, Button*, void); public: MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); @@ -127,10 +127,10 @@ private: bool mbAuthorsReadonly; bool mbURLsReadonly; - DECL_LINK( ViewCertPBHdl, void* ); - DECL_LINK( RemoveCertPBHdl, void* ); - DECL_LINK( AddLocPBHdl, void* ); - DECL_LINK( RemoveLocPBHdl, void* ); + DECL_LINK_TYPED( ViewCertPBHdl, Button*, void ); + DECL_LINK_TYPED( RemoveCertPBHdl, Button*, void ); + DECL_LINK_TYPED( AddLocPBHdl, Button*, void ); + DECL_LINK_TYPED( RemoveLocPBHdl, Button*, void ); DECL_LINK( TrustCertLBSelectHdl, void* ); DECL_LINK( TrustFileLocLBSelectHdl, void* ); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 9c5e28e94b67..ab2636896da8 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -214,10 +214,9 @@ IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl) return 0; } -IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl) +IMPL_LINK_NOARG_TYPED(CertificateChooser, ViewButtonHdl, Button*, void) { ImplShowCertificateDetails(); - return 0; } void CertificateChooser::ImplShowCertificateDetails() diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 8dbd5e83f143..acc87fd943e1 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -420,7 +420,7 @@ void CertificateViewerCertPathTP::ActivatePage() } } -IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) +IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) { SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected(); if( pEntry ) @@ -431,8 +431,6 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) false ); aViewer->Execute(); } - - return 0; } IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 14bc8bd959e0..eb24163e8bb4 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl) return 0; } -IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl) +IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void) { // Export all other signatures... SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream( @@ -407,7 +407,6 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl) } EndDialog(RET_OK); - return 0; } IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl) @@ -416,16 +415,15 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl) return 0; } -IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl) +IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) { ImplShowSignaturesDetails(); - return 0; } -IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) +IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void) { if( ! canAdd()) - return 0; + return; try { uno::Reference<com::sun::star::xml::crypto::XSecurityEnvironment> xSecEnv = maSignatureHelper.GetSecurityEnvironment(); @@ -439,13 +437,13 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) if ( !xCert.is() ) { SAL_WARN( "xmlsecurity.dialogs", "no certificate selected" ); - return -1; + return; } OUString aCertSerial = xSerialNumberAdapter->toString( xCert->getSerialNumber() ); if ( aCertSerial.isEmpty() ) { OSL_FAIL( "Error in Certificate, problem with serial number!" ); - return -1; + return; } maSignatureHelper.StartMission(); @@ -525,14 +523,12 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) ImplGetSignatureInformations(true); ImplFillSignaturesBox(); } - - return 0; } -IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl) +IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) { if (!canRemove()) - return 0; + return; if( m_pSignaturesLB->FirstSelected() ) { try @@ -569,8 +565,6 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl) ImplFillSignaturesBox(); } } - - return 0; } IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl) diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index b607fa3c5ad7..5181f710b314 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -48,14 +48,12 @@ using namespace ::com::sun::star; -IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurity, OkBtnHdl, Button*, void) { mpLevelTP->ClosePage(); mpTrustSrcTP->ClosePage(); EndDialog( RET_OK ); - - return 0; } MacroSecurity::MacroSecurity( vcl::Window* _pParent, @@ -184,7 +182,7 @@ void MacroSecurityLevelTP::dispose() MacroSecurityTP::dispose(); } -IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurityLevelTP, RadioButtonHdl, Button*, void) { sal_uInt16 nNewLevel = 0; if( m_pVeryHighRB->IsChecked() ) @@ -199,8 +197,6 @@ IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl) mnCurLevel = nNewLevel; mpDlg->EnableReset(); } - - return 0; } void MacroSecurityLevelTP::ClosePage() @@ -219,7 +215,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons() } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, void) { if( m_pTrustCertLB->FirstSelected() ) { @@ -242,10 +238,9 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl) aViewer->Execute(); } } - return 0; } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, void) { if( m_pTrustCertLB->FirstSelected() ) { @@ -255,11 +250,9 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl) FillCertLB(); ImplCheckButtons(); } - - return 0; } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) { try { @@ -269,7 +262,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) short nRet = xFolderPicker->execute(); if( ui::dialogs::ExecutableDialogResults::OK != nRet ) - return 0; + return; OUString aPathStr = xFolderPicker->getDirectory(); INetURLObject aNewObj( aPathStr ); @@ -295,11 +288,9 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) { SAL_WARN( "xmlsecurity.dialogs", "MacroSecurityTrustedSourcesTP::AddLocPBHdl(): exception from folder picker" ); } - - return 0; } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void) { sal_Int32 nSel = m_pTrustFileLocLB->GetSelectEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) @@ -316,8 +307,6 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl) } ImplCheckButtons(); } - - return 0; } IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl) |