diff options
162 files changed, 374 insertions, 466 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index c97480b1132c..81351a3aeba3 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -234,7 +234,7 @@ protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE; DECL_LINK_TYPED( ButtonHdl, Button *, void ); - DECL_LINK(TreeListHdl, void *); + DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void); DECL_LINK_TYPED( implEndDragHdl, HeaderBar *, void ); DECL_LINK_TYPED( EditAccHdl, Accelerator *, void ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 5de9144aeb87..95924e329404 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1790,13 +1790,11 @@ IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void ) pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH); } -IMPL_LINK_NOARG(WatchWindow, TreeListHdl) +IMPL_LINK_NOARG_TYPED(WatchWindow, TreeListHdl, SvTreeListBox*, void) { SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry(); if ( pCurEntry && pCurEntry->GetUserData() ) aXEdit->SetText( static_cast<WatchItem*>(pCurEntry->GetUserData())->maName ); - - return 0; } IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void ) diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index d085c0227cc6..bed7a622690b 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -482,7 +482,7 @@ IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl) return 0; } -IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void ) { // Is also called if deselected! // Two function calls in every SelectHdl because @@ -493,17 +493,16 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox ) UpdateFields(); CheckButtons(); } - return 0; } -IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void ) { // Is also called if deselected! // Two function calls in every SelectHdl because // there's no separate DeselectHDL. // So find out if select or deselect: if ( !pBox->IsSelected( pBox->GetHdlEntry() ) ) - return 0; + return; SbModule* pModule = m_pBasicBox->FindModule( m_pBasicBox->GetCurEntry() ); @@ -547,7 +546,6 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox ) UpdateFields(); CheckButtons(); - return 0; } diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index bbb4e2811201..c16d7d18b0c1 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -67,9 +67,9 @@ private: Mode nMode; - DECL_LINK( MacroSelectHdl, SvTreeListBox * ); + DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void ); DECL_LINK(MacroDoubleClickHdl, void *); - DECL_LINK( BasicSelectHdl, SvTreeListBox * ); + DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void ); DECL_LINK( EditModifyHdl, Edit * ); DECL_LINK_TYPED( ButtonHdl, Button *, void ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 4f56a1a5aaef..bc0d1ff5abcd 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -605,16 +605,14 @@ void LibPage::DeactivatePage() { } -IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void ) { if ( pBox->IsSelected( pBox->GetHdlEntry() ) ) CheckButtons(); - return 0; } -IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, pBox ) +IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, /*pBox*/ ) { - (void)pBox; SetCurLib(); CheckButtons(); return 0; diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 545e178d2e8f..0403038aa33c 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -684,13 +684,12 @@ void ObjectPage::CheckButtons() m_pDelButton->Disable(); } -IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, TreeListBox *, pBox ) +IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void ) { if ( !pBox->IsSelected( pBox->GetHdlEntry() ) ) - return 0; + return; CheckButtons(); - return 0; } IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void ) diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index b4505b32ee28..1c56dced5993 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -190,7 +190,7 @@ protected: VclPtr<PushButton> m_pNewDlgButton; VclPtr<PushButton> m_pDelButton; - DECL_LINK( BasicBoxHighlightHdl, TreeListBox * ); + DECL_LINK_TYPED( BasicBoxHighlightHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( ButtonHdl, Button *, void ); void CheckButtons(); bool GetSelection( ScriptDocument& rDocument, OUString& rLibName ); @@ -229,7 +229,7 @@ protected: ScriptDocument m_aCurDocument; LibraryLocation m_eCurLocation; - DECL_LINK( TreeListHighlightHdl, SvTreeListBox * ); + DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void ); DECL_LINK( BasicSelectHdl, ListBox * ); DECL_LINK_TYPED( ButtonHdl, Button *, void ); DECL_LINK( CheckPasswordHdl, SvxPasswordDialog * ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 9c7bc8bdff74..7925d7cfeafb 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -533,7 +533,7 @@ void DataSourceTabPage::updateControlState() isValid(); } -IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void) { m_rDialogModel.startControllerLockTimer(); if( m_pLB_SERIES->FirstSelected()) @@ -542,11 +542,9 @@ IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl) RoleSelectionChangedHdl( 0 ); } updateControlState(); - - return 0; } -IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) +IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void) { m_rDialogModel.startControllerLockTimer(); SvTreeListEntry * pEntry = m_pLB_ROLE->FirstSelected(); @@ -568,8 +566,6 @@ IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) m_pEDT_RANGE->SetText( aSelectedRange ); isValid(); } - - return 0; } IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 92f8db40541b..bb465321f220 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -73,8 +73,8 @@ protected: virtual void initializePage() SAL_OVERRIDE; - DECL_LINK( SeriesSelectionChangedHdl, void* ); - DECL_LINK( RoleSelectionChangedHdl, void* ); + DECL_LINK_TYPED( SeriesSelectionChangedHdl, SvTreeListBox*, void ); + DECL_LINK_TYPED( RoleSelectionChangedHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( MainRangeButtonClickedHdl, Button*, void ); DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void ); DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void ); diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 5633b8505db7..7bfc2990a2aa 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1088,7 +1088,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, ChangeHdl, Button*, void) sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1; m_pEntriesBox->SetEntryText(sLabel, nPos, nCol); - ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); + m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) @@ -1102,10 +1102,10 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RemoveHdl, Button*, void) m_pEntriesBox->SetEntryText( OUString(), nPos, nCol ); (pEntry->m_sCommand).clear(); - ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); + m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } -IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) +IMPL_LINK_TYPED( SfxAcceleratorConfigPage, SelectHdl, SvTreeListBox*, pListBox, void ) { // disable help Help::ShowBalloon( this, Point(), OUString() ); @@ -1189,8 +1189,6 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) m_pEntriesBox->MakeVisible( pE3 ); } } - - return 0; } IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) @@ -1222,7 +1220,7 @@ IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, RadioHdl, Button*, void) if ( pEntry ) m_pGroupLBox->Select( pEntry ); - ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox ); + m_pFunctionBox->GetSelectHdl().Call( m_pFunctionBox ); } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index a0924cecdb2f..d6654a8e0356 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2272,13 +2272,9 @@ void SvxMenuConfigPage::dispose() SvxConfigPage::dispose(); } -IMPL_LINK( SvxMenuConfigPage, SelectMenuEntry, Control *, pBox ) +IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenuEntry, SvTreeListBox *, void ) { - (void)pBox; - UpdateButtonStates(); - - return 1; } void SvxMenuConfigPage::UpdateButtonStates() @@ -2710,11 +2706,9 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK( SvxMainMenuOrganizerDialog, SelectHdl, Control*, pCtrl ) +IMPL_LINK_NOARG_TYPED( SvxMainMenuOrganizerDialog, SelectHdl, SvTreeListBox*, void ) { - (void)pCtrl; UpdateButtonStates(); - return 1; } void SvxMainMenuOrganizerDialog::UpdateButtonStates() @@ -4268,11 +4262,9 @@ bool ToolbarSaveInData::LoadToolbar( return true; } -IMPL_LINK( SvxToolbarConfigPage, SelectToolbarEntry, Control *, pBox ) +IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, SelectToolbarEntry, SvTreeListBox *, void ) { - (void)pBox; UpdateButtonStates(); - return 1; } void SvxToolbarConfigPage::UpdateButtonStates() diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 92008bb39f10..1807da6ce0f9 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -572,21 +572,20 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents) } // select event handler on the listbox -IMPL_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, ) +IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); - SvTreeListEntry* pE = rListBox.FirstSelected(); - sal_uLong nPos; + SvTreeListEntry* pE = rListBox.FirstSelected(); + sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) { DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" ); - return 0; + return; } EnableButtons(); - return 0; } IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void ) diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 3aacad8f595a..0a4c29b944bf 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -936,7 +936,7 @@ void SvxScriptSelectorDialog::dispose() ModelessDialog::dispose(); } -IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, Control*, pCtrl ) +IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void ) { if (pCtrl == m_pCategories) { @@ -947,7 +947,6 @@ IMPL_LINK( SvxScriptSelectorDialog, SelectHdl, Control*, pCtrl ) m_pCommands->FunctionSelected(); } UpdateUI(); - return 0; } IMPL_LINK( SvxScriptSelectorDialog, FunctionDoubleClickHdl, Control*, pCtrl ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 789c3fa235c5..5144fddf3794 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1015,14 +1015,12 @@ namespace svx EndDialog( RET_OK ); } - IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DictsLB_SelectHdl) + IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, DictsLB_SelectHdl, SvTreeListBox*, void) { bool bSel = m_pDictsLB->FirstSelected() != NULL; m_pEditPB->Enable(bSel); m_pDeletePB->Enable(bSel); - - return 0; } IMPL_LINK_NOARG_TYPED(HangulHanjaOptionsDialog, NewDictHdl, Button*, void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index d59c11587c57..685f9de6a061 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -164,7 +164,7 @@ void SvBaseLinksDlg::dispose() /************************************************************************* |* SvBaseLinksDlg::Handler() *************************************************************************/ -IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) +IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, void ) { sal_uLong nSelectionCount = pSvTabListBox ? pSvTabListBox->GetSelectionCount() : 0; @@ -212,7 +212,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) sal_uLong nPos; SvBaseLink* pLink = GetSelEntry( &nPos ); if( !pLink ) - return 0; + return; m_pPbUpdateNow->Enable(); @@ -245,7 +245,6 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) m_pFtFullSourceName->SetText( sLink ); m_pFtFullTypeName->SetText( sType ); } - return 0; } IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox ) diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 446d5d78a688..2a66dae2a47d 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -41,13 +41,12 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; -IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) { sal_uLong nCount = m_pRadioLB->GetEntryCount(); bool bIsSelected = m_pRadioLB->FirstSelected() != NULL; bool bEnable = nCount > 1; m_pDelBtn->Enable(bEnable && bIsSelected); - return 0; } IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl) @@ -59,13 +58,14 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl) return 0; } -IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox ) +IMPL_LINK_TYPED( SvxMultiPathDialog, CheckHdl_Impl, SvTreeListBox*, pBox, void ) { SvTreeListEntry* pEntry = - pBox ? pBox->GetEntry( pBox->GetCurMousePoint() ) : m_pRadioLB->FirstSelected(); + pBox + ? pBox->GetEntry( static_cast<svx::SvxRadioButtonListBox*>(pBox)->GetCurMousePoint() ) + : m_pRadioLB->FirstSelected(); if ( pEntry ) m_pRadioLB->HandleEntryChecked( pEntry ); - return 0; } IMPL_LINK_NOARG_TYPED(SvxMultiPathDialog, AddHdl_Impl, Button*, void) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 734fae986b07..f689b51618ad 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -508,7 +508,7 @@ SvxScriptOrgDialog::~SvxScriptOrgDialog() void SvxScriptOrgDialog::dispose() { // clear the SelectHdl so that it isn't called during the dtor - m_pScriptsBox->SetSelectHdl( Link<>() ); + m_pScriptsBox->SetSelectHdl( Link<SvTreeListBox*,void>() ); m_pScriptsBox.clear(); m_pRunButton.clear(); m_pCloseButton.clear(); @@ -624,11 +624,11 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node ) } } -IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox, void ) { if ( !pBox->IsSelected( pBox->GetHdlEntry() ) ) { - return 0; + return; } SvTreeListEntry* pEntry = pBox->GetHdlEntry(); @@ -636,7 +636,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) SFEntry* userData = 0; if ( !pEntry ) { - return 0; + return; } userData = static_cast<SFEntry*>(pEntry->GetUserData()); @@ -646,8 +646,6 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox ) node = userData->GetNode(); CheckButtons( node ); } - - return 0; } IMPL_LINK_TYPED( SvxScriptOrgDialog, ButtonHdl, Button *, pButton, void ) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 5dcf4e3281c9..697a8ebbe532 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -396,7 +396,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox ) return 0; } -IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void ) { SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) @@ -410,7 +410,6 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pB } m_pReplaceEdit->SetText( aStr ); } - return 0; } IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index ba7fc27e559f..df4b62dcd42a 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -149,7 +149,7 @@ private: DECL_LINK_TYPED(ChangeHdl, Button *, void); DECL_LINK_TYPED(RemoveHdl, Button *, void); - DECL_LINK( SelectHdl, Control * ); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED(Save, Button *, void); DECL_LINK_TYPED(Load, Button *, void); DECL_LINK_TYPED(Default, Button *, void); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 2261a5824cfa..1ad068dcf41b 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -160,7 +160,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK(SelectHdl, OfaACorrCheckListBox*); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(EditHdl, Button*, void); DECL_LINK(DoubleClickEditHdl, void*); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -252,7 +252,7 @@ private: bool bReplaceEditChanged:1; bool bSWriter:1; - DECL_LINK(SelectHdl, SvTabListBox*); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelHdl, Button*, void); DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); @@ -506,7 +506,7 @@ private: Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK(SelectHdl, void *); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); public: /// construction via Create() diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index f73b6349e14b..e036f1c5cb46 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -441,7 +441,7 @@ class SvxMenuConfigPage : public SvxConfigPage private: DECL_LINK( SelectMenu, ListBox * ); - DECL_LINK( SelectMenuEntry, Control * ); + DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void ); DECL_LINK_TYPED( NewMenuHdl, Button *, void ); DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); @@ -484,7 +484,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog DECL_LINK_TYPED( MoveHdl, Button *, void ); DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK( SelectHdl, Control* ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); public: SvxMainMenuOrganizerDialog ( @@ -533,7 +533,7 @@ class SvxToolbarConfigPage : public SvxConfigPage private: DECL_LINK( SelectToolbar, ListBox * ); - DECL_LINK( SelectToolbarEntry, Control * ); + DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void ); DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 879b6cd765eb..23d4bc638ed9 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -57,7 +57,7 @@ namespace svx DECL_LINK_TYPED( DeleteHdl, Button*, void ); DECL_LINK(PathBoxDoubleClickHdl, void *); - DECL_LINK(PathSelect_Impl, void *); + DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index ca8fadfd0a2a..5598a59d4773 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -211,7 +211,7 @@ namespace svx css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK( DictsLB_SelectHdl, void* ); + DECL_LINK_TYPED( DictsLB_SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( NewDictHdl, Button*, void ); DECL_LINK_TYPED( EditDictHdl, Button*, void ); DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 9af5b0dacb01..beffb1cadf5a 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -64,7 +64,7 @@ class SvBaseLinksDlg : public ModalDialog bool bHtmlMode; Idle aUpdateIdle; - DECL_LINK( LinksSelectHdl, SvTabListBox * ); + DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void ); DECL_LINK( LinksDoubleClickHdl, SvTabListBox * ); DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); DECL_LINK_TYPED( ManualClickHdl, Button *, void ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 3fb037e5f0cb..5d99c58149d6 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -29,15 +29,15 @@ class _SfxMacroTabPage; class SvTabListBox; - +class SvTreeListBox; class _SfxMacroTabPage_Impl; class _SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_DLLPRIVATE_LINK( SelectEvent_Impl, SvTabListBox * ); - DECL_DLLPRIVATE_LINK( SelectGroup_Impl, ListBox * ); - DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * ); + DECL_DLLPRIVATE_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * ); DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index de7d4a70825d..bf19996bbd99 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -33,6 +33,8 @@ #include <unordered_map> #include <vector> +class SvTreeListBox; + typedef std::unordered_map< OUString, std::pair< OUString, OUString >, OUStringHash, std::equal_to< OUString > > EventsHash; @@ -57,7 +59,7 @@ class _SvxMacroTabPage_Impl; class _SvxMacroTabPage : public SfxTabPage { - DECL_LINK( SelectEvent_Impl, SvTabListBox * ); + DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * ); diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 566974177943..5415fb23a0ad 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -45,8 +45,8 @@ private: 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*); + DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); public: SvxMultiPathDialog(vcl::Window* pParent); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index f2a72c1d7088..87a8e1ddd2ce 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -154,6 +154,7 @@ private: DECL_LINK( LostFocusHdl_Impl, Edit* ); DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); DECL_LINK( SelFormatHdl_Impl, void * ); + DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); DECL_LINK( EditHdl_Impl, Edit* ); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index b8028ca9146a..17226165297d 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -131,7 +131,7 @@ private: DECL_LINK(SelectBookHdl_Impl, void *); DECL_LINK(SelectLangHdl_Impl, void *); - DECL_LINK(SelectHdl, SvTabListBox*); + DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); 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 36ae80a2d074..d3768a44f0d6 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -74,13 +74,13 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - DECL_LINK(SelectHdl_Impl, SvxCheckListBox *); + DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, 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_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); + DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); DECL_LINK(OpenURLHdl_Impl, void *); public: @@ -137,12 +137,12 @@ private: void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); + DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK_TYPED(PostDblClickHdl_Impl, void *, void); - DECL_LINK(OpenURLHdl_Impl, void *); + DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void); + DECL_LINK( OpenURLHdl_Impl, void *); void UpdateModulesBox_Impl(); void UpdateDicBox_Impl(); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 384a89ec0e97..fcce075ea686 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -57,7 +57,7 @@ private: DECL_LINK(DoubleClickPathHdl_Impl, void *); DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); - DECL_LINK(PathSelect_Impl, void *); + DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9224bb6d2494..1d77c270571a 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -156,7 +156,7 @@ protected: const OUString m_renameDupStr; const OUString m_renameErrTitleStr; - DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); + DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void ); 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 ff7e5f21a731..c88e47286747 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -185,7 +185,7 @@ class SvxScriptSelectorDialog : public ModelessDialog Link<> m_aAddHdl; DECL_LINK_TYPED( ClickHdl, Button *, void ); - DECL_LINK( SelectHdl, Control* ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK( FunctionDoubleClickHdl, Control* ); void UpdateUI(); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index af209a197a7d..2a6b5c5ce245 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -146,7 +146,7 @@ public: DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); DECL_LINK( LanguageHdl_Impl, ListBox * ); DECL_LINK( WordSelectHdl_Impl, ComboBox * ); - DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); + DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 08a7d2fb1b7e..a1c7a363a052 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -183,8 +183,8 @@ private: void InsertNodes( const VectorOfNodes& rNodeList ); protected: - DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* ); - DECL_LINK(ShowPageHdl_Impl, void *); + DECL_STATIC_LINK_TYPED(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED(ShowPageHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED(BackHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index e0e6866e18e1..08be91f1fb71 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -161,13 +161,12 @@ void CertPathDialog::dispose() ModalDialog::dispose(); } -IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvSimpleTable *, pList ) +IMPL_LINK_TYPED( CertPathDialog, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pCertPathList->GetEntry(m_pCertPathList->GetCurMousePoint()) : m_pCertPathList->FirstSelected(); if (pEntry) m_pCertPathList->HandleEntryChecked(pEntry); - return 0; } void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry ) diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 510c1529efc2..4136f3b89f01 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -26,7 +26,7 @@ private: OUString m_sAddDialogText; OUString m_sManual; - DECL_LINK(CheckHdl_Impl, SvSimpleTable *); + DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED(AddHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index c3e7ccdcc8d3..eec02b8bd7b3 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -376,7 +376,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) +IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathSelect_Impl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pPathBox->FirstSelected(); @@ -389,7 +389,6 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) m_pEdit->Enable( !bReadOnly ); m_pDelete->Enable( !bReadOnly ); - return 0; } void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly ) diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 3d5c9f978c3d..1967ab3ed09c 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -91,7 +91,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl)); Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl)); - m_pCheckLB->SetSelectHdl(aLink); + m_pCheckLB->SetSelectHdl(LINK(this, SvxFontSubstTabPage, TreeListBoxSelectHdl)); m_pUseTableCB->SetClickHdl(aClickLink); m_pFont1CB->SetSelectHdl(aLink); m_pFont1CB->SetModifyHdl(aLink); @@ -261,7 +261,10 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, ClickHdl, Button*, pButton, void) { SelectHdl(pButton); } - +IMPL_LINK_TYPED(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButton, void) +{ + SelectHdl(pButton); +} IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) { if (pWin == m_pApply || pWin == m_pDelete) diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index f82330bba6d5..7aae90361019 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -83,6 +83,7 @@ class SvxFontSubstTabPage : public SfxTabPage DECL_LINK(SelectHdl, vcl::Window *); DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NonPropFontsHdl, Button*, void); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index c4676a1446b9..d049e93cb56c 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -920,7 +920,7 @@ void CuiAboutConfigTabPage::InsertEntry( SvTreeListEntry *pEntry) m_pPrefBox->Expand( pParentEntry ); } -IMPL_LINK_NOARG( CuiAboutConfigTabPage, ExpandingHdl_Impl ) +IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ExpandingHdl_Impl, SvTreeListBox*, bool ) { SvTreeListEntry* pEntry = m_pPrefBox->GetHdlEntry(); @@ -938,7 +938,7 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, ExpandingHdl_Impl ) } } - return 1; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 35fdd5559c41..047d267e52b3 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -65,7 +65,7 @@ private: DECL_LINK( DoubleClickHdl_Impl, void* ); DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void ); DECL_LINK_TYPED( SearchHdl_Impl, Button*, void ); - DECL_LINK( ExpandingHdl_Impl, void* ); + DECL_LINK_TYPED( ExpandingHdl_Impl, SvTreeListBox*, bool ); public: explicit CuiAboutConfigTabPage(vcl::Window* pParent); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 9b3e949a6fa2..dc0b99b1af0d 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -565,7 +565,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) -IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) +IMPL_LINK_TYPED(SvxEditDictionaryDialog, SelectHdl, SvTreeListBox*, pBox, void) { if(!bDoNothing) { @@ -587,7 +587,6 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) pNewReplacePB->Enable(false); pDeletePB->Enable( true && !IsDicReadonly_Impl() ); } - return 0; }; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 3d6320ce433a..8c805b8f6871 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -245,18 +245,17 @@ IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void) -IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList ) +IMPL_LINK_TYPED( SvxJavaOptionsPage, CheckHdl_Impl, SvTreeListBox*, pList, void ) { SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() ) : m_pJavaList->FirstSelected(); if ( pEntry ) m_pJavaList->HandleEntryChecked( pEntry ); - return 0; } -IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, SelectHdl_Impl, SvTreeListBox*, void) { // set installation directory info SvTreeListEntry* pEntry = m_pJavaList->FirstSelected(); @@ -267,7 +266,6 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) if ( pLocation ) sInfo += *pLocation; m_pJavaPathText->SetText(sInfo); - return 0; } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 1cb35fe665a4..c4f9602ca428 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -85,8 +85,8 @@ private: css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; DECL_LINK_TYPED( EnableHdl_Impl, Button*, void); - DECL_LINK( CheckHdl_Impl, SvSimpleTable * ); - DECL_LINK( SelectHdl_Impl, void *); + DECL_LINK_TYPED( CheckHdl_Impl, SvTreeListBox*, void ); + DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( AddHdl_Impl, Button*, void); DECL_LINK_TYPED( ParameterHdl_Impl, Button*, void); DECL_LINK_TYPED( ClassPathHdl_Impl, Button*, void); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index b855be3d6de9..307cdcdf67d1 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1550,7 +1550,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl) -IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void ) { if (pBox == m_pLinguModulesCLB) { @@ -1576,7 +1576,6 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) } } } - return 0; } @@ -1761,7 +1760,7 @@ IMPL_LINK_TYPED( SvxLinguTabPage, ClickHdl_Impl, Button *, pBtn, void ) -IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_LINK_TYPED( SvxLinguTabPage, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pLinguModulesCLB == pBox) { @@ -1791,8 +1790,6 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) { OSL_FAIL( "pBox unexpected value" ); } - - return 0; } @@ -1948,7 +1945,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol return pEntry; } -IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_LINK_TYPED( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) { if (m_pModulesCLB == pBox) { @@ -1960,7 +1957,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) ModuleUserData_Impl* pData = static_cast<ModuleUserData_Impl*>(pEntry->GetUserData()); if(!pData->IsParent() && pData->GetType() != TYPE_HYPH) { - sal_uLong nCurPos = pBox->GetSelectEntryPos(); + sal_uLong nCurPos = static_cast<SvxCheckListBox*>(pBox)->GetSelectEntryPos(); if(nCurPos < pBox->GetEntryCount() - 1) { bDisableDown = static_cast<ModuleUserData_Impl*>(pBox-> @@ -1980,15 +1977,13 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { OSL_FAIL( "pBox unexpected value" ); } - - return 0; } IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ) { BoxCheckButtonHdl_Impl(NULL); } -IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, /*pBox*/ ) +IMPL_LINK_NOARG_TYPED( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, void ) { SvTreeListEntry *pCurEntry = m_pModulesCLB->GetCurEntry(); if (pCurEntry) @@ -2014,7 +2009,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, /*pBox*/ } } } - return 0; } IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 7bddba3e8341..eb0037d965e6 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -381,7 +381,7 @@ void SvxPathTabPage::FillUserData() -IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) +IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathSelect_Impl, SvTreeListBox*, void) { sal_uInt16 nSelCount = 0; SvTreeListEntry* pEntry = pPathBox->FirstSelected(); @@ -399,7 +399,6 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) m_pPathBtn->Enable( 1 == nSelCount && bEnable); m_pStandardBtn->Enable( nSelCount > 0 && bEnable); - return 0; } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index e83351f80191..f386c7c423b3 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -651,10 +651,9 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName, return nRet - 1; } -IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl) +IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, ShowPageHdl_Impl, SvTreeListBox*, void) { SelectHdl_Impl(); - return 0; } IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, BackHdl_Impl, Button*, void) @@ -726,8 +725,8 @@ IMPL_LINK_NOARG_TYPED(OfaTreeOptionsDialog, OKHdl_Impl, Button*, void) } // an opened group shall be completely visible -IMPL_STATIC_LINK( - OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) +IMPL_STATIC_LINK_TYPED( + OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox, void ) { pBox->Update(); pBox->InitStartEntry(); @@ -758,7 +757,6 @@ IMPL_STATIC_LINK( } } } - return 0; } void OfaTreeOptionsDialog::ApplyItemSets() diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 1d7301fb128b..d575601d3df7 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -294,7 +294,7 @@ IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, ChangePasswordHdl, Button*, void) } -IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) +IMPL_LINK_NOARG_TYPED(WebConnectionInfoDialog, EntrySelectedHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( !pEntry ) @@ -311,8 +311,6 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) sal_Int32 nPos = (sal_Int32)reinterpret_cast<sal_IntPtr>(pEntry->GetUserData()); m_pChangeBtn->Enable( nPos < m_nPos ); } - - return 0; } diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index a9b8de1834ec..f7ed38ed8e03 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -54,7 +54,7 @@ namespace svx DECL_LINK_TYPED( RemovePasswordHdl, Button*, void ); DECL_LINK_TYPED( RemoveAllPasswordsHdl, Button*, void ); DECL_LINK_TYPED( ChangePasswordHdl, Button*, void ); - DECL_LINK( EntrySelectedHdl, void* ); + DECL_LINK_TYPED( EntrySelectedHdl, SvTreeListBox*, void ); void FillPasswordList(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index b5aa5bdc48de..009c5e7b947d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -717,10 +717,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* ) m_pCheckLB->SetUpdateMode(true); } -IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox) +IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) { m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData()); - return 0; } IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl) @@ -1150,7 +1149,7 @@ void OfaAutocorrReplacePage::SetLanguage(LanguageType eSet) } } -IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) +IMPL_LINK_TYPED(OfaAutocorrReplacePage, SelectHdl, SvTreeListBox*, pBox, void) { if(!bFirstSelect || !bHasSelectionText) { @@ -1180,7 +1179,6 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox) m_pNewReplacePB->Enable(false); m_pDeleteReplacePB->Enable(); - return 0; }; void OfaAutocorrReplacePage::NewEntry(const OUString& sShort, const OUString& sLong, bool bKeepSourceFormatting) @@ -2622,10 +2620,10 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl) /** Handler for the list box */ -IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) +IMPL_LINK_NOARG_TYPED(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void) { if ( m_pSmartTagTypesLB->GetEntryCount() < 1 ) - return 0; + return; const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos(); const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos); @@ -2638,8 +2636,6 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) m_pPropertiesPB->Enable( true ); else m_pPropertiesPB->Enable( false ); - - return 0; } /** Propagates the current settings to the smart tag manager. diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index cfa8eecc4e55..153ce47b39e4 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -261,7 +261,7 @@ bool _SfxMacroTabPage::IsReadOnly() const return mpImpl->bReadOnly; } -IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, ) +IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -270,15 +270,14 @@ IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, ) ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) { DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" ); - return 0; + return; } ScriptChanged(); EnableButtons(); - return 0; } -IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, ) +IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void) { mpImpl->pGroupLB->GroupSelected(); const OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI(); @@ -288,13 +287,11 @@ IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, ) mpImpl->pMacroFrame->set_label( aLabelText ); EnableButtons(); - return 0; } -IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, ) +IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) { EnableButtons(); - return 0; } IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 173ca19d0e7e..8308d2e3e46f 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -338,7 +338,7 @@ void SvxNumberFormatTabPage::Init_Impl() Link<> aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl ); m_pLbCategory->SetSelectHdl( aLink ); - m_pLbFormat->SetSelectHdl( aLink ); + m_pLbFormat->SetSelectHdl( LINK( this, SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl ) ); m_pLbLanguage->SetSelectHdl( aLink ); m_pLbCurrency->SetSelectHdl( aLink ); m_pCbSourceFormat->SetClickHdl( LINK( this, SvxNumberFormatTabPage, SelFormatClickHdl_Impl ) ); @@ -1194,6 +1194,10 @@ IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatClickHdl_Impl, Button*, pLb, v { SelFormatHdl_Impl(pLb); } +IMPL_LINK_TYPED( SvxNumberFormatTabPage, SelFormatListBoxHdl_Impl, SvTreeListBox*, pLb, void ) +{ + SelFormatHdl_Impl(pLb); +} IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb ) { if (pLb == m_pCbSourceFormat) diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index df30a5eef519..ebca1a143ee0 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -440,12 +440,11 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId) } -IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/) +IMPL_LINK_NOARG_TYPED(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry(); if ( pEntry ) m_aHelpText->SetText( ModuleRes( static_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) ); - return 1L; } void OTasksWindow::Resize() diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index bf578274c483..ec25f2c0e326 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -117,7 +117,7 @@ namespace dbaui VclPtr<FixedLine> m_aFL; VclPtr<OApplicationDetailView> m_pDetailView; - DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void ); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 575af56e9b00..8b0e43725597 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -435,10 +435,9 @@ IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl ) return 0L; // not handled } -IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl ) +IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void ) { m_pAddButton->Enable( m_xCurrentList->isLeafSelected() ); - return 0; } IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void ) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 1189f79f9a0c..994fd81eb30b 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -311,7 +311,7 @@ public: } protected: - DECL_LINK(OnExceptionSelected, void*); + DECL_LINK_TYPED(OnExceptionSelected, SvTreeListBox*, void); }; OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions) @@ -366,7 +366,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti } } -IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) +IMPL_LINK_NOARG_TYPED(OExceptionChainDialog, OnExceptionSelected, SvTreeListBox*, void) { SvTreeListEntry* pSelected = m_pExceptionList->FirstSelected(); OSL_ENSURE(!pSelected || !m_pExceptionList->NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?"); @@ -401,8 +401,6 @@ IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) } m_pExceptionText->SetText(sText); - - return 0L; } // SQLMessageBox_Impl diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index f67f8333482a..1cdfa11681a2 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -93,7 +93,7 @@ namespace dbaui m_pTablesList->Clear(); - m_pTablesList->SetCheckButtonHdl(LINK(this, OTableSubscriptionPage, OnTreeEntryChecked)); + m_pTablesList->SetCheckButtonHdl(LINK(this, OTableSubscriptionPage, OnTreeEntryButtonChecked)); m_pTablesList->SetCheckHandler(LINK(this, OTableSubscriptionPage, OnTreeEntryChecked)); } @@ -398,6 +398,10 @@ namespace dbaui return nResult; } + IMPL_LINK_NOARG_TYPED( OTableSubscriptionPage, OnTreeEntryButtonChecked, SvTreeListBox*, void ) + { + callModifiedHdl(); + } IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl ) { return OnControlModified(static_cast<Button*>(_pControl)); diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 6913f27224b3..eb56894e750c 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -66,6 +66,7 @@ namespace dbaui DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); DECL_LINK( OnTreeEntryChecked, Control* ); + DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void ); private: diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index f4119bed01cd..bcc63c59ac46 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -68,8 +68,8 @@ namespace dbaui 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* ); + DECL_LINK_TYPED( TableListClickHdl, SvTreeListBox*, void ); + DECL_LINK_TYPED( TableListRightSelectHdl, SvTreeListBox*, void ); public: virtual void Reset ( ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 855853bd1d95..e265bbce3674 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -73,7 +73,7 @@ namespace dbaui DECL_LINK_TYPED( AddClickHdl, Button*, void ); DECL_LINK_TYPED( CloseClickHdl, Button*, void); DECL_LINK( TableListDoubleClickHdl, void* ); - DECL_LINK( TableListSelectHdl, void* ); + DECL_LINK_TYPED( TableListSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( OnTypeSelected, Button*, void ); public: diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index f007eda758ff..9fb7ad10ff64 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -254,7 +254,7 @@ IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void } } -IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl ) +IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if(pEntry) @@ -284,11 +284,9 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl ) } } } - - return 0; } -IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl ) +IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox*, void ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if(pEntry) @@ -318,8 +316,6 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl ) } } } - - return 0; } IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 40292a922ac8..bb2d84f466cc 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1148,7 +1148,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, -IMPL_LINK_NOARG(UpdateDialog, selectionHandler) +IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void) { OUStringBuffer b; UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( @@ -1244,7 +1244,6 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler) b.append( m_noDescription ); showDescription( b.makeStringAndClear() ); - return 0; } IMPL_LINK_NOARG(UpdateDialog, allHandler) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 610497fd1721..81dd5ce4c4f0 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -159,7 +159,7 @@ private: ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const OUString& rDescription); - DECL_LINK(selectionHandler, void *); + DECL_LINK_TYPED(selectionHandler, SvTreeListBox*, void); DECL_LINK(allHandler, void *); DECL_LINK_TYPED(okHandler, Button*, void); DECL_LINK_TYPED(closeHandler, Button*, void); diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 02dbf3b2f17b..2f2b83ad8eca 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -240,7 +240,7 @@ namespace pcr } - IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB) + IMPL_LINK_TYPED(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void) { DBG_ASSERT(pLB == m_pControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?"); (void)pLB; @@ -253,8 +253,6 @@ namespace pcr m_pNoAssignment->SetClickHdl(Link<Button*,void>()); m_pNoAssignment->Check(pData == NULL); m_pNoAssignment->SetClickHdl(LINK(this, OSelectLabelDialog, OnNoAssignmentClicked)); - - return 0L; } @@ -286,8 +284,8 @@ namespace pcr if (m_pLastSelected) { - m_pControlTree->SetSelectHdl(Link<>()); - m_pControlTree->SetDeselectHdl(Link<>()); + m_pControlTree->SetSelectHdl(Link<SvTreeListBox*,void>()); + m_pControlTree->SetDeselectHdl(Link<SvTreeListBox*,void>()); m_pControlTree->Select(m_pLastSelected, !m_pNoAssignment->IsChecked()); m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 146381112358..ee3bf66bc331 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -65,7 +65,7 @@ namespace pcr protected: sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry); - DECL_LINK(OnEntrySelected, SvTreeListBox*); + DECL_LINK_TYPED(OnEntrySelected, SvTreeListBox*, void); DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void); }; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 4895bd7cbfcf..4d245941ab74 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -712,7 +712,7 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox ) return 0; } -IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox ) +IMPL_LINK_TYPED( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void ) { if( pBox == mpOptionBox && Sane::IsSane() ) { @@ -778,7 +778,6 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox ) } } } - return 0; } IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit ) diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 602bace9bea9..2854da5d4d29 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -84,7 +84,7 @@ private: DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( ModifyHdl, Edit* ); DECL_LINK( ReloadSaneOptionsHdl, Sane* ); - DECL_LINK( OptionsBoxSelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( OptionsBoxSelectHdl, SvTreeListBox*, void ); void SaveState(); bool LoadState(); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 88f148e84cbc..34a9e7585fcf 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -160,10 +160,9 @@ IMPL_LINK_TYPED(XMLFilterSettingsDialog, ClickHdl_Impl, Button *, pButton, void m_bIsClosable = true; } -IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl) +IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeListBox*, void) { updateStates(); - return 0; } IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl) @@ -1439,10 +1438,9 @@ void XMLFilterListBox::Paint(vcl::RenderContext& rRenderContext, const Rectangle SvTabListBox::Paint(rRenderContext, rRect); } -IMPL_LINK( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTabListBox*, /* pList */ ) +IMPL_LINK_NOARG_TYPED( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTreeListBox*, void ) { m_pHeaderBar->SetOffset( -GetXOffset() ); - return 0; } IMPL_LINK_TYPED( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 88b2ad26ef37..d9a3be074063 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -62,7 +62,7 @@ class XMLFilterListBox : public SvTabListBox private: VclPtr<HeaderBar> m_pHeaderBar; - DECL_LINK( TabBoxScrollHdl_Impl, SvTabListBox* ); + DECL_LINK_TYPED( TabBoxScrollHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); static OUString getEntryString( const filter_info_impl* pInfo ); @@ -92,7 +92,7 @@ public: virtual void dispose() SAL_OVERRIDE; DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); - DECL_LINK(SelectionChangedHdl_Impl, void * ); + DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void ); DECL_LINK(DoubleClickHdl_Impl, void * ); virtual short Execute() SAL_OVERRIDE; diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index ba573ca3d8e2..a1900081a8b9 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -170,7 +170,7 @@ IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry) return NULL; } -IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb ) +IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void ) { if(m_pTlbStruct->GetActiveFlag()) { @@ -192,7 +192,6 @@ IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb ) aSelLink.Call(this); } - return 0; } } // formula diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 43053656d7db..ae8fac934302 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -79,7 +79,7 @@ private: IFormulaToken* pSelectedToken; - DECL_LINK( SelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); using Window::GetParent; diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 6d5f8c7479a2..a08bc05d572c 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -175,7 +175,7 @@ Image PlacesListBox::getEntryIcon( PlacePtr pPlace ) return theImage; } -IMPL_LINK_NOARG( PlacesListBox, Selection ) +IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void ) { sal_uInt32 nSelected = mpImpl->GetCurrRow(); PlacePtr pPlace = maPlaces[nSelected]; @@ -185,7 +185,6 @@ IMPL_LINK_NOARG( PlacesListBox, Selection ) mpDlg->RemovablePlaceSelected(); else mpDlg->RemovablePlaceSelected(false); - return 0; } IMPL_LINK_NOARG( PlacesListBox, DoubleClick ) diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index b7909e245077..998054601da0 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -74,7 +74,7 @@ class PlacesListBox : public Control Image getEntryIcon( PlacePtr pPlace ); - DECL_LINK( Selection, void* ); + DECL_LINK_TYPED( Selection, SvTreeListBox*, void ); DECL_LINK( DoubleClick, void* ); }; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 531ff3492f5c..90d522bc516d 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -1036,7 +1036,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectFilterHdl ) return 1; } -IMPL_LINK ( RemoteFilesDialog, TreeSelectHdl, FolderTree *, pBox ) +IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void ) { OUString* sURL = static_cast< OUString* >( pBox->GetHdlEntry()->GetUserData() ); @@ -1045,8 +1045,6 @@ IMPL_LINK ( RemoteFilesDialog, TreeSelectHdl, FolderTree *, pBox ) OpenURL( *sURL ); m_pFileView->GrabFocus(); } - - return 1; } IMPL_LINK_TYPED ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void ) @@ -1323,7 +1321,7 @@ void RemoteFilesDialog::UpdateControls( const OUString& rURL ) m_pPath->SetURL( rURL ); - m_pTreeView->SetSelectHdl( Link<>() ); + m_pTreeView->SetSelectHdl( Link<SvTreeListBox*,void>() ); // read cached data for this url and fill the tree const ::std::vector< SvtContentEntry >& rFolders = m_pFileView->GetContent(); diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 008695b2d3c1..9f4791a158fc 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -199,7 +199,7 @@ private: DECL_LINK( SelectFilterHdl, void * ); - DECL_LINK( TreeSelectHdl, FolderTree * ); + DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void ); diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index d7e987ba9f1c..c7596a2a33ce 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -132,7 +132,7 @@ private: ::svt::IAccessibleTabListBox* m_pAccessible; AccessibleChildren m_aAccessibleChildren; - DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl_Impl, SvTreeListBox*, void ); DECL_DLLPRIVATE_LINK_TYPED( CreateAccessibleHdl_Impl, HeaderBar*, void ); void RecalculateAccessibleChildren(); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 8e463afd3c5b..56b9609dea18 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -243,12 +243,12 @@ class SVT_DLLPUBLIC SvTreeListBox SvTreeListBoxImpl* mpImpl; SvImpLBox* pImp; - Link<> aCheckButtonHdl; - Link<> aScrolledHdl; - Link<> aExpandedHdl; - Link<> aExpandingHdl; - Link<> aSelectHdl; - Link<> aDeselectHdl; + Link<SvTreeListBox*,void> aCheckButtonHdl; + Link<SvTreeListBox*,void> aScrolledHdl; + Link<SvTreeListBox*,void> aExpandedHdl; + Link<SvTreeListBox*,bool> aExpandingHdl; + Link<SvTreeListBox*,void> aSelectHdl; + Link<SvTreeListBox*,void> aDeselectHdl; Accelerator aInpEditAcc; Image aPrevInsertedExpBmp; @@ -475,14 +475,14 @@ public: */ bool HandleKeyInput( const KeyEvent& rKEvt ); - void SetSelectHdl( const Link<>& rNewHdl ) {aSelectHdl=rNewHdl; } - void SetDeselectHdl( const Link<>& rNewHdl ) {aDeselectHdl=rNewHdl; } + void SetSelectHdl( const Link<SvTreeListBox*,void>& rNewHdl ) {aSelectHdl=rNewHdl; } + void SetDeselectHdl( const Link<SvTreeListBox*,void>& rNewHdl ) {aDeselectHdl=rNewHdl; } void SetDoubleClickHdl(const Link<>& rNewHdl) {aDoubleClickHdl=rNewHdl;} - const Link<>& GetSelectHdl() const { return aSelectHdl; } - const Link<>& GetDeselectHdl() const { return aDeselectHdl; } + const Link<SvTreeListBox*,void>& GetSelectHdl() const { return aSelectHdl; } + const Link<SvTreeListBox*,void>& GetDeselectHdl() const { return aDeselectHdl; } const Link<>& GetDoubleClickHdl() const { return aDoubleClickHdl; } - void SetExpandingHdl(const Link<>& rNewHdl){aExpandingHdl=rNewHdl;} - void SetExpandedHdl(const Link<>& rNewHdl){aExpandedHdl=rNewHdl;} + void SetExpandingHdl(const Link<SvTreeListBox*,bool>& rNewHdl){aExpandingHdl=rNewHdl;} + void SetExpandedHdl(const Link<SvTreeListBox*,void>& rNewHdl){aExpandedHdl=rNewHdl;} virtual void ExpandedHdl(); virtual bool ExpandingHdl(); @@ -493,19 +493,19 @@ public: // Is called for an Entry that gets expanded with the Flag // ENTRYFLAG_CHILDREN_ON_DEMAND set. - virtual void RequestingChildren( SvTreeListEntry* pParent ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); // Drag & Drop // New D'n'D API - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual bool NotifyAcceptDrop( SvTreeListEntry* ); + virtual void DragFinished( sal_Int8 nDropAction ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* ); - void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } + void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } static SvTreeListBox* GetSourceView(); @@ -539,10 +539,10 @@ public: @param pEntry The entry. @return The bounding rectangle of an entry. */ - Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); + Rectangle GetBoundingRect( SvTreeListEntry* pEntry ); /** Enables, that one cell of a tablistbox entry can be focused */ - void EnableCellFocus(); + void EnableCellFocus(); // For overwriting accessible role for all entries - normally 0, so each entry can be different void SetAllEntriesAccessibleRoleType( SvTreeAccRoleType n ) { nAllItemAccRoleType = n; } @@ -576,7 +576,7 @@ protected: SVT_DLLPRIVATE void InitTreeView(); SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab, - sal_uInt16 nEmptyWidth ); + sal_uInt16 nEmptyWidth ); SVT_DLLPRIVATE void ImplInitStyle(); protected: @@ -590,7 +590,7 @@ protected: // Is called automatically when inserting/changing Bitmaps, changing the Model etc. virtual void SetTabs(); void AddTab( long nPos, SvLBoxTabFlags nFlags=SvLBoxTabFlags::ADJUST_LEFT, - void* pUserData = 0 ); + void* pUserData = 0 ); sal_uInt16 TabCount() const { return aTabs.size(); } SvLBoxTab* GetFirstDynamicTab() const; SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; @@ -599,11 +599,11 @@ protected: SvLBoxTab* GetTab( SvTreeListEntry*, SvLBoxItem* ) const; void ClearTabList(); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); virtual void NotifyEndScroll(); virtual void NotifyScrolled(); - void SetScrolledHdl( const Link<>& rLink ) { aScrolledHdl = rLink; } + void SetScrolledHdl( const Link<SvTreeListBox*,void>& rLink ) { aScrolledHdl = rLink; } long GetXOffset() const { return GetMapMode().GetOrigin().X(); } virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; @@ -614,7 +614,7 @@ protected: void InitSettings(bool bFont, bool bForeground, bool bBackground); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; bool IsCellFocusEnabled() const; bool SetCurrentTabPos( sal_uInt16 _nNewPos ); @@ -688,8 +688,8 @@ public: static const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ); static const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ); - void SetCheckButtonHdl( const Link<>& rLink ) { aCheckButtonHdl=rLink; } - Link<> GetCheckButtonHdl() const { return aCheckButtonHdl; } + void SetCheckButtonHdl( const Link<SvTreeListBox*,void>& rLink ) { aCheckButtonHdl=rLink; } + Link<SvTreeListBox*,void> GetCheckButtonHdl() const { return aCheckButtonHdl; } virtual void CheckButtonHdl(); void SetSublistOpenWithReturn( bool bMode = true ); // open/close sublist with return/enter @@ -719,7 +719,7 @@ public: virtual void ModelHasMoved(SvTreeListEntry* pSource ) SAL_OVERRIDE; virtual void ModelIsRemoving( SvTreeListEntry* pEntry ) SAL_OVERRIDE; virtual void ModelHasRemoved( SvTreeListEntry* pEntry ) SAL_OVERRIDE; - void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) SAL_OVERRIDE; + void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) SAL_OVERRIDE; void ShowTargetEmphasis( SvTreeListEntry*, bool bShow ); void ScrollOutputArea( short nDeltaEntries ); @@ -759,11 +759,11 @@ public: void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); - virtual bool Expand( SvTreeListEntry* pParent ); - virtual bool Collapse( SvTreeListEntry* pParent ); - virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); - sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); - virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; + virtual bool Expand( SvTreeListEntry* pParent ); + virtual bool Collapse( SvTreeListEntry* pParent ); + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); + sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); + virtual void SelectAll( bool bSelect, bool bPaint = true ) SAL_OVERRIDE; void SetCurEntry( SvTreeListEntry* _pEntry ); SvTreeListEntry* GetCurEntry() const; @@ -801,11 +801,11 @@ public: void EnableList( bool _bEnable ); - long getPreferredDimensions(std::vector<long> &rWidths) const; + long getPreferredDimensions(std::vector<long> &rWidths) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; - void SetAlternatingRowColors( const bool bEnable ); + void SetAlternatingRowColors( const bool bEnable ); }; #define SV_LBOX_DD_FORMAT "SV_LBOX_DD_FORMAT" diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 2fceb7b71335..cac6622c76bf 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -494,11 +494,9 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve { } -IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl ) +IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void ) { m_aActions->EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 )); - - return 0L; } IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void ) diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index c2092737e6b0..6125bacda554 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -184,7 +184,7 @@ public: virtual ~NavigatorTree(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK(OnEntrySelDesel, NavigatorTree*); + DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void); DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) SAL_OVERRIDE; @@ -455,7 +455,7 @@ IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) } -IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) +IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) { if ( !m_pSelectionListener->locked() ) { @@ -467,8 +467,6 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) m_rController.select(aSelection); m_pSelectionListener->unlock(); } - - return 0L; } void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index aeb046382bd4..fcb03b0fc80f 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -71,7 +71,7 @@ class OAddFieldWindow :public FloatingWindow DECL_LINK_TYPED( OnClickHdl, Button*, void ); DECL_LINK( OnDoubleClickHdl, void* ); - DECL_LINK( OnSelectHdl, void* ); + DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( OnSortAction, ToolBox*, void ); OAddFieldWindow(const OAddFieldWindow&) SAL_DELETED_FUNCTION; diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index ba1a7ad6c6a2..b917770965cd 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1258,10 +1258,10 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl) return 0; } -IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks ) +IMPL_LINK_TYPED( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks, void ) { if (pChecks != maChecks.get()) - return 0; + return; SvTreeListEntry* pEntry = pChecks->GetHdlEntry(); if ( pEntry ) maChecks->CheckEntry( pEntry, ( pChecks->GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) ); @@ -1280,7 +1280,6 @@ IMPL_LINK( ScCheckListMenuWindow, CheckHdl, SvTreeListBox*, pChecks ) maBtnOk->Enable(nNumChecked != 0); mePrevToggleAllState = maChkToggleAll->GetState(); - return 0; } void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt) diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 0c1a9cefd906..e28d4284a880 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -352,12 +352,11 @@ IMPL_LINK_TYPED( ScDPDateGroupDlg, ClickHdl, Button*, pButton, void ) } } -IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox ) +IMPL_LINK_TYPED( ScDPDateGroupDlg, CheckHdl, SvTreeListBox*, pListBox, void ) { // enable/disable OK button on modifying check list box if( pListBox == mpLbUnits ) mpBtnOk->Enable( mpLbUnits->GetCheckedEntryCount() > 0 ); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 65fb0590005b..da4afa5c006e 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -101,8 +101,8 @@ void ScTpSubTotalGroup::Init() OSL_ENSURE( pViewData && pDoc, "ViewData or Document not found :-(" ); mpLbGroup->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); - mpLbColumns->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); - mpLbColumns->SetCheckButtonHdl ( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); + mpLbColumns->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectTreeListBoxHdl ) ); + mpLbColumns->SetCheckButtonHdl( LINK( this, ScTpSubTotalGroup, CheckHdl ) ); mpLbFunctions->SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) ); nFieldArr[0] = 0; @@ -342,6 +342,10 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) // Handler: +IMPL_LINK_TYPED( ScTpSubTotalGroup, SelectTreeListBoxHdl, SvTreeListBox*, pLb, void ) +{ + SelectHdl(pLb); +} IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb ) { if ( (mpLbColumns->GetEntryCount() > 0) @@ -368,7 +372,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, void *, pLb ) return 0; } -IMPL_LINK( ScTpSubTotalGroup, CheckHdl, void *, pLb ) +IMPL_LINK_TYPED( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) { if ( pLb == mpLbColumns ) { @@ -380,7 +384,6 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, void *, pLb ) SelectHdl( pLb ); } } - return 0; } // Derived Group TabPages: diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index e1600f56d872..f9f2c12c3804 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -91,10 +91,10 @@ bool SearchResultsDlg::Close() return ModelessDialog::Close(); } -IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl ) +IMPL_LINK_NOARG_TYPED( SearchResultsDlg, ListSelectHdl, SvTreeListBox*, void ) { if (!mpDoc) - return 0; + return; SvTreeListEntry *pEntry = mpList->FirstSelected(); OUString aTabStr = SvTabListBox::GetEntryText(pEntry, 0); @@ -103,21 +103,19 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl ) SCTAB nTab = -1; if (!mpDoc->GetTable(aTabStr, nTab)) // No sheet with specified name. - return 0; + return; ScAddress aPos; sal_uInt16 nRes = aPos.Parse(aPosStr, mpDoc, mpDoc->GetAddressConvention()); if (!(nRes & SCA_VALID)) // Invalid address string. - return 0; + return; // Jump to the cell. ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); pScViewShell->SetTabNo(nTab); pScViewShell->SetCursor(aPos.Col(), aPos.Row()); pScViewShell->AlignToCursor(aPos.Col(), aPos.Row(), SC_FOLLOW_JUMP); - - return 0; } SearchResultsDlgWrapper::SearchResultsDlgWrapper( diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index c0ea474dfb47..b18442adae8c 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -103,8 +103,8 @@ private: DECL_LINK( AcceptHandle, SvxTPView*); DECL_LINK( RejectAllHandle, void*); DECL_LINK( AcceptAllHandle, void*); - DECL_LINK( ExpandingHandle, SvxRedlinTable*); - DECL_LINK( SelectHandle, void*); + DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool); + DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void); DECL_LINK( RefInfoHandle, OUString*); DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index ceffe378bc69..5f42cfcdb76e 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -330,7 +330,7 @@ private: DECL_LINK_TYPED( ButtonHdl, Button*, void ); DECL_LINK_TYPED( TriStateHdl, Button*, void ); - DECL_LINK( CheckHdl, SvTreeListBox* ); + DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); DECL_LINK( EdModifyHdl, void* ); private: diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 0ccea7822fa7..404a9fd69acb 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -149,8 +149,8 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK( SelectHandle, void* ); - DECL_LINK( DeselectHandle, void* ); + DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); + DECL_LINK_TYPED( DeselectHandle, SvTreeListBox*, void ); DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); DECL_LINK_TYPED( KeepMineHandle, Button*, void ); DECL_LINK_TYPED( KeepOtherHandle, Button*, void ); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 21d48bb6aebe..8b35371f734e 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -120,7 +120,7 @@ public: private: DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK( CheckHdl, SvxCheckListBox* ); + DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); private: VclPtr<RadioButton> mpRbAutoStart; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index dd125914360b..6678b31ef813 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -106,7 +106,7 @@ private: DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( EdModifyHdl, void * ); DECL_LINK( AssignGetFocusHdl, void * ); - DECL_LINK( SelectionChangedHdl_Impl, void* ); + DECL_LINK_TYPED( SelectionChangedHdl_Impl, SvTreeListBox*, void ); DECL_LINK( ScopeChangedHdl, void* ); protected: diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index c51d23355dbc..ee6e384626b1 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -81,7 +81,7 @@ public: bool IsMultiSelection(); std::vector<ScRangeNameLine> GetSelectedEntries(); - DECL_LINK( ScrollHdl, void*); + DECL_LINK_TYPED( ScrollHdl, SvTreeListBox*, void); DECL_LINK_TYPED( HeaderEndDragHdl, HeaderBar*, void); }; diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index 22af42940f1c..57ff716e3065 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -16,6 +16,7 @@ class ScDocument; class ScRangeList; class SvSimpleTable; +class SvTreeListBox; namespace sc { @@ -25,7 +26,7 @@ class SearchResultsDlg : public ModelessDialog SfxBindings* mpBindings; ScDocument* mpDoc; - DECL_LINK( ListSelectHdl, void * ); + DECL_LINK_TYPED( ListSelectHdl, SvTreeListBox*, void ); public: SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg(); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index db7926f9afab..230bfa2d2c61 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -46,7 +46,7 @@ class ScSolverOptionsDialog : public ModalDialog com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; DECL_LINK( EngineSelectHdl, void* ); - DECL_LINK( SettingsSelHdl, void* ); + DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); DECL_LINK( SettingsDoubleClickHdl, void* ); DECL_LINK_TYPED( ButtonHdl, Button*, void ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index f31b635b51e5..627f176dca5a 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -36,8 +36,8 @@ struct ScSubTotalParam; class ScTpSubTotalGroup : public SfxTabPage { protected: - ScTpSubTotalGroup( vcl::Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup( vcl::Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup(); @@ -70,22 +70,23 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ - DECL_LINK( SelectHdl, void * ); - DECL_LINK( CheckHdl, void * ); + DECL_LINK( SelectHdl, void* ); + DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); }; class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { friend class VclPtr<ScTpSubTotalGroup1>; protected: - ScTpSubTotalGroup1( vcl::Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup1( vcl::Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup1(); static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, - const SfxItemSet* rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -94,14 +95,14 @@ class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { friend class VclPtr<ScTpSubTotalGroup2>; protected: - ScTpSubTotalGroup2( vcl::Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup2( vcl::Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup2(); static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, - const SfxItemSet* rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -110,14 +111,14 @@ class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { friend class VclPtr<ScTpSubTotalGroup3>; protected: - ScTpSubTotalGroup3( vcl::Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalGroup3( vcl::Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup3(); static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, - const SfxItemSet* rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -126,14 +127,14 @@ class ScTpSubTotalOptions : public SfxTabPage { friend class VclPtr<ScTpSubTotalOptions>; protected: - ScTpSubTotalOptions( vcl::Window* pParent, - const SfxItemSet& rArgSet ); + ScTpSubTotalOptions( vcl::Window* pParent, + const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalOptions(); virtual void dispose() SAL_OVERRIDE; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, - const SfxItemSet* rArgSet ); + const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 44c6d7ebc3c1..540c5a2ad49c 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -96,7 +96,7 @@ private: DECL_LINK(GetFocusHdl, Control*); DECL_LINK_TYPED(BtnPressedHdl, Button*, void); - DECL_LINK(TreeItemSelectHdl, void*); + DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void); DECL_LINK(RefModifiedHdl, void*); }; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 44088710cca3..1533022db4c8 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1109,13 +1109,12 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle) return 0; } -IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle) +IMPL_LINK_NOARG_TYPED(ScAcceptChgDlg, SelectHandle, SvTreeListBox*, void) { if(!bNoSelection) aSelectionIdle.Start(); bNoSelection=false; - return 0; } void ScAcceptChgDlg::GetDependents( const ScChangeAction* pScChangeAction, @@ -1347,7 +1346,7 @@ bool ScAcceptChgDlg::Expand( return bTheTestFlag; } -IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) +IMPL_LINK_TYPED( ScAcceptChgDlg, ExpandingHandle, SvTreeListBox*, pTable, bool ) { ScChangeTrack* pChanges=pDoc->GetChangeTrack(); SetPointer(Pointer(PointerStyle::Wait)); @@ -1410,7 +1409,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) } } SetPointer(Pointer(PointerStyle::Arrow)); - return (sal_uLong) true; + return true; } void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 907938dc27db..ae00e39adb4c 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -537,33 +537,29 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) } } -IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, SelectHandle, SvTreeListBox*, void) { if ( mbInSelectHdl || mbInDeselectHdl ) { - return 0; + return; } mbInSelectHdl = true; HandleListBoxSelection( true ); maSelectionIdle.Start(); mbInSelectHdl = false; - - return 0; } -IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle) +IMPL_LINK_NOARG_TYPED(ScConflictsDlg, DeselectHandle, SvTreeListBox*, void) { if ( mbInDeselectHdl || mbInSelectHdl ) { - return 0; + return; } mbInDeselectHdl = true; HandleListBoxSelection( false ); mbInDeselectHdl = false; - - return 0; } IMPL_LINK_NOARG_TYPED(ScConflictsDlg, UpdateSelectionHdl, Idle *, void) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 5593a071a56a..9df9f459ed7f 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -377,7 +377,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl) return 0; } -IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) +IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsSelHdl, SvTreeListBox*, void) { bool bCheckbox = false; @@ -390,8 +390,6 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) } m_pBtnEdit->Enable( !bCheckbox ); - - return 0; } ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 63ae44dca41a..eee65db5258d 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -515,10 +515,9 @@ IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl) return 0; } -IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl) +IMPL_LINK_NOARG_TYPED(ScNameDlg, SelectionChangedHdl_Impl, SvTreeListBox*, void) { SelectionChanged(); - return 0; } IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl) diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 2a6f78becef3..30b77beaae85 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -299,10 +299,9 @@ IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) SetTab(2, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); } -IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl) +IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, ScrollHdl, SvTreeListBox*, void) { CheckForFormulaString(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 8349ed374125..ad012fcc7cd1 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -246,10 +246,9 @@ IMPL_LINK_NOARG(ScCalcOptionsDialog, BtnAutomaticSelectHdl) return 0; } -IMPL_LINK_NOARG(ScCalcOptionsDialog, DeviceSelHdl) +IMPL_LINK_NOARG_TYPED(ScCalcOptionsDialog, DeviceSelHdl, SvTreeListBox*, void) { SelectedDeviceChanged(); - return 0; } IMPL_LINK(ScCalcOptionsDialog, EditModifiedHdl, Edit*, pCtrl) diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 633762e6b253..c47e178255d3 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -39,7 +39,7 @@ public: virtual void dispose() SAL_OVERRIDE; DECL_LINK( BtnAutomaticSelectHdl, void* ); - DECL_LINK( DeviceSelHdl, void* ); + DECL_LINK_TYPED( DeviceSelHdl, SvTreeListBox*, void ); DECL_LINK( EditModifiedHdl, Edit * ); DECL_STATIC_LINK_TYPED( ScCalcOptionsDialog, TestClickHdl, Button*, void ); DECL_LINK_TYPED( AsZeroModifiedHdl, Button*, void); diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 353a521e175f..deb99aa3dab3 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -103,8 +103,7 @@ ScXMLSourceDlg::ScXMLSourceDlg( mpRefEdit->SetGetFocusHdl(aLink); mpRefBtn->SetGetFocusHdl(aLink); - aLink = LINK(this, ScXMLSourceDlg, TreeItemSelectHdl); - mpLbTree->SetSelectHdl(aLink); + mpLbTree->SetSelectHdl(LINK(this, ScXMLSourceDlg, TreeItemSelectHdl)); aLink = LINK(this, ScXMLSourceDlg, RefModifiedHdl); mpRefEdit->SetModifyHdl(aLink); @@ -679,10 +678,9 @@ IMPL_LINK_TYPED(ScXMLSourceDlg, BtnPressedHdl, Button*, pBtn, void) CancelPressed(); } -IMPL_LINK_NOARG(ScXMLSourceDlg, TreeItemSelectHdl) +IMPL_LINK_NOARG_TYPED(ScXMLSourceDlg, TreeItemSelectHdl, SvTreeListBox*, void) { TreeItemSelected(); - return 0; } IMPL_LINK_NOARG(ScXMLSourceDlg, RefModifiedHdl) diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 47a139645938..bfa142d5afcb 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -300,7 +300,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, m_pBtnRemove->SetClickHdl( aLink ); m_pEdtName->SetModifyHdl( aLink2 ); m_pLbPages->SetSelectHdl( aLink2 ); // because of status - m_pLbCustomPages->SetSelectHdl( aLink2 ); // because of status + m_pLbCustomPages->SetSelectHdl( LINK( this, SdDefineCustomShowDlg, ClickButtonHdl3 ) ); // because of status m_pBtnOK->SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) ); @@ -387,6 +387,10 @@ IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void ) { ClickButtonHdl2(p); } +IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void ) +{ + ClickButtonHdl2(p); +} // ButtonHdl() IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl2, void *, p ) { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 2f67a4d46861..5c848a1858fd 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -237,7 +237,7 @@ public: DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void ); DECL_LINK( EffectPreviewClickHdl, void * ); DECL_LINK( SelectLayoutHdl, void * ); - DECL_LINK( PageSelectHdl, void * ); + DECL_LINK_TYPED( PageSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( PresTypeHdl, Button*, void ); DECL_LINK( UpdateUserDataHdl, void * ); DECL_LINK( SelectEffectHdl, void* ); @@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, SelectFileHdl) return 0; } -IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl) +IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PageSelectHdl, SvTreeListBox*, void) { sal_uInt16 nPage = mpPage5PageListCT->GetSelectedPage(); if( mnShowPage != nPage ) @@ -1173,8 +1173,6 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl) mnShowPage = nPage; UpdatePreview(false); } - - return 0; } IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, UpdatePageListHdl, Idle *, void) diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index ffc77b863187..20a3dea9ccf4 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -58,7 +58,7 @@ VCL_BUILDER_DECL_FACTORY(SdPageListControl) rRet = VclPtr<SdPageListControl>::Create(pParent, nWinStyle); } -IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) +IMPL_LINK_NOARG_TYPED(SdPageListControl, CheckButtonClickHdl, SvTreeListBox*, void) { SvTreeList* pTreeModel = GetModel(); SvTreeListEntry* pEntry = pTreeModel->First(); @@ -66,14 +66,12 @@ IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl) while( pEntry ) { if(pTreeModel->IsAtRootDepth(pEntry) && GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) - return 0; + return; pEntry = pTreeModel->Next( pEntry ); } pEntry = pTreeModel->First(); SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); - - return 0; } SdPageListControl::~SdPageListControl() diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index ee39788cb136..69c8642abb2e 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -45,7 +45,7 @@ public: sal_uInt16 GetSelectedPage(); bool IsPageChecked( sal_uInt16 nPage ); - DECL_LINK( CheckButtonClickHdl, void * ); + DECL_LINK_TYPED( CheckButtonClickHdl, SvTreeListBox*, void ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index ed7d6720923e..b0f8bad8e629 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -128,14 +128,12 @@ bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const /** * Enabled and selects end-color-LB */ -IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl) +IMPL_LINK_NOARG_TYPED(SdInsertPagesObjsDlg, SelectObjectHdl, SvTreeListBox*, void) { if( m_pLbTree->IsLinkableSelected() ) m_pCbxLink->Enable(); else m_pCbxLink->Disable(); - - 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 e8d36f946f16..7ed705198b6f 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -651,10 +651,9 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl) return 0L; } -IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl) +IMPL_LINK_NOARG_TYPED(SdTPAction, SelectTreeHdl, SvTreeListBox*, void) { m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() ); - return 0L; } IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 66cc333f9ca0..b31862e13344 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -85,6 +85,7 @@ private: DECL_LINK_TYPED( ClickButtonHdl, Button*, void ); DECL_LINK( ClickButtonHdl2, void* ); + DECL_LINK_TYPED( ClickButtonHdl3, SvTreeListBox*, void ); DECL_LINK_TYPED( OKHdl, Button*, void ); public: diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 7dd1c7541b94..183d7ade8fac 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -38,7 +38,7 @@ private: const OUString& rName; void Reset(); - DECL_LINK( SelectObjectHdl, void * ); + DECL_LINK_TYPED( SelectObjectHdl, SvTreeListBox*, void ); public: SdInsertPagesObjsDlg( vcl::Window* pParent, diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 931ed2d664b0..72eec7ece054 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -81,7 +81,7 @@ private: DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); DECL_LINK( ClickActionHdl, void * ); - DECL_LINK( SelectTreeHdl, void * ); + DECL_LINK_TYPED( SelectTreeHdl, SvTreeListBox*, void ); DECL_LINK( CheckFileHdl, void * ); void UpdateTree(); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4950c2a7b796..1f1cc098d547 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2105,7 +2105,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl ) } // Selection of a template during the Watercan-Status -IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox ) +IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox, void ) { // Trigger Help PI, if this is permitted of call handlers and field if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) ) @@ -2146,8 +2146,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox } #endif } - - return 0; } IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool ) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 5fe8966a8c64..1bc6df1a8411 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -376,7 +376,7 @@ IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) return 0L; } -IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) { bool bEnable = ( m_pVersionBox->FirstSelected() != NULL ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); @@ -388,8 +388,6 @@ IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy ); SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy ); m_pCompareButton->Enable(bEnable && eState >= SfxItemState::DEFAULT); - - return 0L; } IMPL_LINK_TYPED( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton, void ) diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index ddb4a6f61ebb..e9383a47adae 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -216,7 +216,7 @@ protected: bool bBindingUpdate :1; DECL_LINK( FilterSelectHdl, ListBox* ); - DECL_LINK( FmtSelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void ); DECL_LINK( ApplyHdl, Control* ); DECL_LINK( DropHdl, StyleTreeListBox_Impl* ); DECL_LINK_TYPED( TimeOut, Idle*, void ); diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index e9ab98548bd8..b2747d291460 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -58,7 +58,7 @@ class SfxVersionDialog : public SfxModalDialog bool m_bIsSaveVersionOnClose; DECL_LINK(DClickHdl_Impl, void *); - DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void ); void Init_Impl(); void Open_Impl(); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 874b98304f22..4d542cf7841b 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -423,7 +423,7 @@ public: inline void EndEditing( bool _bCancel ); protected: - DECL_LINK( SelectionMultiplexer, void* ); + DECL_LINK_TYPED( SelectionMultiplexer, SvTreeListBox*, void ); protected: // IEnumerationResultHandler overridables @@ -1752,9 +1752,10 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter ) } -IMPL_LINK( SvtFileView_Impl, SelectionMultiplexer, void*, _pSource ) +IMPL_LINK_TYPED( SvtFileView_Impl, SelectionMultiplexer, SvTreeListBox*, _pSource, void ) { - return mnSuspendSelectCallback ? 0L : m_aSelectHandler.Call( _pSource ); + if (!mnSuspendSelectCallback) + m_aSelectHandler.Call( _pSource ); } @@ -1762,7 +1763,7 @@ void SvtFileView_Impl::SetSelectHandler( const Link<>& _rHdl ) { m_aSelectHandler = _rHdl; - Link<> aMasterHandler; + Link<SvTreeListBox*,void> aMasterHandler; if ( m_aSelectHandler.IsSet() ) aMasterHandler = LINK( this, SvtFileView_Impl, SelectionMultiplexer ); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 08a29ddb35a5..2a8400b7b3e7 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -609,10 +609,9 @@ void SvHeaderTabListBox::Clear() m_aAccessibleChildren.clear(); } -IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, ScrollHdl_Impl, SvTreeListBox*, void) { m_pImpl->m_pHeaderBar->SetOffset( -GetXOffset() ); - return 0; } IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 5e11c720454d..49667fd038df 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -96,9 +96,9 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) SAL_OVERRIDE; virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) SAL_OVERRIDE; - DECL_LINK(OnSelectionChangeHdl, void *); - DECL_LINK(OnExpandingHdl, void *); - DECL_LINK(OnExpandedHdl, void *); + DECL_LINK_TYPED(OnSelectionChangeHdl, SvTreeListBox*, void); + DECL_LINK_TYPED(OnExpandingHdl, SvTreeListBox*, bool); + DECL_LINK_TYPED(OnExpandedHdl, SvTreeListBox*, void); private: rtl::Reference< TreeControlPeer > mxPeer; @@ -1507,36 +1507,34 @@ void UnoTreeListBoxImpl::dispose() -IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl) +IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) { if( mxPeer.is() ) mxPeer->onSelectionChanged(); - return 0; } -IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl) +IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); if( pEntry && mxPeer.is() ) { - return mxPeer->onExpanding( pEntry->mxNode, !IsExpanded( pEntry ) ) ? 1 : 0; + return mxPeer->onExpanding( pEntry->mxNode, !IsExpanded( pEntry ) ); } - return 0; + return false; } -IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl) +IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); if( pEntry && mxPeer.is() ) { mxPeer->onExpanded( pEntry->mxNode, IsExpanded( pEntry ) ); } - return 0; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 1879f0d13c52..1ad38717937d 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -391,10 +391,9 @@ namespace svxform DoToolBoxAction( m_pToolBox->GetCurItemId() ); } - IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl) + IMPL_LINK_NOARG_TYPED(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) { EnableMenuItems( NULL ); - return 0; } void XFormsPage::AddChildren( @@ -2949,13 +2948,11 @@ namespace svxform } - IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, ) + IMPL_LINK_NOARG_TYPED( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) { bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL ); m_pEditNamespaceBtn->Enable( bEnable ); m_pDeleteNamespaceBtn->Enable( bEnable ); - - return 0; } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 58ca669f076e..9364f40a2258 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1526,20 +1526,18 @@ namespace svxform } - IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/) + IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) { m_sdiState = SDI_DIRTY; if (IsSelectionHandlingLocked()) - return 0L; + return; if (m_aSynchronizeTimer.IsActive()) m_aSynchronizeTimer.Stop(); m_aSynchronizeTimer.SetTimeout(EXPLORER_SYNC_DELAY); m_aSynchronizeTimer.Start(); - - return 0L; } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index e37521bba127..dbb1180f6902 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -273,14 +273,14 @@ namespace svxform bool m_bLinkOnce; DECL_LINK_TYPED(TbxSelectHdl, ToolBox *, void); - DECL_LINK(ItemSelectHdl, void *); + DECL_LINK_TYPED(ItemSelectHdl, SvTreeListBox*, void); void AddChildren( SvTreeListEntry* _pParent, const ImageList& _rImgLst, const XNode_ref& _xNode ); bool DoToolBoxAction( sal_uInt16 _nToolBoxID ); - SvTreeListEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); - SvTreeListEntry* AddEntry( const XPropertySet_ref& _rPropSet ); + SvTreeListEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); + SvTreeListEntry* AddEntry( const XPropertySet_ref& _rPropSet ); void EditEntry( const XPropertySet_ref& _rPropSet ); bool RemoveEntry(); @@ -528,7 +528,7 @@ namespace svxform XNameContainer_ref& m_rNamespaces; - DECL_LINK( SelectHdl, SvSimpleTable * ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK_TYPED( OKHdl, Button*, void); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index ec65af0b0d4f..ef470fe03e7f 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -477,7 +477,7 @@ namespace svxform DECL_LINK_TYPED( OnEdit, void*, void ); DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); - DECL_LINK(OnEntrySelDesel, NavigatorTree*); + DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void); DECL_LINK_TYPED(OnSynchronizeTimer, Timer*, void); DECL_LINK( OnClipboardAction, void* ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 3c2b6ffb8796..5697713c8a0c 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -625,7 +625,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl) updateButtons(); return 0; } -IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl) +IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, MappingSelectHdl, SvTreeListBox*, void) { DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if(pE) @@ -640,7 +640,6 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl) } updateButtons(); - return 0; } bool ChineseDictionaryDialog::isEditFieldsHaveContent() const diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 265542b409e8..7f1598b525b7 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -125,7 +125,7 @@ public: private: DECL_LINK_TYPED( DirectionHdl, Button*, void ); DECL_LINK(EditFieldsHdl, void *); - DECL_LINK( MappingSelectHdl, void* ); + DECL_LINK_TYPED( MappingSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( AddHdl, Button*, void ); DECL_LINK_TYPED( ModifyHdl, Button*, void ); DECL_LINK_TYPED( DeleteHdl, Button*, void ); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 6625503a4baf..63f5f77d4121 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -86,7 +86,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pStyleLB->SetDoubleClickHdl( 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_pTbLinks->SetSelectHdl( LINK(this, SwCondCollPage, SelectTreeListBoxHdl)); m_pStyleLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); m_pFilterLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectHdl)); @@ -260,12 +260,16 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) return 0; } -IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) +IMPL_LINK_TYPED( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void) +{ + SelectHdl(pBox); +} +IMPL_LINK( SwCondCollPage, SelectHdl, void*, pBox) { if (pBox == m_pFilterLB) { m_pStyleLB->Clear(); - const sal_Int32 nSelPos = pBox->GetSelectEntryPos(); + const sal_Int32 nSelPos = static_cast<ListBox*>(pBox)->GetSelectEntryPos(); const sal_uInt16 nSearchFlags = *static_cast<sal_uInt16*>(m_pFilterLB->GetEntryData(nSelPos)); SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, nSearchFlags); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index df64fbd2a2d3..7b101cecc533 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -680,7 +680,7 @@ void SwCaptionOptPage::DelUserData() } } -IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) +IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) { SvTreeListEntry* pSelEntry = m_pCheckLB->FirstSelected(); @@ -787,18 +787,14 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) } ModifyHdl(); - - return 0; } -IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl) +IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, SaveEntryHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pCheckLB->GetHdlEntry(); if (pEntry) // save all SaveEntry(pEntry); - - return 0; } void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 33f283b69730..3456e45a21a3 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -469,12 +469,11 @@ IMPL_LINK_TYPED(SwAddressListDialog, EditHdl_Impl, Button*, pButton, void) } }; -IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl) +IMPL_LINK_NOARG_TYPED(SwAddressListDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, void) { SvTreeListEntry* pSelect = m_pListLB->FirstSelected(); Application::PostUserEvent( LINK( this, SwAddressListDialog, StaticListBoxSelectHdl_Impl ), pSelect, true ); - return 0; } IMPL_LINK_TYPED(SwAddressListDialog, StaticListBoxSelectHdl_Impl, void*, p, void) diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 921ece655941..e1bca3a82ed0 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -77,7 +77,7 @@ class SwAddressListDialog : public SfxModalDialog 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_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED(EditHdl_Impl, Button*, void); DECL_LINK_TYPED(TableSelectHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index c4219fc243cf..9e9c4fef304b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -592,12 +592,11 @@ IMPL_LINK_NOARG_TYPED(SwCustomizeAddressBlockDialog, OKHdl_Impl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, DDListBox*, pBox) +IMPL_LINK_TYPED(SwCustomizeAddressBlockDialog, ListBoxSelectHdl_Impl, SvTreeListBox*, pBox, void) { sal_Int32 nUserData = (sal_Int32)reinterpret_cast<sal_IntPtr>(pBox->FirstSelected()->GetUserData()); // Check if the selected entry is already in the address and then forbid inserting m_pInsertFieldIB->Enable(nUserData >= 0 || !HasItem_Impl(nUserData)); - return 0; } IMPL_LINK_NOARG(SwCustomizeAddressBlockDialog, EditModifyHdl_Impl) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 2a18a5f7a46b..c2164082b7e8 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -221,7 +221,7 @@ private: DialogType m_eType; DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK(ListBoxSelectHdl_Impl, DDListBox*); + DECL_LINK_TYPED(ListBoxSelectHdl_Impl, SvTreeListBox*, void); DECL_LINK(EditModifyHdl_Impl, void *); DECL_LINK_TYPED(ImageButtonHdl_Impl, Button*, void); DECL_LINK(SelectionChangedHdl_Impl, AddressMultiLineEdit*); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b0785205aad2..e1d8502f0125 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -569,7 +569,7 @@ void SwEditRegionDlg::SelectSection(const OUString& rSectionName) // selected entry in TreeListBox is showed in Edit window in case of // multiselection some controls are disabled -IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox, void ) { bDontCheckPasswd = true; SvTreeListEntry* pEntry=pBox->FirstSelected(); @@ -669,7 +669,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) pBox->SelectAll( false ); pBox->Select( pEntry ); GetFirstEntryHdl(pBox); - return 0; + return; } else m_pPasswdCB->Check(aCurPasswd.getLength() > 0); @@ -727,10 +727,9 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) m_pPasswdPB->Enable(bPasswdEnabled); } bDontCheckPasswd = false; - return 0; } -IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox, void ) { if( !pBox->GetSelectionCount() ) { @@ -750,7 +749,6 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox ) UseFileHdl(m_pFileCB); DDEHdl(m_pDDECB); } - return 0; } // in OkHdl the modified settings are being applied and reversed regions are deleted diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 8159a72c6a3a..9b27a7cfecd0 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -601,7 +601,7 @@ SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& r m_pAutoTextLB->SetSelectionMode( SINGLE_SELECTION ); SetExchangeSupport(); - m_pAutoTextLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl)); + m_pAutoTextLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectTreeListBoxHdl)); m_pAutoTextGroupLB->SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl)); m_pExampleWIN->Hide(); diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index b5a9c92eeb43..346349a1cbfc 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -133,6 +133,10 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl) return 0; } +IMPL_LINK_TYPED( SwVisitingCardPage, AutoTextSelectTreeListBoxHdl, SvTreeListBox*, pBox, void ) +{ + AutoTextSelectHdl(pBox); +} IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox ) { if(m_xAutoText.is()) diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 7306303ae422..4167c43c94fe 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -97,6 +97,7 @@ class SwVisitingCardPage : public SfxTabPage SwOneExampleFrame* pExampleFrame; ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText; + DECL_LINK_TYPED( AutoTextSelectTreeListBoxHdl, SvTreeListBox*, void ); DECL_LINK( AutoTextSelectHdl, void* ); DECL_LINK( FrameControlInitializedHdl, void* ); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 0ab326297cfe..3911cd579a5c 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -75,13 +75,13 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) m_pUsedDBTLB->SetSpaceBetweenEntries(0); m_pUsedDBTLB->SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND)); - Link<> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); + Link<SvTreeListBox*,void> aLink = LINK(this, SwChangeDBDlg, TreeSelectHdl); m_pUsedDBTLB->SetSelectHdl(aLink); m_pUsedDBTLB->SetDeselectHdl(aLink); m_pAvailDBTLB->SetSelectHdl(aLink); m_pAvailDBTLB->SetSelectHdl(aLink); - TreeSelectHdl(); + TreeSelectHdl(NULL); } // initialise database listboxes @@ -231,7 +231,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) +IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry(); @@ -242,7 +242,6 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) bEnable = true; m_pDefineBT->Enable( bEnable ); } - return 0; } // convert database name for display diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index f433a5e414ff..71c871a23b2a 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -434,7 +434,7 @@ void SwFieldDBPage::CheckInsert() EnableInsert(bInsert); } -IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->GetCurEntry(); if (pEntry) @@ -472,7 +472,6 @@ IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) m_pFormat->Enable(bNumFormat); } } - return 0; } IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void) diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index b663cc4956ad..cc118696dc17 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -56,7 +56,7 @@ class SwFieldDBPage : public SwFieldPage DECL_LINK( TypeHdl, ListBox* ); DECL_LINK( NumSelectHdl, NumFormatListBox* ); - DECL_LINK( TreeSelectHdl, SvTreeListBox* ); + DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void ); DECL_LINK(ModifyHdl, void *); DECL_LINK_TYPED(AddDBHdl, Button*, void); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 4385b64cd4f3..267c634535e4 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -202,7 +202,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) FillSelectionLB(nSubType); if ( pSelEntry ) - TypeHdl(); + TypeHdl(NULL); m_pTypeTLB->SetUpdateMode(true); m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl)); @@ -219,7 +219,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) } } -IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl) +IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) { // save old ListBoxPos SvTreeListEntry* pOldEntry = pSelEntry; @@ -236,8 +236,6 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl) FillSelectionLB((sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData())); SubTypeHdl(); - - return 0; } IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl) diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 7a1ea48df165..e4ebe9278d9b 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -50,7 +50,7 @@ class SwFieldDokInfPage : public SwFieldPage sal_uLong nOldFormat; OUString m_sOldCustomFieldName; - DECL_LINK(TypeHdl, void * = 0); + DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void); DECL_LINK(SubTypeHdl, void * = 0); sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 16f2182c49ab..c7a135a61c8d 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -98,7 +98,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet m_pFormatLB->SetDoubleClickHdl (LINK(this, SwFieldRefPage, InsertHdl)); // #i83479# - m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeHdl) ); + m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeTreeListBoxHdl) ); m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, InsertHdl) ); m_pSelectionToolTipLB->SetStyle( m_pSelectionToolTipLB->GetStyle() | WB_HSCROLL ); m_pSelectionToolTipLB->SetSpaceBetweenEntries(1); @@ -407,13 +407,17 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl) bool bFormat = nSize != 0; m_pFormat->Enable(bFormat); - SubTypeHdl(); - ModifyHdl(); + SubTypeHdl(NULL); + ModifyHdl(NULL); } return 0; } +IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void) +{ + SubTypeHdl(NULL); +} IMPL_LINK_NOARG(SwFieldRefPage, SubTypeHdl) { sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index bb1f683d7b5e..24e5944d6b1b 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -62,6 +62,7 @@ class SwFieldRefPage : public SwFieldPage DECL_LINK(TypeHdl, void *); DECL_LINK(SubTypeHdl, void * = 0); + DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void); DECL_LINK(ModifyHdl, void * = 0); void UpdateSubType(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 2e0e2c465df0..9601f18b5e61 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2131,8 +2131,8 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) else m_pLevelFT->SetText(sLevelStr); - Link<> aLink = m_pLevelLB->GetSelectHdl(); - m_pLevelLB->SetSelectHdl(Link<>()); + Link<SvTreeListBox*,void> aLink = m_pLevelLB->GetSelectHdl(); + m_pLevelLB->SetSelectHdl(Link<SvTreeListBox*,void>()); m_pLevelLB->Select( m_pLevelLB->GetEntry( bToxIsIndex ? 1 : 0 ) ); m_pLevelLB->SetSelectHdl(aLink); @@ -2368,10 +2368,10 @@ void SwTOXEntryTabPage::WriteBackLevel() } } -IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) +IMPL_LINK_TYPED(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox, void) { if(bInLevelHdl) - return 0; + return; bInLevelHdl = true; WriteBackLevel(); @@ -2409,7 +2409,6 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, SvTreeListBox*, pBox) } bInLevelHdl = false; pBox->GrabFocus(); - return 0; } IMPL_LINK_TYPED(SwTOXEntryTabPage, SortKeyHdl, Button*, pButton, void) diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index c3f031e9861e..e7a5ab463dfd 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -184,7 +184,7 @@ void SwGlossaryGroupDlg::Apply() } } -IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, ) +IMPL_LINK_NOARG_TYPED( SwGlossaryGroupDlg, SelectHdl, SvTreeListBox*, void ) { m_pNewPB->Enable(false); SvTreeListEntry* pFirstEntry = m_pGroupTLB->FirstSelected(); @@ -205,7 +205,6 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, ) m_pRenamePB->Enable(!bExists && !sName.isEmpty()); m_pDelPB->Enable(IsDeleteAllowed(sEntry)); } - return 0; } IMPL_LINK_NOARG_TYPED(SwGlossaryGroupDlg, NewHdl, Button*, void) diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 0f411c2c4294..d89f30d81fac 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -273,11 +273,11 @@ void SwGlossaryDlg::dispose() } // select new group -IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox, void ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); if(!pEntry) - return 0; + return; SvTreeListEntry* pParent = pBox->GetParent(pEntry) ? pBox->GetParent(pEntry) : pEntry; GroupUserData* pGroupData = static_cast<GroupUserData*>(pParent->GetUserData()); ::SetCurrGlosGroup(pGroupData->sGroupName @@ -316,7 +316,6 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) aReq.AppendItem(SfxStringItem(FN_SET_ACT_GLOSSARY, sTemp)); aReq.Done(); } - return 0; } void SwGlossaryDlg::Apply() diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx index 6efb9212dd7a..2935e5bd8b8e 100644 --- a/sw/source/uibase/inc/changedb.hxx +++ b/sw/source/uibase/inc/changedb.hxx @@ -46,7 +46,7 @@ class SwChangeDBDlg: public SvxStandardDialog SwWrtShell *pSh; SwFieldMgr *pMgr; - DECL_LINK(TreeSelectHdl, void * = 0); + DECL_LINK_TYPED(TreeSelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(ButtonHdl, Button*, void); DECL_LINK_TYPED(AddDBHdl, Button*, void); diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index 1808a47fca21..0ca522822340 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -91,7 +91,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog protected: virtual void Apply() SAL_OVERRIDE; - DECL_LINK( SelectHdl, SvTabListBox* ); + DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED(NewHdl, Button *, void); DECL_LINK_TYPED( DeleteHdl, Button*, void ); DECL_LINK(ModifyHdl, void *); diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index a25a52ec29ec..d1d81dc5747e 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -125,7 +125,7 @@ class SwGlossaryDlg : public SvxStandardDialog DECL_LINK( NameModify, Edit * ); DECL_LINK( NameDoubleClick, SvTreeListBox * ); - DECL_LINK( GrpSelect, SvTreeListBox * ); + DECL_LINK_TYPED( GrpSelect, SvTreeListBox *, void ); DECL_LINK_TYPED( MenuHdl, Menu *, bool ); DECL_LINK_TYPED( EnableHdl, Menu *, bool ); DECL_LINK_TYPED(BibHdl, Button *, void); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index ce91d28fcff1..e7eb2b39d22f 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -156,8 +156,8 @@ private: DECL_LINK(SelectHdl, void *); DECL_LINK(ModifyHdl, void * = 0); DECL_LINK( OrderHdl, ListBox* ); - DECL_LINK(ShowEntryHdl, void *); - DECL_LINK(SaveEntryHdl, void *); + DECL_LINK_TYPED(ShowEntryHdl, SvTreeListBox*, void); + DECL_LINK_TYPED(SaveEntryHdl, SvTreeListBox*, void); void DelUserData(); void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index e644d92d1d1a..1019112cec88 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -79,8 +79,8 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg OUString sAutoFormat; VclPtr<SvxTPView> pTPView; VclPtr<SvxRedlinTable> pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox - Link<> aOldSelectHdl; - Link<> aOldDeselectHdl; + Link<SvTreeListBox*,void> aOldSelectHdl; + Link<SvTreeListBox*,void> aOldDeselectHdl; bool bOnlyFormatedRedlines; bool bHasReadonlySel; bool bRedlnAutoFormat; @@ -93,8 +93,8 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg DECL_DLLPRIVATE_LINK( RejectHdl, void* ); DECL_DLLPRIVATE_LINK( RejectAllHdl, void* ); DECL_DLLPRIVATE_LINK( UndoHdl, void* ); - DECL_DLLPRIVATE_LINK( DeselectHdl, void* ); - DECL_DLLPRIVATE_LINK( SelectHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( DeselectHdl, SvTreeListBox*, void ); + DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); DECL_DLLPRIVATE_LINK_TYPED( SelectTimerHdl, Timer*, void ); DECL_DLLPRIVATE_LINK_TYPED( GotoHdl, Timer*, void ); DECL_DLLPRIVATE_LINK_TYPED( CommandHdl, SvSimpleTable*, void ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 368509214b22..605dba521e80 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -105,8 +105,8 @@ class SwEditRegionDlg : public SfxModalDialog void RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry); size_t FindArrPos(const SwSectionFormat* pFormat); - DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); - DECL_LINK( DeselectHdl, SvTreeListBox * ); + DECL_LINK_TYPED( GetFirstEntryHdl, SvTreeListBox *, void ); + DECL_LINK_TYPED( DeselectHdl, SvTreeListBox *, void ); DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK(NameEditHdl, void *); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 99ef88a13a60..6da63e4bbfdc 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -55,7 +55,8 @@ class SwCondCollPage : public SfxTabPage DECL_LINK_TYPED( OnOffHdl, Button*, void ); DECL_LINK( AssignRemoveHdl, PushButton*); DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( SelectHdl, void* ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 44478ef463e2..aa625e47bb59 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -413,7 +413,7 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(StyleSelectHdl, ListBox*); DECL_LINK_TYPED(EditStyleHdl, Button*, void); DECL_LINK_TYPED(InsertTokenHdl, Button*, void); - DECL_LINK(LevelHdl, SvTreeListBox*); + DECL_LINK_TYPED(LevelHdl, SvTreeListBox*, void); DECL_LINK_TYPED(AutoRightHdl, Button*, void); DECL_LINK(TokenSelectedHdl, SwFormToken*); DECL_LINK(TabPosHdl, MetricField*); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index ce3591947f8d..fae6131d9a61 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -933,18 +933,15 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl) return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, DeselectHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, DeselectHdl, SvTreeListBox*, void) { // avoid flickering of buttons: aDeselectTimer.Start(); - - return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectHdl, SvTreeListBox*, void) { SelectTimerHdl(nullptr); - return 0; } IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void) diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 887338c32818..a9f7bea7e94c 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -46,17 +46,18 @@ private: css::uno::Reference< css::uno::XComponentContext > mxCtx; css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > maCerts; - SignatureInformations maCertsToIgnore; + SignatureInformations maCertsToIgnore; - VclPtr<SvSimpleTable> m_pCertLB; - VclPtr<PushButton> m_pViewBtn; - VclPtr<OKButton> m_pOKBtn; + VclPtr<SvSimpleTable> m_pCertLB; + VclPtr<PushButton> m_pViewBtn; + VclPtr<OKButton> m_pOKBtn; - bool mbInitialized; + bool mbInitialized; sal_uInt16 GetSelectedEntryPos() const; + DECL_LINK_TYPED(ViewButtonHdl, Button*, void); - DECL_LINK( CertificateHighlightHdl, void* ); + DECL_LINK_TYPED(CertificateHighlightHdl, SvTreeListBox*, void ); DECL_LINK( CertificateSelectHdl, void* ); void ImplShowCertificateDetails(); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index b3b6de53ece5..53499cd875b7 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -102,7 +102,7 @@ private: vcl::Font m_aStdFont; vcl::Font m_aFixedWidthFont; - DECL_LINK( ElementSelectHdl, void* ); + DECL_LINK_TYPED( ElementSelectHdl, SvTreeListBox*, void ); void Clear(); void InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont = false ); @@ -130,9 +130,9 @@ private: OUString msCertNotValidated; DECL_LINK_TYPED( ViewCertHdl, Button*, void ); - DECL_LINK( CertSelectHdl, void* ); + DECL_LINK_TYPED( CertSelectHdl, SvTreeListBox*, void ); void Clear(); - SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, + SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, css::uno::Reference< css::security::XCertificate > rxCert, bool bValid); diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 843d450f9cb4..b56ddef455a2 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -91,10 +91,10 @@ private: DECL_LINK_TYPED(ViewButtonHdl, Button*, void); DECL_LINK_TYPED(AddButtonHdl, Button*, void); DECL_LINK_TYPED(RemoveButtonHdl, Button*, void); - DECL_LINK( SignatureHighlightHdl, void* ); + DECL_LINK_TYPED(SignatureHighlightHdl, SvTreeListBox*, void ); DECL_LINK( SignatureSelectHdl, void* ); DECL_LINK( StartVerifySignatureHdl, void* ); - DECL_LINK_TYPED( OKButtonHdl, Button*, 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 ae1bca6a2183..1bd89e1d7a17 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -131,7 +131,7 @@ private: DECL_LINK_TYPED( RemoveCertPBHdl, Button*, void ); DECL_LINK_TYPED( AddLocPBHdl, Button*, void ); DECL_LINK_TYPED( RemoveLocPBHdl, Button*, void ); - DECL_LINK( TrustCertLBSelectHdl, void* ); + DECL_LINK_TYPED( TrustCertLBSelectHdl, SvTreeListBox*, void ); DECL_LINK( TrustFileLocLBSelectHdl, void* ); void FillCertLB(); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index ab2636896da8..5f015f39c0d2 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -200,12 +200,11 @@ uno::Reference< css::security::XCertificate > CertificateChooser::GetSelectedCer return xCert; } -IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl) +IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox*, void) { bool bEnable = GetSelectedCertificate().is(); m_pViewBtn->Enable( bEnable ); m_pOKBtn->Enable( bEnable ); - return 0; } IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl) diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index acc87fd943e1..4dd2f7c39f42 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -309,7 +309,7 @@ void CertificateViewerDetailsTP::ActivatePage() { } -IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) +IMPL_LINK_NOARG_TYPED(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pElementsLB->FirstSelected(); OUString aElementText; @@ -326,8 +326,6 @@ IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) m_pValueDetails->SetFont( bFixedWidthFont? m_aFixedWidthFont : m_aStdFont ); m_pValueDetails->SetControlFont( bFixedWidthFont? m_aFixedWidthFont : m_aStdFont ); m_pValueDetails->SetText( aElementText ); - - return 0; } struct CertPath_UserData @@ -433,7 +431,7 @@ IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) } } -IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) +IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, CertSelectHdl, SvTreeListBox*, void) { OUString sStatus; SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected(); @@ -446,7 +444,6 @@ IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) mpCertStatusML->SetText( sStatus ); mpViewCertPB->Enable( pEntry && ( pEntry != mpCertPathLB->Last() ) ); - return 0; } void CertificateViewerCertPathTP::Clear() diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index eb24163e8bb4..627cae6ea282 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -370,14 +370,12 @@ short DigitalSignaturesDialog::Execute() return Dialog::Execute(); } -IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl) +IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*, void) { bool bSel = m_pSignaturesLB->FirstSelected(); m_pViewBtn->Enable( bSel ); if ( m_pAddBtn->IsEnabled() ) // not read only m_pRemoveBtn->Enable( bSel ); - - return 0; } IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void) diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 5181f710b314..4e725caae7f7 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -309,10 +309,9 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, vo } } -IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl) +IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, SvTreeListBox*, void) { ImplCheckButtons(); - return 0; } IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl) |