diff options
24 files changed, 60 insertions, 86 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index bf2fc8f86314..ab0ec278edcb 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -235,7 +235,7 @@ protected: DECL_LINK_TYPED( ButtonHdl, Button *, void ); DECL_LINK(TreeListHdl, void *); - DECL_LINK( implEndDragHdl, HeaderBar * ); + 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 786f6d7bcfed..168d441e92bd 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1799,10 +1799,8 @@ IMPL_LINK_NOARG(WatchWindow, TreeListHdl) return 0; } -IMPL_LINK( WatchWindow, implEndDragHdl, HeaderBar *, pBar ) +IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void ) { - (void)pBar; - const sal_Int32 TAB_WIDTH_MIN = 10; sal_Int32 nMaxWidth = aHeaderBar->GetSizePixel().getWidth() - 2 * TAB_WIDTH_MIN; @@ -1829,7 +1827,6 @@ IMPL_LINK( WatchWindow, implEndDragHdl, HeaderBar *, pBar ) nPos += aHeaderBar->GetItemSize( i ); aTreeListBox->SetTab( i, nPos, MAP_PIXEL ); } - return 0; } IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator *, pAcc, void ) diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 63381478222d..92008bb39f10 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -82,13 +82,13 @@ static long nTabs[] = #define LB_MACROS_ITEMPOS 2 -IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar == maHeaderBar.get(), "*MacroEventListBox::HeaderEndDrag_Impl: something is wrong here..." ); (void)pBar; if( !maHeaderBar->GetCurItemId() ) - return 0; + return; if( !maHeaderBar->IsItemMode() ) { @@ -113,7 +113,6 @@ IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) } } } - return 1; } bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 2e0839395b1e..879b6cd765eb 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -59,8 +59,8 @@ namespace svx DECL_LINK(PathSelect_Impl, void *); - DECL_LINK( HeaderSelect_Impl, HeaderBar * ); - DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); + DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); DECL_LINK( NameValidator, OUString*); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 59037ed1b870..db607ac6c29f 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -30,7 +30,7 @@ private: VclPtr<HeaderBar> maHeaderBar; VclPtr<SvHeaderTabListBox> maListBox; protected: - DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); + DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 5d23015e74db..384a89ec0e97 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -53,13 +53,13 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); - DECL_LINK_TYPED(PathHdl_Impl, Button*, void); + DECL_LINK_TYPED( PathHdl_Impl, Button*, void); DECL_LINK(DoubleClickPathHdl_Impl, void *); - DECL_LINK_TYPED(StandardHdl_Impl, Button*, void); + DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); DECL_LINK(PathSelect_Impl, void *); - DECL_LINK( HeaderSelect_Impl, HeaderBar * ); - DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); + DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index eedd4f4b440c..c3e7ccdcc8d3 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -315,12 +315,12 @@ IMPL_LINK_NOARG_TYPED(DbRegistrationOptionsPage, EditHdl, Button*, void) -IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { assert(pBar); if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE) - return 0; + return; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); @@ -341,17 +341,16 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar ) SvTreeList* pModel = m_pPathBox->GetModel(); pModel->SetSortMode( eMode ); pModel->Resort(); - return 1; } -IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { assert(pBar); if (!pBar || !pBar->GetCurItemId()) - return 0; + return; if ( !pBar->IsItemMode() ) { @@ -374,7 +373,6 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); } } - return 1; } diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 787b9564160d..7bddba3e8341 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -634,10 +634,10 @@ IMPL_LINK_NOARG_TYPED(SvxPathTabPage, PathHdl_Impl, Button*, void) -IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar, void ) { if (!pBar || pBar->GetCurItemId() != ITEMID_TYPE) - return 0; + return; HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE); bool bUp = ( ( nBits & HeaderBarItemBits::UPARROW ) == HeaderBarItemBits::UPARROW ); @@ -658,15 +658,14 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar ) SvTreeList* pModel = pPathBox->GetModel(); pModel->SetSortMode( eMode ); pModel->Resort(); - return 1; } -IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if (!pBar || !pBar->GetCurItemId()) - return 0; + return; if ( !pBar->IsItemMode() ) { @@ -689,7 +688,6 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); } } - return 1; } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 8ab238461a80..88f148e84cbc 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1445,10 +1445,10 @@ IMPL_LINK( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTabListBox*, /* pList */ ) return 0; } -IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if ( pBar && !pBar->GetCurItemId() ) - return 0; + return; if ( !m_pHeaderBar->IsItemMode() ) { @@ -1471,7 +1471,6 @@ IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); } } - return 1; } /** adds a new filter info entry to the ui filter list */ diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index c102cf5d79cb..88b2ad26ef37 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -63,7 +63,7 @@ private: VclPtr<HeaderBar> m_pHeaderBar; DECL_LINK( TabBoxScrollHdl_Impl, SvTabListBox* ); - DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); + DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); static OUString getEntryString( const filter_info_impl* pInfo ); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 997dcb58c756..bd54832488a7 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -317,7 +317,7 @@ private: DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * ); DECL_DLLPRIVATE_LINK( EndScrollHdl, void * ); - DECL_DLLPRIVATE_LINK( StartDragHdl, HeaderBar * ); + DECL_DLLPRIVATE_LINK_TYPED( StartDragHdl, HeaderBar *, void ); SVT_DLLPRIVATE long GetFrozenWidth() const; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index afc7dab7366c..5c8701980701 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -68,8 +68,8 @@ private: ::com::sun::star::uno::Sequence< OUString > mpBlackList; - DECL_DLLPRIVATE_LINK( HeaderSelect_Impl, HeaderBar * ); - DECL_DLLPRIVATE_LINK( HeaderEndDrag_Impl, HeaderBar * ); + DECL_DLLPRIVATE_LINK_TYPED( HeaderSelect_Impl, HeaderBar*, void ); + DECL_DLLPRIVATE_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); protected: virtual void GetFocus() SAL_OVERRIDE; diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index b7a75049bd20..c1bb77d0669e 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -249,12 +249,12 @@ private: bool mbOutDrag; bool mbButtonStyle; bool mbItemMode; - Link<> maStartDragHdl; - Link<> maDragHdl; - Link<> maEndDragHdl; - Link<> maSelectHdl; - Link<> maDoubleClickHdl; - Link<> maCreateAccessibleHdl; + Link<HeaderBar*,void> maStartDragHdl; + Link<HeaderBar*,void> maDragHdl; + Link<HeaderBar*,void> maEndDragHdl; + Link<HeaderBar*,void> maSelectHdl; + Link<HeaderBar*,void> maDoubleClickHdl; + Link<HeaderBar*,void> maCreateAccessibleHdl; VCLXHeaderBar* m_pVCLXHeaderBar; @@ -340,12 +340,12 @@ public: inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - inline void SetStartDragHdl( const Link<>& rLink ) { maStartDragHdl = rLink; } - inline void SetDragHdl( const Link<>& rLink ) { maDragHdl = rLink; } - inline void SetEndDragHdl( const Link<>& rLink ) { maEndDragHdl = rLink; } - inline void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - inline void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; } - inline void SetCreateAccessibleHdl( const Link<>& rLink ) { maCreateAccessibleHdl = rLink; } + inline void SetStartDragHdl( const Link<HeaderBar*,void>& rLink ) { maStartDragHdl = rLink; } + inline void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } + inline void SetEndDragHdl( const Link<HeaderBar*,void>& rLink ) { maEndDragHdl = rLink; } + inline void SetSelectHdl( const Link<HeaderBar*,void>& rLink ) { maSelectHdl = rLink; } + inline void SetDoubleClickHdl( const Link<HeaderBar*,void>& rLink ) { maDoubleClickHdl = rLink; } + inline void SetCreateAccessibleHdl( const Link<HeaderBar*,void>& rLink ) { maCreateAccessibleHdl = rLink; } inline bool IsDragable() const { return mbDragable; } diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 0914396394b2..d62ee3991457 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -64,11 +64,11 @@ private: const CollatorWrapper aCollator; - DECL_LINK( StartDragHdl, HeaderBar* ); - DECL_LINK( DragHdl, HeaderBar* ); - DECL_LINK( EndDragHdl, HeaderBar* ); - DECL_LINK( HeaderBarClick, HeaderBar* ); - DECL_LINK( HeaderBarDblClick, HeaderBar* ); + DECL_LINK_TYPED( StartDragHdl, HeaderBar*, void ); + DECL_LINK_TYPED( DragHdl, HeaderBar*, void ); + DECL_LINK_TYPED( EndDragHdl, HeaderBar*, void ); + DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); + DECL_LINK_TYPED( HeaderBarDblClick, HeaderBar*, void ); DECL_LINK( CompareHdl, SvSortData* ); protected: diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 519196c79066..d7e987ba9f1c 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -133,7 +133,7 @@ private: AccessibleChildren m_aAccessibleChildren; DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, void* ); - DECL_DLLPRIVATE_LINK( CreateAccessibleHdl_Impl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( CreateAccessibleHdl_Impl, HeaderBar*, void ); void RecalculateAccessibleChildren(); diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index f9827f8dc63c..c51d23355dbc 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -82,7 +82,7 @@ public: std::vector<ScRangeNameLine> GetSelectedEntries(); DECL_LINK( ScrollHdl, void*); - DECL_LINK( HeaderEndDragHdl, void*); + DECL_LINK_TYPED( HeaderEndDragHdl, HeaderBar*, void); }; #endif diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 89749c62747c..2a6f78becef3 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -60,8 +60,7 @@ ScRangeManagerTable::ScRangeManagerTable( SvSimpleTableContainer& rParent, boost ShowTable(); SetSelectionMode(MULTIPLE_SELECTION); SetScrolledHdl( LINK( this, ScRangeManagerTable, ScrollHdl ) ); - void* pNull = NULL; - HeaderEndDragHdl(pNull); + HeaderEndDragHdl(NULL); } void ScRangeManagerTable::Resize() @@ -99,8 +98,7 @@ void ScRangeManagerTable::setColWidths() rHeaderBar.SetItemSize( ITEMID_SCOPE, nTabSize); static long aStaticTabs[] = {3, 0, nTabSize, 2*nTabSize }; SetTabs( &aStaticTabs[0], MAP_PIXEL ); - void* pNull = NULL; - HeaderEndDragHdl(pNull); + HeaderEndDragHdl(NULL); } ScRangeManagerTable::~ScRangeManagerTable() @@ -278,7 +276,7 @@ void CalculateItemSize(const long& rTableSize, long& rItemNameSize, long& rItemR } -IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl) +IMPL_LINK_NOARG_TYPED(ScRangeManagerTable, HeaderEndDragHdl, HeaderBar*, void) { HeaderBar& rHeaderBar = GetTheHeaderBar(); @@ -299,8 +297,6 @@ IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl) SetTab(1, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); aSz.Width() += nItemRangeSize; SetTab(2, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); - - return 0; } IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl) diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index ed237b46ca6d..d891e8d0d7c2 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1367,10 +1367,9 @@ IMPL_LINK_NOARG(BrowseBox, EndScrollHdl) -IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) { pBar->SetDragSize( pDataWin->GetOutputSizePixel().Height() ); - return 0; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 6f7b8c4eeb5c..874b98304f22 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1301,7 +1301,7 @@ void SvtFileView::EndInplaceEditing( bool _bCancel ) return mpImp->EndEditing( _bCancel ); } -IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar, "no headerbar" ); sal_uInt16 nItemID = pBar->GetCurItemId(); @@ -1340,11 +1340,10 @@ IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar ) pBar->SetItemBits( nItemID, nBits ); mpImp->Resort_Impl( nItemID, !bUp ); - return 1; } -IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar ) +IMPL_LINK_TYPED( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if ( !pBar->IsItemMode() ) { @@ -1360,8 +1359,6 @@ IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar ) mpImp->mpView->SetTab( i, aSize.Width(), MAP_PIXEL ); } } - - return 0; } diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index dccfb017a79b..b2515d1fe8d6 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -394,49 +394,44 @@ void SvSimpleTable::Command( const CommandEvent& rCEvt ) SvHeaderTabListBox::Command(rCEvt); } -IMPL_LINK( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarStartDrag(); } - return 0; } -IMPL_LINK( SvSimpleTable, DragHdl, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarDrag(); } - return 0; } -IMPL_LINK( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarEndDrag(); } - return 0; } -IMPL_LINK( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarClick(); } - return 0; } -IMPL_LINK( SvSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) +IMPL_LINK_TYPED( SvSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { HBarDblClick(); } - return 0; } SvLBoxItem* SvSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index d15253ee52cd..08a29ddb35a5 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -615,7 +615,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) return 0; } -IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) { vcl::Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); @@ -629,7 +629,6 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) m_pImpl->m_pHeaderBar->SetAccessible( xAccessible ); } } - return 0; } void SvHeaderTabListBox::RecalculateAccessibleChildren() diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 887fd203fa48..2bd53c1bb156 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -821,7 +821,7 @@ short ChineseDictionaryDialog::Execute() return nRet; } -IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar) +IMPL_LINK_TYPED(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar, void) { sal_uInt16 nId = pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = pHeaderBar->GetItemBits(nId); @@ -840,8 +840,6 @@ IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar) getActiveDictionary().sortByColumn(nId-1,bSortAtoZ); getReverseDictionary().sortByColumn(nId-1,bSortAtoZ); } - - return 0; } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 156c6c9756cc..04bdfb77aeb4 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -129,7 +129,7 @@ private: DECL_LINK_TYPED( AddHdl, Button*, void ); DECL_LINK_TYPED( ModifyHdl, Button*, void ); DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK( HeaderBarClick, HeaderBar* ); + DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); void initDictionaryControl(DictionaryList *pList, const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e27d2d9a1b09..af3b25e6cb3e 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -636,7 +636,7 @@ class SwAddStylesDlg_Impl : public SfxModalDialog DECL_LINK_TYPED(OkHdl, Button*, void); DECL_LINK_TYPED(LeftRightHdl, Button*, void); - DECL_LINK(HeaderDragHdl, void *); + DECL_LINK_TYPED(HeaderDragHdl, HeaderBar*, void); public: SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); @@ -750,10 +750,9 @@ IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, OkHdl, Button*, void) EndDialog(RET_OK); } -IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl) +IMPL_LINK_NOARG_TYPED(SwAddStylesDlg_Impl, HeaderDragHdl, HeaderBar*, void) { m_pHeaderTree->Invalidate(); - return 0; } IMPL_LINK_TYPED(SwAddStylesDlg_Impl, LeftRightHdl, Button*, pBtn, void) |