summaryrefslogtreecommitdiff
path: root/include
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
parent1b9c3a17e8496aedfb80528c5275e6658154789d (diff)
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'include')
-rw-r--r--include/dbaccess/AsynchronousLink.hxx2
-rw-r--r--include/framework/addonsoptions.hxx2
-rw-r--r--include/sfx2/filedlghelper.hxx2
-rw-r--r--include/sfx2/hintpost.hxx2
-rw-r--r--include/sfx2/recentdocsview.hxx2
-rw-r--r--include/sfx2/sidebar/AsynchronousCall.hxx2
-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
-rw-r--r--include/svx/colrctrl.hxx2
-rw-r--r--include/svx/fmgridcl.hxx2
-rw-r--r--include/svx/gridctrl.hxx4
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx2
-rw-r--r--include/vcl/dialog.hxx2
-rw-r--r--include/vcl/evntpost.hxx2
-rw-r--r--include/vcl/floatwin.hxx2
-rw-r--r--include/vcl/menu.hxx12
-rw-r--r--include/vcl/svapp.hxx6
-rw-r--r--include/vcl/threadex.hxx2
-rw-r--r--include/vcl/toolbox.hxx2
-rw-r--r--include/vcl/window.hxx6
26 files changed, 38 insertions, 38 deletions
diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx
index 789a3fed0d52..a551886540cc 100644
--- a/include/dbaccess/AsynchronousLink.hxx
+++ b/include/dbaccess/AsynchronousLink.hxx
@@ -58,7 +58,7 @@ namespace dbaui
void CancelCall();
protected:
- DECL_LINK(OnAsyncCall, void*);
+ DECL_LINK_TYPED(OnAsyncCall, void*, void);
};
}
#endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index dee6ec0ef662..92bf9048e96e 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -229,7 +229,7 @@ class FWE_DLLPUBLIC AddonsOptions
We create a static mutex only for one ime and use at different times.
@return A reference to a static mutex member.
*//*-*****************************************************************************************************/
- DECL_STATIC_LINK( AddonsOptions, Notify, void* );
+ DECL_STATIC_LINK_TYPED( AddonsOptions, Notify, void*, void );
private:
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index c3021091d429..854703a89b15 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -223,7 +223,7 @@ public:
*/
void SetContext( Context _eNewContext );
- DECL_LINK( ExecuteSystemFilePicker, void* );
+ DECL_LINK_TYPED( ExecuteSystemFilePicker, void*, void );
ErrCode Execute( std::vector<OUString>& rpURLList,
SfxItemSet *& rpSet,
diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx
index fbcc47708f78..36a7cabe1b8c 100644
--- a/include/sfx2/hintpost.hxx
+++ b/include/sfx2/hintpost.hxx
@@ -41,7 +41,7 @@ class SfxHintPoster : public SvRefBase
private:
Link<SfxRequest*,void> m_Link;
- DECL_LINK( DoEvent_Impl, SfxRequest * );
+ DECL_LINK_TYPED( DoEvent_Impl, void*, void );
protected:
virtual ~SfxHintPoster();
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 2232406e0145..f502fa0eefcd 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -57,7 +57,7 @@ public:
/// Update the information in the view.
virtual void Reload() SAL_OVERRIDE;
- DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* );
+ DECL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, void );
protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index 408805ad4330..02186de0c6ba 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -46,7 +46,7 @@ private:
Action maAction;
ImplSVEvent * mnCallId;
- DECL_LINK(HandleUserCall, void*);
+ DECL_LINK_TYPED(HandleUserCall, void*, void);
};
} } // end of namespace sfx2::sidebar
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 >,
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index 3f54aeba6263..556f5e82e790 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -56,7 +56,7 @@ protected:
// DragSourceHelper
virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ) SAL_OVERRIDE;
- DECL_LINK(ExecDragHdl, void*);
+ DECL_LINK_TYPED(ExecDragHdl, void*, void);
public:
SvxColorValueSet_docking( vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER );
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index c9147531f3d0..76355084a10e 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -85,7 +85,7 @@ protected:
*/
void notifyColumnSelect(sal_uInt16 nColumnId);
private:
- DECL_LINK( OnAsyncExecuteDrop, void* );
+ DECL_LINK_TYPED( OnAsyncExecuteDrop, void*, void );
};
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 6ff1dfeec8da..e3962aa07312 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -584,9 +584,9 @@ protected:
protected:
void ImplInitWindow( const InitWindowFacet _eInitWhat );
- DECL_LINK(OnDelete, void*);
+ DECL_LINK_TYPED(OnDelete, void*, void);
- DECL_LINK(OnAsyncAdjust, void*);
+ DECL_LINK_TYPED(OnAsyncAdjust, void*, void);
// if the param is != NULL, AdjustRows will be called, else AdjustDataSource
private:
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 153efff59575..2b7d13b76d3e 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -148,7 +148,7 @@ private:
SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos );
- DECL_LINK( UpdateHdl, void * );
+ DECL_LINK_TYPED( UpdateHdl, void *, void );
//TableModelRef mxTable;
rtl::Reference< TableModel > mxTable;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 273606b2220e..5fc0708fed02 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -58,7 +58,7 @@ private:
SAL_DLLPRIVATE Dialog (const Dialog &) SAL_DELETED_FUNCTION;
SAL_DLLPRIVATE Dialog & operator= (const Dialog &) SAL_DELETED_FUNCTION;
- DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void );
protected:
using Window::ImplInit;
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index e98ec15398e8..55f93685cac6 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -38,7 +38,7 @@ namespace vcl
ImplSVEvent * m_nId;
Link<> m_aLink;
- DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* );
+ DECL_DLLPRIVATE_LINK_TYPED( DoEvent_Impl, void*, void );
public:
EventPoster( const Link<>& rLink );
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 023666f5f04c..9c64ada7c50c 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -112,7 +112,7 @@ private:
Link<> maPopupModeEndHdl;
SAL_DLLPRIVATE void ImplCallPopupModeEnd();
- DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplEndPopupModeHdl, void*, void );
virtual void setPosSizeOnContainee(Size aSize, Window &rBox) SAL_OVERRIDE;
FloatingWindow (const FloatingWindow &) SAL_DELETED_FUNCTION;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index e6109dbc3507..2c77726ad0bc 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -183,7 +183,7 @@ protected:
SAL_DLLPRIVATE void ImplSelect();
SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem );
SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos );
- DECL_DLLPRIVATE_LINK(ImplCallSelect, void* );
+ DECL_DLLPRIVATE_LINK_TYPED(ImplCallSelect, void*, void );
SAL_DLLPRIVATE void ImplFillLayoutData() const;
SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; }
@@ -412,7 +412,7 @@ VCL_DLLPUBLIC void Invalidated();
class VCL_DLLPUBLIC MenuBar : public Menu
{
- Link<> maCloseHdl;
+ Link<void*,void> maCloseHdl;
Link<> maFloatHdl;
Link<> maHideHdl;
bool mbCloseBtnVisible : 1;
@@ -468,10 +468,10 @@ public:
bool HandleMenuCommandEvent(Menu *pMenu, sal_uInt16 nEventId) const;
bool HandleMenuButtonEvent(Menu *pMenu, sal_uInt16 nEventId);
- void SetCloseButtonClickHdl( const Link<>& rLink ) { maCloseHdl = rLink; }
- const Link<>& GetCloseButtonClickHdl() const { return maCloseHdl; }
- const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; }
- const Link<>& GetHideButtonClickHdl() const { return maHideHdl; }
+ void SetCloseButtonClickHdl( const Link<void*,void>& rLink ) { maCloseHdl = rLink; }
+ const Link<void*,void>& GetCloseButtonClickHdl() const { return maCloseHdl; }
+ const Link<>& GetFloatButtonClickHdl() const { return maFloatHdl; }
+ const Link<>& GetHideButtonClickHdl() const { return maHideHdl; }
// - by default a menubar is displayable
// - if a menubar is not displayable, its MenuBarWindow will never be shown
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index e7808c0b1e12..d9dd2eddaf6c 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -853,7 +853,7 @@ public:
@return the event ID used to post the event.
*/
- static ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL,
+ static ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = NULL,
bool bReferenceLink = false );
/** Remove user event based on event ID
@@ -1489,7 +1489,7 @@ private:
static void InitSettings(ImplSVData* pSVData);
- DECL_STATIC_LINK( Application, PostEventHandler, void* );
+ DECL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, void );
};
@@ -1682,7 +1682,7 @@ VCL_DLLPUBLIC void JoinMainLoopThread();
inline void Application::EndYield()
{
- PostUserEvent( Link<>() );
+ PostUserEvent( Link<void*,void>() );
}
namespace vcl
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index b5122f60c5e9..939b9de2aaaa 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -38,7 +38,7 @@ namespace vcl
long m_nReturn;
bool m_bTimeout;
- DECL_DLLPRIVATE_LINK( worker, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( worker, void*, void );
public:
SolarThreadExecutor();
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 7fe0bd1283af..9d91d49a1ab1 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -224,7 +224,7 @@ private:
SAL_DLLPRIVATE bool ImplHasExternalMenubutton();
SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem );
- DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplCallExecuteCustomMenu, void*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateHdl, Idle*, void );
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* );
DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 57ac3197aaaa..63be0ac19f2c 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -554,9 +554,9 @@ private:
public:
DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void );
- DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void );
- DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void );
@@ -884,7 +884,7 @@ public:
void AddChildEventListener( const Link<>& rEventListener );
void RemoveChildEventListener( const Link<>& rEventListener );
- ImplSVEvent * PostUserEvent( const Link<>& rLink, void* pCaller = NULL, bool bReferenceLink = false );
+ ImplSVEvent * PostUserEvent( const Link<void*,void>& rLink, void* pCaller = NULL, bool bReferenceLink = false );
void RemoveUserEvent( ImplSVEvent * nUserEvent );
void IncrementLockCount();