diff options
78 files changed, 170 insertions, 144 deletions
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index bed7a622690b..d95e00dabf18 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -468,18 +468,18 @@ void MacroChooser::CheckButtons() -IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool) { StoreMacroDescription(); if (nMode == Recording) { SbMethod* pMethod = GetMacro(); if ( pMethod && !QueryReplaceMacro( pMethod->GetName(), this ) ) - return 0; + return false; } EndDialog(Macro_OkRun); - return 0; + return false; } IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void ) diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index c16d7d18b0c1..b4f621e42f07 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -68,7 +68,7 @@ private: Mode nMode; DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void ); - DECL_LINK(MacroDoubleClickHdl, void *); + DECL_LINK_TYPED( MacroDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void ); DECL_LINK( EditModifyHdl, Edit * ); DECL_LINK_TYPED( ButtonHdl, Button *, void ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 1807da6ce0f9..2e9e87793b6a 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -593,7 +593,7 @@ IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void ) GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) ); } -IMPL_LINK( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTabListBox *, ) +IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool) { return GenericHandler_Impl( this, NULL ); } diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 0a4c29b944bf..ee5ba51944ca 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -949,12 +949,11 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, SelectHdl, SvTreeListBox*, pCtrl, void UpdateUI(); } -IMPL_LINK( SvxScriptSelectorDialog, FunctionDoubleClickHdl, Control*, pCtrl ) +IMPL_LINK_NOARG_TYPED( SvxScriptSelectorDialog, FunctionDoubleClickHdl, SvTreeListBox*, bool ) { - (void)pCtrl; if (m_pOKButton->IsEnabled()) ClickHdl(m_pOKButton); - return 0; + return false; } // Check if command is selected and enable the OK button accordingly diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 795887cd3913..71532bb2faed 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -561,10 +561,10 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(const OUString& aStrMark) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, DoubleClickApplyHdl_Impl, SvTreeListBox*, bool) { ClickApplyHdl_Impl(NULL); - return 0; + return false; } IMPL_LINK_NOARG_TYPED(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl, Button*, void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 685f9de6a061..1f02356c7ef6 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -247,12 +247,10 @@ IMPL_LINK_TYPED( SvBaseLinksDlg, LinksSelectHdl, SvTreeListBox *, pSvTabListBox, } } -IMPL_LINK( SvBaseLinksDlg, LinksDoubleClickHdl, SvTabListBox *, pSvTabListBox ) +IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, LinksDoubleClickHdl, SvTreeListBox *, bool ) { - (void)pSvTabListBox; - ChangeSourceClickHdl( 0 ); - return 0; + return false; } IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, AutomaticClickHdl, Button*, void ) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 697a8ebbe532..4604ca5cf714 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -412,7 +412,7 @@ IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox * } } -IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox ) +IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvTreeListBox*, pBox, bool ) { SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) @@ -433,7 +433,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox //! workaround to set the selection since calling SelectEntryPos within //! the double click handler does not work Application::PostUserEvent( LINK( this, SvxThesaurusDialog, SelectFirstHdl_Impl ), pBox, true ); - return 0; + return false; } IMPL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void *, p, void ) diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 1ad068dcf41b..472e9abce1ea 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -162,7 +162,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK(DoubleClickEditHdl, void*); + DECL_LINK_TYPED(DoubleClickEditHdl, SvTreeListBox*, bool); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 23d4bc638ed9..75cb407b8372 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -55,9 +55,9 @@ namespace svx DECL_LINK_TYPED( NewHdl, Button*, void ); DECL_LINK_TYPED( EditHdl, Button*, void ); DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK(PathBoxDoubleClickHdl, void *); + DECL_LINK_TYPED( PathBoxDoubleClickHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, 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/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 209fe82c6d69..5ee6b9a3e105 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -86,9 +86,9 @@ protected: virtual void Move () SAL_OVERRIDE; - DECL_LINK_TYPED (ClickApplyHdl_Impl, Button*, void ); - DECL_LINK (DoubleClickApplyHdl_Impl, void* ); - DECL_LINK_TYPED (ClickCloseHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickApplyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK_TYPED( ClickCloseHdl_Impl, Button*, void ); public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index beffb1cadf5a..22f9a0db326f 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -65,10 +65,10 @@ class SvBaseLinksDlg : public ModalDialog Idle aUpdateIdle; DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void ); - DECL_LINK( LinksDoubleClickHdl, SvTabListBox * ); + DECL_LINK_TYPED( LinksDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); DECL_LINK_TYPED( ManualClickHdl, Button *, void ); - DECL_LINK_TYPED(UpdateNowClickHdl, Button *, void); + DECL_LINK_TYPED( UpdateNowClickHdl, Button *, void); DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void ); DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void ); DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 5d99c58149d6..a0b06fb7d668 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -39,9 +39,9 @@ class _SfxMacroTabPage : public SfxTabPage 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( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); - + bool AssignDeleteHdl(Control *); DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void ); protected: diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index bf19996bbd99..f58661d7f1fd 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -61,7 +61,7 @@ class _SvxMacroTabPage : public SfxTabPage { DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); - DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * ); + DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 87a8e1ddd2ce..3ce1a6765bd2 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -152,7 +152,7 @@ private: bool Click_Impl(PushButton* pIB); // Handler DECL_LINK( LostFocusHdl_Impl, Edit* ); - DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); + DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); DECL_LINK( SelFormatHdl_Impl, void * ); DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); @@ -160,7 +160,7 @@ private: DECL_LINK( EditHdl_Impl, Edit* ); DECL_LINK( OptHdl_Impl, void * ); DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void); + DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void); }; #endif diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index d3768a44f0d6..76726d33728b 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -139,7 +139,7 @@ private: DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); - DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); + DECL_LINK_TYPED( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void); DECL_LINK( OpenURLHdl_Impl, void *); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index fcce075ea686..26801c1b1581 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -54,10 +54,10 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); DECL_LINK_TYPED( PathHdl_Impl, Button*, void); - DECL_LINK(DoubleClickPathHdl_Impl, void *); + DECL_LINK_TYPED( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); - DECL_LINK_TYPED(PathSelect_Impl, SvTreeListBox*, 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/selector.hxx b/cui/source/inc/selector.hxx index c88e47286747..92a8a8c0bf66 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -186,7 +186,7 @@ class SvxScriptSelectorDialog : public ModelessDialog DECL_LINK_TYPED( ClickHdl, Button *, void ); DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK( FunctionDoubleClickHdl, Control* ); + DECL_LINK_TYPED( FunctionDoubleClickHdl, SvTreeListBox*, bool ); void UpdateUI(); diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 2a6b5c5ce245..26f75237ba50 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -147,7 +147,7 @@ public: DECL_LINK( LanguageHdl_Impl, ListBox * ); DECL_LINK( WordSelectHdl_Impl, ComboBox * ); DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK( AlternativesDoubleClickHdl_Impl, SvxCheckListBox * ); + DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index eec02b8bd7b3..831ff0c39df2 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -290,10 +290,10 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, NewHdl, Button*, void) openLinkDialog(sNewName,sNewLocation); } -IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, PathBoxDoubleClickHdl, SvTreeListBox*, bool) { EditHdl(NULL); - return 0; + return false; } diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index d049e93cb56c..61e8f22354b2 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -575,10 +575,10 @@ IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, ResetBtnHdl_Impl, Button*, void ) Reset(); } -IMPL_LINK_NOARG( CuiAboutConfigTabPage, DoubleClickHdl_Impl ) +IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool ) { StandardHdl_Impl(NULL); - return 0; + return false; } IMPL_LINK_NOARG_TYPED( CuiAboutConfigTabPage, StandardHdl_Impl, Button*, void ) diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 047d267e52b3..daa9456b619f 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -62,7 +62,7 @@ private: void InsertEntry( SvTreeListEntry *pEntry); DECL_LINK_TYPED( StandardHdl_Impl, Button*, void ); - DECL_LINK( DoubleClickHdl_Impl, void* ); + DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); DECL_LINK_TYPED( ResetBtnHdl_Impl, Button*, void ); DECL_LINK_TYPED( SearchHdl_Impl, Button*, void ); DECL_LINK_TYPED( ExpandingHdl_Impl, SvTreeListBox*, bool ); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 307cdcdf67d1..7f078937f2c5 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1515,7 +1515,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) -IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox ) +IMPL_LINK_TYPED( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox, bool ) { if (pBox == m_pLinguModulesCLB) { @@ -1529,7 +1529,7 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox ) { ClickHdl_Impl(m_pLinguOptionsEditPB); } - return 0; + return false; } diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index eb0037d965e6..893c49e6364a 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -523,10 +523,10 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder ) -IMPL_LINK_NOARG(SvxPathTabPage, DoubleClickPathHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPathTabPage, DoubleClickPathHdl_Impl, SvTreeListBox*, bool) { PathHdl_Impl(NULL); - return 0; + return false; } IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 009c5e7b947d..f223f9debccd 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -722,10 +722,10 @@ IMPL_LINK_TYPED(OfaSwAutoFmtOptionsPage, SelectHdl, SvTreeListBox*, pBox, void) m_pEditPB->Enable(0 != pBox->FirstSelected()->GetUserData()); } -IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl) +IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, bool) { EditHdl(NULL); - return 0; + return false; } IMPL_LINK_NOARG_TYPED(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 153ce47b39e4..2401676279d5 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -296,10 +296,15 @@ IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) { - AssignDeleteHdl_Impl(static_cast<PushButton*>(pBtn)); + AssignDeleteHdl(pBtn); } -IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) +IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool ) +{ + return AssignDeleteHdl(pBtn); +} + +bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -308,7 +313,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) { DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" ); - return 0; + return false; } const bool bAssEnabled = pBtn != mpImpl->pDeletePB && mpImpl->pAssignPB->IsEnabled(); @@ -342,7 +347,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) rListBox.SetUpdateMode( true ); EnableButtons(); - return 0; + return false; } IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void ) @@ -367,7 +372,7 @@ void _SfxMacroTabPage::InitAndSetHandler() { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); - Link<> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); + Link<SvTreeListBox*,bool> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); mpImpl->pMacroLB->SetDoubleClickHdl( aLnk ); mpImpl->pDeletePB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) ); mpImpl->pAssignPB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) ); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 8308d2e3e46f..1e66ff0bc7b3 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1156,7 +1156,7 @@ void SvxNumberFormatTabPage::UpdateThousandEngineeringText() #* #************************************************************************/ -IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) +IMPL_LINK_TYPED( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvTreeListBox*, pLb, bool ) { if (pLb == m_pLbFormat) { @@ -1174,7 +1174,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb ) pOKButton->Click(); } } - return 0; + return false; } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index c935867d9ddc..d2c2585587f4 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -756,7 +756,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons _pTreeView->SetDefaultExpandedEntryBmp( _rImage ); _pTreeView->SetDoubleClickHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick)); - _pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryDoubleClick)); + _pTreeView->SetEnterKeyHdl(LINK(this, OAppDetailPageHelper, OnEntryEnterKey)); _pTreeView->SetSelChangeHdl(LINK(this, OAppDetailPageHelper, OnEntrySelChange)); _pTreeView->setCutHandler(LINK(this, OAppDetailPageHelper, OnCutEntry)); @@ -904,11 +904,15 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const OUString& _r } } -IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree) +IMPL_LINK(OAppDetailPageHelper, OnEntryEnterKey, void*, _pTree) +{ + return OnEntryDoubleClick(static_cast<SvTreeListBox*>(_pTree)) ? 0 : 1; +} +IMPL_LINK_TYPED(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree, bool) { OSL_ENSURE( _pTree, "OAppDetailPageHelper, OnEntryDoubleClick: invalid callback!" ); bool bHandled = ( _pTree != NULL ) && getBorderWin().getView()->getAppController().onEntryDoubleClick( *_pTree ); - return bHandled ? 1L : 0L; + return bHandled; } IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 6876f32490bb..ab2331658348 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -151,7 +151,8 @@ namespace dbaui */ DBTreeListBox* createSimpleTree( const OString& _sHelpId, const Image& _rImage); - DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); + DECL_LINK_TYPED( OnEntryDoubleClick, SvTreeListBox*, bool ); + DECL_LINK( OnEntryEnterKey, void* ); DECL_LINK( OnEntrySelChange, void* ); DECL_LINK( OnCutEntry, void* ); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 4e264008184d..e395da6176b2 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -400,9 +400,8 @@ bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewTe bool DBTreeListBox::DoubleClickHdl() { - long nResult = aDoubleClickHdl.Call( this ); // continue default processing if the DoubleClickHandler didn't handle it - return nResult == 0; + return aDoubleClickHdl.Call( this ); } void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,bool _bUp) diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 57d42019cd78..256515258bac 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -236,7 +236,7 @@ IMPL_LINK_NOARG_TYPED(OCollectionView, Up_Click, Button*, void) } } -IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) +IMPL_LINK_NOARG_TYPED(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool) { try { @@ -264,7 +264,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) { DBG_UNHANDLED_EXCEPTION(); } - return 0; + return false; } void OCollectionView::initCurrentPath() diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 8b0e43725597..d4dddc19c449 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -422,17 +422,17 @@ IMPL_LINK_NOARG_TYPED( OAddTableDlg, AddClickHdl, Button*, void ) TableListDoubleClickHdl(NULL); } -IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl ) +IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListDoubleClickHdl, SvTreeListBox*, bool ) { if ( impl_isAddAllowed() ) { impl_addTable(); if ( !impl_isAddAllowed() ) Close(); - return 1L; // handled + return true; // handled } - return 0L; // not handled + return false; // not handled } IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void ) diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index e90bd5d8ef29..c62020bd8fd4 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -47,7 +47,7 @@ namespace dbaui DECL_LINK_TYPED(Up_Click, Button*, void); DECL_LINK_TYPED(NewFolder_Click, Button*, void); DECL_LINK_TYPED(Save_Click, Button*, void); - DECL_LINK(Dbl_Click_FileView,void*); + DECL_LINK_TYPED(Dbl_Click_FileView, SvTreeListBox*, bool); /// sets the fixedtext to the right content void initCurrentPath(); diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 7b590cf38270..2bca53be2179 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -47,7 +47,7 @@ namespace dbaui :public SvTreeListBox ,public IDragTransferableListener { - DECL_LINK( OnDoubleClick, SvTreeListBox* ); + DECL_LINK_TYPED( OnDoubleClick, SvTreeListBox*, bool ); DECL_LINK_TYPED( ScrollUpHdl, Timer*, void ); DECL_LINK_TYPED( ScrollDownHdl, Timer*, void ); DECL_LINK_TYPED( DropHdl, void*, void ); diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index e265bbce3674..bd14dee9756d 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -72,7 +72,7 @@ namespace dbaui DECL_LINK_TYPED( AddClickHdl, Button*, void ); DECL_LINK_TYPED( CloseClickHdl, Button*, void); - DECL_LINK( TableListDoubleClickHdl, void* ); + DECL_LINK_TYPED( TableListDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( TableListSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( OnTypeSelected, Button*, void ); diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index b56469e24d4b..76ed893dd1b5 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -342,7 +342,7 @@ void OTableWindowListBox::GetFocus() SvTreeListBox::GetFocus(); } -IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, bool ) { // tell my parent vcl::Window* pParent = Window::GetParent(); @@ -350,7 +350,7 @@ IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ ) static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry()); - return 0; + return false; } void OTableWindowListBox::Command(const CommandEvent& rEvt) diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 34a9e7585fcf..f2d994fafcb7 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -165,10 +165,10 @@ IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, SvTreeL updateStates(); } -IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bool) { onEdit(); - return 0; + return false; } short XMLFilterSettingsDialog::Execute() diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index d9a3be074063..99e4cd8667c7 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -93,7 +93,7 @@ public: DECL_LINK_TYPED(ClickHdl_Impl, Button *, void ); DECL_LINK_TYPED(SelectionChangedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK(DoubleClickHdl_Impl, void * ); + DECL_LINK_TYPED(DoubleClickHdl_Impl, SvTreeListBox*, bool ); virtual short Execute() SAL_OVERRIDE; diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index a08bc05d572c..71cc14e544d0 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -187,7 +187,7 @@ IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void ) mpDlg->RemovablePlaceSelected(false); } -IMPL_LINK_NOARG( PlacesListBox, DoubleClick ) +IMPL_LINK_NOARG_TYPED( PlacesListBox, DoubleClick, SvTreeListBox*, bool ) { sal_uInt16 nSelected = mpImpl->GetCurrRow(); PlacePtr pPlace = maPlaces[nSelected]; @@ -212,7 +212,7 @@ IMPL_LINK_NOARG( PlacesListBox, DoubleClick ) break; }; } - return 0; + return false; } void PlacesListBox::updateView( ) diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 998054601da0..b5b6a6ed45bf 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -75,7 +75,7 @@ class PlacesListBox : public Control Image getEntryIcon( PlacePtr pPlace ); DECL_LINK_TYPED( Selection, SvTreeListBox*, void ); - DECL_LINK( DoubleClick, void* ); + DECL_LINK_TYPED( DoubleClick, SvTreeListBox*, bool ); }; #endif diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 90d522bc516d..f0cf7bfe067d 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -916,7 +916,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, EnableControls(); } -IMPL_LINK_NOARG ( RemoteFilesDialog, DoubleClickHdl ) +IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool ) { if( m_pFileView->GetSelectionCount() ) { @@ -940,7 +940,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, DoubleClickHdl ) } } - return 1; + return true; } IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl ) diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 9f4791a158fc..89cda7f442df 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -189,7 +189,7 @@ private: DECL_LINK ( SelectServiceHdl, void * ); DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void ); - DECL_LINK( DoubleClickHdl, void * ); + DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK( SelectHdl, void * ); DECL_LINK( FileNameGetFocusHdl, void * ); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 68b738181538..714c68d4dd7a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1596,13 +1596,13 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox ) -IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool) { _pImp->_bDoubleClick = true; OpenHdl_Impl( NULL ); _pImp->_bDoubleClick = false; - return 0; + return false; } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 553fae105ce8..54103fca5376 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -121,12 +121,12 @@ private: void AddControls_Impl( ); DECL_LINK( SelectHdl_Impl, SvTabListBox* ); - DECL_LINK(DblClickHdl_Impl, void *); + DECL_LINK_TYPED( DblClickHdl_Impl, SvTreeListBox*, bool); DECL_LINK(EntrySelectHdl_Impl, void *); DECL_LINK( OpenDoneHdl_Impl, SvtFileView* ); - DECL_LINK_TYPED(AutoExtensionHdl_Impl, Button*, void); + DECL_LINK_TYPED( AutoExtensionHdl_Impl, Button*, void); DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED(PlayButtonHdl_Impl, Button*, void); + DECL_LINK_TYPED( PlayButtonHdl_Impl, Button*, void); // removes a filter with wildcards from the path and returns it diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 5c8701980701..3aa326b63444 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -37,6 +37,7 @@ class SvtFileView_Impl; class SvTreeListEntry; class HeaderBar; struct SvtContentEntry; +class SvTreeListBox; /// the result of an action in the FileView enum FileViewResult @@ -158,12 +159,12 @@ public: void SetNoSelection(); void SetSelectHdl( const Link<>& rHdl ); - void SetDoubleClickHdl( const Link<>& rHdl ); + void SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl ); void SetOpenDoneHdl( const Link<>& rHdl ); - sal_uLong GetSelectionCount() const; - SvTreeListEntry* FirstSelected() const; - SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const; + sal_uLong GetSelectionCount() const; + SvTreeListEntry* FirstSelected() const; + SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const; void EnableAutoResize(); void EnableDelete( bool bEnable ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 2a3cba9caf30..76113ad610ad 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -282,7 +282,7 @@ class SVT_DLLPUBLIC SvTreeListBox SvLBoxItem* pEdItem; protected: - Link<> aDoubleClickHdl; + Link<SvTreeListBox*,bool> aDoubleClickHdl; SvTreeListEntry* pTargetEntry; SvLBoxButtonData* pCheckButtonData; std::vector<SvLBoxTab*> aTabs; @@ -477,10 +477,10 @@ public: 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;} + void SetDoubleClickHdl(const Link<SvTreeListBox*,bool>& rNewHdl) {aDoubleClickHdl=rNewHdl;} const Link<SvTreeListBox*,void>& GetSelectHdl() const { return aSelectHdl; } const Link<SvTreeListBox*,void>& GetDeselectHdl() const { return aDeselectHdl; } - const Link<>& GetDoubleClickHdl() const { return aDoubleClickHdl; } + const Link<SvTreeListBox*,bool>& GetDoubleClickHdl() const { return aDoubleClickHdl; } void SetExpandingHdl(const Link<SvTreeListBox*,bool>& rNewHdl){aExpandingHdl=rNewHdl;} void SetExpandedHdl(const Link<SvTreeListBox*,void>& rNewHdl){aExpandedHdl=rNewHdl;} diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index cac6622c76bf..521d574055f9 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -504,12 +504,12 @@ IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void ) OnDoubleClickHdl(NULL); } -IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl ) +IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool ) { if ( m_aCreateLink.IsSet() ) m_aCreateLink.Call(this); - return 0L; + return false; } void OAddFieldWindow::setImageList(sal_Int16 _eBitmapSet) diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index fcb03b0fc80f..b9f3f03ca29f 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -70,7 +70,7 @@ class OAddFieldWindow :public FloatingWindow ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener; DECL_LINK_TYPED( OnClickHdl, Button*, void ); - DECL_LINK( OnDoubleClickHdl, void* ); + DECL_LINK_TYPED( OnDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void ); DECL_LINK_TYPED( OnSortAction, ToolBox*, void ); diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 0b0ab2ed1d80..882cec04d277 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -165,16 +165,16 @@ IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnClickHdl, Button*, void) { EditBtnHdl(nullptr); } -IMPL_LINK_NOARG(ScCondFormatManagerDlg, EditBtnHdl) +IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, EditBtnHdl, SvTreeListBox*, bool) { ScConditionalFormat* pFormat = m_pCtrlManager->GetSelection(); if(!pFormat) - return 0; + return false; EndDialog( DLG_RET_EDIT ); - return 0; + return false; } IMPL_LINK_NOARG_TYPED(ScCondFormatManagerDlg, AddBtnHdl, Button*, void) diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index a72e6a20c852..f581daf7eaa6 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -70,7 +70,7 @@ private: DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); DECL_LINK_TYPED(AddBtnHdl, Button*, void); - DECL_LINK(EditBtnHdl, void*); + DECL_LINK_TYPED(EditBtnHdl, SvTreeListBox*, bool); bool mbModified; }; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index ecd4f0c53feb..9a01602c7d30 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -102,7 +102,7 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); - DECL_LINK( ContentDoubleClickHdl, void* ); + DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( ExecDragHdl, void*, void ); public: SvTreeListEntry* pTmpEntry; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 230bfa2d2c61..c2bcbb4c6b7b 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -47,7 +47,7 @@ class ScSolverOptionsDialog : public ModalDialog DECL_LINK( EngineSelectHdl, void* ); DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); - DECL_LINK( SettingsDoubleClickHdl, void* ); + DECL_LINK_TYPED( SettingsDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( ButtonHdl, Button*, void ); void ReadFromComponent(); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 9df9f459ed7f..c6ed2a3a5d2d 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -355,10 +355,10 @@ IMPL_LINK_TYPED( ScSolverOptionsDialog, ButtonHdl, Button*, pBtn, void ) EditOption(); } -IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, bool) { EditOption(); - return 0; + return false; } IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl) diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index a85e24073453..c85f30516256 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -349,7 +349,7 @@ static OUString lcl_GetDBAreaRange( ScDocument* pDoc, const OUString& rDBName ) return aRet; } -IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) { sal_uInt16 nType; sal_uLong nChild; @@ -359,7 +359,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) if( pEntry && (nType != SC_CONTENT_ROOT) && (nChild != SC_CONTENT_NOCHILD) ) { if ( bHiddenDoc ) - return 0; //! spaeter... + return false; //! spaeter... OUString aText( GetEntryText( pEntry ) ); @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) ScNavigatorDlg::ReleaseFocus(); // set focus into document } - return 0; + return false; } void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 803f8e9bbe0e..64024a84d367 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -389,7 +389,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) } } -IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) +IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) { if( !mbDocImported || maLbDocs->GetSelectEntryPos() != 0 ) { @@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) } } } - return 0L; + return false; } IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index bdfbed19477a..f645e9fdd28f 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -146,7 +146,7 @@ private: DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void ); DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void ); DECL_LINK( ClickPageHdl, void * ); - DECL_LINK( ClickObjectHdl, void * ); + DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool ); DECL_LINK( SelectDocumentHdl, void * ); DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 00ef0bc5b7f6..964282975222 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1726,8 +1726,6 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<>& rLink ) { aPageDoubleClickLink = rLink; - if ( pCPage ) - pCPage->SetOpenHdl( aPageDoubleClickLink ); if ( pIPage ) pIPage->SetDoubleClickHdl( aPageDoubleClickLink ); if ( pSPage ) @@ -1736,7 +1734,10 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link<>& rLink ) pBPage->SetDoubleClickHdl( aPageDoubleClickLink ); } - +IMPL_LINK_TYPED(SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl, SvTreeListBox*, p, bool) +{ + return aPageDoubleClickLink.Call(p); +} void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive ) { diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index f3e35895b095..29728f853784 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -64,7 +64,7 @@ public: virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - inline void SetOpenHdl( const Link<>& rLink ) { SetDoubleClickHdl( rLink ); } + inline void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); } OUString GetSelectEntry() const; }; @@ -101,7 +101,7 @@ public: virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; - void SetOpenHdl( const Link<>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); } + void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); } OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); } void SetFocusOnBox() { m_pContentBox->GrabFocus(); } }; @@ -317,6 +317,7 @@ private: DECL_LINK_TYPED(InitHdl, Idle *, void); DECL_LINK_TYPED(SelectFactoryHdl, Idle *, void); DECL_LINK(KeywordHdl, void *); + DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); public: SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); @@ -353,7 +354,7 @@ ContentTabPage_Impl* SfxHelpIndexWindow_Impl::GetContentPage() if ( !pCPage ) { pCPage = VclPtr<ContentTabPage_Impl>::Create( m_pTabCtrl, this ); - pCPage->SetOpenHdl( aPageDoubleClickLink ); + pCPage->SetOpenHdl( LINK(this, SfxHelpIndexWindow_Impl, ContentTabPageDoubleClickHdl) ); } return pCPage; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 1f1cc098d547..52ab26072267 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -866,7 +866,7 @@ void SfxCommonTemplateDialog_Impl::Initialize() Update_Impl(); aFilterLb->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, FilterSelectHdl ) ); - aFmtLb->SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, ApplyHdl ) ); + aFmtLb->SetDoubleClickHdl( LINK( this, SfxCommonTemplateDialog_Impl, TreeListApplyHdl ) ); aFmtLb->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, FmtSelectHdl ) ); aFmtLb->SetSelectionMode(MULTIPLE_SELECTION); @@ -2086,10 +2086,14 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() } } +IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool ) +{ + return ApplyHdl(NULL) == 1; +} + // Double-click on a style sheet in the ListBox is applied. -IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl ) +IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, /*pControl*/ ) { - (void)pControl; //unused // only if that region is allowed if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] && !GetSelectedEntry().isEmpty() ) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 1bc6df1a8411..54e73aded93b 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -370,10 +370,10 @@ void SfxVersionDialog::Open_Impl() Close(); } -IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) +IMPL_LINK_NOARG_TYPED(SfxVersionDialog, DClickHdl_Impl, SvTreeListBox*, bool) { Open_Impl(); - return 0L; + return false; } IMPL_LINK_NOARG_TYPED(SfxVersionDialog, SelectHdl_Impl, SvTreeListBox*, void) diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index e9383a47adae..0ece9f511b59 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -218,6 +218,7 @@ protected: DECL_LINK( FilterSelectHdl, ListBox* ); DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void ); DECL_LINK( ApplyHdl, Control* ); + DECL_LINK_TYPED( TreeListApplyHdl, SvTreeListBox*, bool ); 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 b2747d291460..4187343a451a 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -57,7 +57,7 @@ class SfxVersionDialog : public SfxModalDialog SfxVersionTableDtor* m_pTable; bool m_bIsSaveVersionOnClose; - DECL_LINK(DClickHdl_Impl, void *); + DECL_LINK_TYPED( DClickHdl_Impl, SvTreeListBox*, bool); DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void); DECL_LINK_TYPED( ButtonHdl_Impl, Button*, void ); void Init_Impl(); diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 4d542cf7841b..121432cfe3e7 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1250,7 +1250,7 @@ void SvtFileView::SetSelectHdl( const Link<>& rHdl ) -void SvtFileView::SetDoubleClickHdl( const Link<>& rHdl ) +void SvtFileView::SetDoubleClickHdl( const Link<SvTreeListBox*,bool>& rHdl ) { mpImp->mpView->SetDoubleClickHdl( rHdl ); } diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 63f5f77d4121..1d109958cc99 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -82,7 +82,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) // Install handlers m_pConditionCB->SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl)); - m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); + m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveTreeListBoxHdl )); m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl )); m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl )); m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl )); @@ -230,9 +230,13 @@ IMPL_LINK_TYPED( SwCondCollPage, OnOffHdl, Button*, pBox, void ) IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void) { - AssignRemoveHdl(static_cast<PushButton*>(pBtn)); + AssignRemoveHdl(pBtn); } -IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) +IMPL_LINK_TYPED( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool) +{ + return AssignRemoveHdl(pBtn) != 0; +} +IMPL_LINK( SwCondCollPage, AssignRemoveHdl, void*, pBtn) { SvTreeListEntry* pE = m_pTbLinks->FirstSelected(); sal_uLong nPos; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 71c871a23b2a..7c2375914f08 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -66,7 +66,7 @@ SwFieldDBPage::SwFieldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) m_pNumFormatLB->SetSelectHdl(LINK(this, SwFieldDBPage, NumSelectHdl)); m_pDatabaseTLB->SetSelectHdl(LINK(this, SwFieldDBPage, TreeSelectHdl)); - m_pDatabaseTLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, InsertHdl)); + m_pDatabaseTLB->SetDoubleClickHdl(LINK(this, SwFieldDBPage, TreeListBoxInsertHdl)); m_pValueED->SetModifyHdl(LINK(this, SwFieldDBPage, ModifyHdl)); m_pAddDBPB->SetClickHdl(LINK(this, SwFieldDBPage, AddDBHdl)); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 267c634535e4..5719d923edce 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -206,7 +206,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) m_pTypeTLB->SetUpdateMode(true); m_pTypeTLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, TypeHdl)); - m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl)); + m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, TreeListBoxInsertHdl)); m_pSelectionLB->SetSelectHdl(LINK(this, SwFieldDokInfPage, SubTypeHdl)); m_pSelectionLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl)); m_pFormatLB->SetDoubleClickHdl(LINK(this, SwFieldDokInfPage, InsertHdl)); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index 9db03bdcae0c..6e2e274851cc 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -307,7 +307,12 @@ void SwFieldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3) } // Insert new fields -IMPL_LINK( SwFieldPage, InsertHdl, Button *, pBtn ) +IMPL_LINK_TYPED( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool ) +{ + return InsertHdl(pBtn); +} + +IMPL_LINK( SwFieldPage, InsertHdl, void *, pBtn ) { SwFieldDlg *pDlg = static_cast<SwFieldDlg*>(GetTabDialog()); if (pDlg) @@ -315,7 +320,7 @@ IMPL_LINK( SwFieldPage, InsertHdl, Button *, pBtn ) pDlg->InsertHdl(); if (pBtn) - pBtn->GrabFocus(); // because of InputField-Dlg + static_cast<Button*>(pBtn)->GrabFocus(); // because of InputField-Dlg } else { diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 845f4499d766..09c7ac7eea46 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -25,6 +25,7 @@ #define FIELD_COLUMN_WIDTH 76 class ListBox; +class SvTreeListBox; const int coLBCount = 3; @@ -53,7 +54,8 @@ protected: SwField* GetCurField() { return m_pCurField;} SwWrtShell* GetWrtShell() { return m_pWrtShell;} - DECL_LINK( InsertHdl, Button * = 0); + DECL_LINK( InsertHdl, void * = 0); + DECL_LINK_TYPED( TreeListBoxInsertHdl, SvTreeListBox*, bool); DECL_LINK(NumFormatHdl, void *); void Init(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index c7a135a61c8d..4eb1cfd3dac5 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -99,7 +99,7 @@ SwFieldRefPage::SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet // #i83479# m_pSelectionToolTipLB->SetSelectHdl( LINK(this, SwFieldRefPage, SubTypeTreeListBoxHdl) ); - m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, InsertHdl) ); + m_pSelectionToolTipLB->SetDoubleClickHdl( LINK(this, SwFieldRefPage, TreeListBoxInsertHdl) ); m_pSelectionToolTipLB->SetStyle( m_pSelectionToolTipLB->GetStyle() | WB_HSCROLL ); m_pSelectionToolTipLB->SetSpaceBetweenEntries(1); m_pSelectionToolTipLB->SetHighlightRange(); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index d89f30d81fac..e65f3334beca 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -410,12 +410,12 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) return 0; } -IMPL_LINK( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) +IMPL_LINK_TYPED( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox, bool ) { SvTreeListEntry* pEntry = pBox->FirstSelected(); if(pBox->GetParent(pEntry) && !bIsDocReadOnly) EndDialog( RET_OK ); - return 0; + return false; } IMPL_LINK_TYPED( SwGlossaryDlg, EnableHdl, Menu *, pMn, bool ) diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 58051ad62fd4..aa6ff6b9ef4c 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -185,7 +185,7 @@ public: const SwWrtShell* GetActiveWrtShell() {return pActiveShell;} SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} - DECL_LINK( ContentDoubleClickHdl, void * ); + DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); DECL_LINK_TYPED( TimerUpdate, Timer *, void ); virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; @@ -289,7 +289,7 @@ protected: DECL_LINK_TYPED( PopupHdl, Menu*, bool ); DECL_LINK_TYPED( Timeout, Timer*, void ); - DECL_LINK( DoubleClickHdl, void* ); + DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool ); SwNavigationPI* GetParentWindow(); diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index d1d81dc5747e..22c175e99bb2 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -124,7 +124,7 @@ class SwGlossaryDlg : public SvxStandardDialog void ShowPreview(); DECL_LINK( NameModify, Edit * ); - DECL_LINK( NameDoubleClick, SvTreeListBox * ); + DECL_LINK_TYPED( NameDoubleClick, SvTreeListBox*, bool ); DECL_LINK_TYPED( GrpSelect, SvTreeListBox *, void ); DECL_LINK_TYPED( MenuHdl, Menu *, bool ); DECL_LINK_TYPED( EnableHdl, Menu *, bool ); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 6da63e4bbfdc..4988e11f4d7f 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -53,7 +53,8 @@ class SwCondCollPage : public SfxTabPage virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; DECL_LINK_TYPED( OnOffHdl, Button*, void ); - DECL_LINK( AssignRemoveHdl, PushButton*); + DECL_LINK( AssignRemoveHdl, void*); + DECL_LINK_TYPED( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool); DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void); DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); DECL_LINK( SelectHdl, void* ); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 6c560d81615d..bb4af2f7a464 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1509,7 +1509,7 @@ bool SwContentTree::Collapse( SvTreeListEntry* pParent ) // Also on double click will be initially opened only. -IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) { SvTreeListEntry* pEntry = GetCurEntry(); // Is it a content type? @@ -1532,7 +1532,7 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl) pActiveShell->EnterStdMode(); } } - return 0; + return false; } // Show the file diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 6047282f016b..530698a5af79 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1197,7 +1197,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) } } -IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl) +IMPL_LINK_NOARG_TYPED( SwGlobalTree, DoubleClickHdl, SvTreeListBox*, bool) { SvTreeListEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = static_cast<SwGlblDocContent*>(pEntry->GetUserData()); @@ -1208,7 +1208,7 @@ IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl) GotoContent(pCont); pActiveShell->GetView().GetEditWin().GrabFocus(); } - return 0; + return false; } SwNavigationPI* SwGlobalTree::GetParentWindow() diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index a9f7bea7e94c..9e97a51c590e 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -58,7 +58,7 @@ private: DECL_LINK_TYPED(ViewButtonHdl, Button*, void); DECL_LINK_TYPED(CertificateHighlightHdl, SvTreeListBox*, void ); - DECL_LINK( CertificateSelectHdl, void* ); + DECL_LINK_TYPED(CertificateSelectHdl, SvTreeListBox*, bool ); void ImplShowCertificateDetails(); void ImplInitialize(); diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index b56ddef455a2..e70a714992c7 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -92,7 +92,7 @@ private: DECL_LINK_TYPED(AddButtonHdl, Button*, void); DECL_LINK_TYPED(RemoveButtonHdl, Button*, void); DECL_LINK_TYPED(SignatureHighlightHdl, SvTreeListBox*, void ); - DECL_LINK( SignatureSelectHdl, void* ); + DECL_LINK_TYPED(SignatureSelectHdl, SvTreeListBox*, bool ); DECL_LINK( StartVerifySignatureHdl, void* ); DECL_LINK_TYPED(OKButtonHdl, Button*, void ); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 5f015f39c0d2..20b1dc37ab7a 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -207,10 +207,10 @@ IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox m_pOKBtn->Enable( bEnable ); } -IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl) +IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateSelectHdl, SvTreeListBox*, bool) { EndDialog( RET_OK ); - return 0; + return false; } IMPL_LINK_NOARG_TYPED(CertificateChooser, ViewButtonHdl, Button*, void) diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 627cae6ea282..0c3fb39ebcda 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -407,10 +407,10 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl) +IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, bool) { ImplShowSignaturesDetails(); - return 0; + return false; } IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) |