summaryrefslogtreecommitdiff
path: root/include/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-27 13:08:02 +0200
committerNoel Grandin <noel@peralex.com>2015-08-28 09:49:56 +0200
commitbd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch)
treef05be9665737f0667faf95702d96fbf3f0a103c5 /include/svtools
parent1b9c3a17e8496aedfb80528c5275e6658154789d (diff)
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/addresstemplate.hxx2
-rw-r--r--include/svtools/asynclink.hxx2
-rw-r--r--include/svtools/contextmenuhelper.hxx2
-rw-r--r--include/svtools/editbrowsebox.hxx6
-rw-r--r--include/svtools/fileview.hxx2
-rw-r--r--include/svtools/generictoolboxcontroller.hxx2
-rw-r--r--include/svtools/popupmenucontrollerbase.hxx2
-rw-r--r--include/svtools/toolboxcontroller.hxx2
8 files changed, 10 insertions, 10 deletions
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index f7fa977f7a2f..0607377e9b3d 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -132,7 +132,7 @@ namespace svt
DECL_LINK(OnComboLoseFocus, ComboBox*);
DECL_LINK(OnComboSelect, ComboBox*);
DECL_LINK_TYPED(OnOkClicked, Button*, void);
- DECL_LINK(OnDelayedInitialize, void*);
+ DECL_LINK_TYPED(OnDelayedInitialize, void*, void);
};
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index 862bd3fc0351..747b0c38678d 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -41,7 +41,7 @@ class SVT_DLLPUBLIC AsynchronLink
::osl::Mutex* _pMutex;
DECL_DLLPRIVATE_LINK_TYPED( HandleCall_Idle, Idle*, void );
- DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( HandleCall_PostUserEvent, void*, void );
SVT_DLLPRIVATE void Call_Impl( void* pArg );
public:
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index 4b7db90b83fd..3333027d4391 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -63,7 +63,7 @@ class SVT_DLLPUBLIC ContextMenuHelper
private:
// asynchronous link to prevent destruction while on stack
- DECL_STATIC_LINK( ContextMenuHelper, ExecuteHdl_Impl, ExecuteInfo* );
+ DECL_STATIC_LINK_TYPED( ContextMenuHelper, ExecuteHdl_Impl, void*, void );
ContextMenuHelper( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
const ContextMenuHelper& operator=( const ContextMenuHelper& ) SAL_DELETED_FUNCTION;
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 62d0aeabbb93..753e0684f8e9 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -667,9 +667,9 @@ namespace svt
SVT_DLLPRIVATE void impl_construct();
DECL_DLLPRIVATE_LINK(ModifyHdl, void* );
- DECL_DLLPRIVATE_LINK(StartEditHdl, void* );
- DECL_DLLPRIVATE_LINK(EndEditHdl, void* );
- DECL_DLLPRIVATE_LINK(CellModifiedHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED(StartEditHdl, void*, void );
+ DECL_DLLPRIVATE_LINK_TYPED(EndEditHdl, void*, void );
+ DECL_DLLPRIVATE_LINK_TYPED(CellModifiedHdl, void*, void );
};
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 69469754994e..0621dd7718d7 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -51,7 +51,7 @@ struct FileViewAsyncAction
{
sal_uInt32 nMinTimeout; /// minimum time to wait for a result, in milliseconds
sal_uInt32 nMaxTimeout; /// maximum time to wait for a result, in milliseconds, until eTimeout is returned
- Link<> aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result
+ Link<void*,void> aFinishHandler; /// the handler to be called when the action is finished. Called in every case, no matter of the result
FileViewAsyncAction()
{
diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx
index d5bf7d7fc51d..5356b27844fa 100644
--- a/include/svtools/generictoolboxcontroller.hxx
+++ b/include/svtools/generictoolboxcontroller.hxx
@@ -47,7 +47,7 @@ class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController
// XStatusListener
virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- DECL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, ExecuteInfo* );
+ DECL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, void );
private:
VclPtr<ToolBox> m_pToolbox;
diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx
index c800470f4ccf..474864ef40ee 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -111,7 +111,7 @@ namespace svt
virtual void impl_setPopupMenu();
static OUString determineBaseURL( const OUString& aURL );
- DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* );
+ DECL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, void );
bool m_bInitialized;
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index fb61f2171756..288d8d97a938 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -149,7 +149,7 @@ class SVT_DLLPUBLIC ToolboxController :
{}
};
- DECL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, DispatchInfo* );
+ DECL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, void );
typedef std::unordered_map< OUString,
css::uno::Reference< css::frame::XDispatch >,