summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-10 14:39:17 +0200
committerNoel Grandin <noel@peralex.com>2015-09-11 08:48:54 +0200
commitcf0c04a428754dfd5aa477cebc5441bc74e27005 (patch)
tree6d4657ec370a3378887745b34d217a91bdab2eef /cui/source
parente8ee8473361f09034fdcd4f30a2325a53a512a7a (diff)
convert Link<> to typed
Change-Id: I85658fa35b9b85106a3b9c8ef303584cad6f39b0
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/macropg.cxx2
-rw-r--r--cui/source/customize/selector.cxx5
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx4
-rw-r--r--cui/source/dialogs/linkdlg.cxx6
-rw-r--r--cui/source/dialogs/thesdlg.cxx4
-rw-r--r--cui/source/inc/autocdlg.hxx2
-rw-r--r--cui/source/inc/dbregister.hxx4
-rw-r--r--cui/source/inc/hlmarkwn.hxx6
-rw-r--r--cui/source/inc/linkdlg.hxx4
-rw-r--r--cui/source/inc/macroass.hxx4
-rw-r--r--cui/source/inc/macropg.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx4
-rw-r--r--cui/source/inc/optlingu.hxx2
-rw-r--r--cui/source/inc/optpath.hxx4
-rw-r--r--cui/source/inc/selector.hxx2
-rw-r--r--cui/source/inc/thesdlg.hxx2
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/options/optaboutconfig.cxx4
-rw-r--r--cui/source/options/optaboutconfig.hxx2
-rw-r--r--cui/source/options/optlingu.cxx4
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx4
-rw-r--r--cui/source/tabpages/macroass.cxx15
-rw-r--r--cui/source/tabpages/numfmt.cxx4
24 files changed, 50 insertions, 48 deletions
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;
}