From 68ddda0f3fff8bc435c2a5fd60d1e7eff5359916 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 28 Aug 2015 15:51:24 +0200 Subject: convert Link<> to typed Change-Id: I53b0a7a9875a3ebcca915c8f2d8c53face6f9509 --- sc/source/ui/inc/namemgrtable.hxx | 2 +- sc/source/ui/namedlg/namemgrtable.cxx | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'sc') 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 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) -- cgit