summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-13 10:49:17 +0200
committerNoel Grandin <noel@peralex.com>2015-08-13 10:49:58 +0200
commitbb1cc8361d13461d8bcb9a9a4a8c1b9c1721c991 (patch)
treed0ae2ada38a775c96bde63cdbedf614470370c9a
parentc9f20fbc2caf04629cc56f556b4a09bd6599a959 (diff)
make Link<> instances typed
Change-Id: I0727c3ac6e6e5cf087d63ddfb633845ae578cdbb
-rw-r--r--include/sfx2/titledockwin.hxx4
-rw-r--r--sfx2/source/dialog/taskpane.cxx9
2 files changed, 6 insertions, 7 deletions
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 4200910e4f56..5d16fe2ebd17 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -60,7 +60,7 @@ namespace sfx2
return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
}
- void SetEndDockingHdl( const Link<>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
+ void SetEndDockingHdl( const Link<TitledDockingWindow*,void>& i_rEndDockingHdl ) { m_aEndDockingHdl = i_rEndDockingHdl; }
/** resets the toolbox. Upon return, the only item in the toolbox is the closer.
*/
@@ -122,7 +122,7 @@ namespace sfx2
VclPtr<ToolBox> m_aToolbox;
VclPtr<Window> m_aContentWindow;
- Link<> m_aEndDockingHdl;
+ Link<TitledDockingWindow*,void> m_aEndDockingHdl;
/** The border that is painted around the inner window. The bevel
shadow lines are part of the border, so where the border is 0 no
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 004349b5099c..4bf3d16039bc 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -841,7 +841,7 @@ namespace sfx2
private:
DECL_LINK_TYPED( OnToolboxClicked, ToolBox*, void );
DECL_LINK( OnMenuItemSelected, Menu* );
- DECL_LINK( DockingChanged, TitledDockingWindow* );
+ DECL_LINK_TYPED( DockingChanged, TitledDockingWindow*, void );
::std::unique_ptr< PopupMenu > impl_createPopupMenu() const;
/// sets the given layout for the panel selector
@@ -951,15 +951,14 @@ namespace sfx2
}
- IMPL_LINK( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow )
+ IMPL_LINK_TYPED( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow, void )
{
- ENSURE_OR_RETURN( i_pDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?", 0L );
+ ENSURE_OR_RETURN_VOID( i_pDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?" );
if ( impl_getLayout() == LAYOUT_DRAWERS )
- return 0L;
+ return;
impl_setLayout( lcl_getTabLayoutFromAlignment( i_pDockingWindow->GetAlignment() ) );
- return 1L;
}