From bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 27 Aug 2015 13:08:02 +0200
Subject: make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
---
extensions/source/bibliography/bibbeam.cxx | 3 +--
extensions/source/bibliography/bibbeam.hxx | 2 +-
extensions/source/bibliography/bibview.cxx | 3 +--
extensions/source/bibliography/bibview.hxx | 2 +-
extensions/source/bibliography/framectr.cxx | 3 +--
extensions/source/bibliography/framectr.hxx | 2 +-
extensions/source/bibliography/toolbar.cxx | 2 +-
extensions/source/bibliography/toolbar.hxx | 4 ++--
extensions/source/plugin/base/nfuncs.cxx | 6 +++---
extensions/source/plugin/base/xplugin.cxx | 5 ++---
extensions/source/plugin/inc/plugin/impl.hxx | 2 +-
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 +-
extensions/source/plugin/unx/npnapi.cxx | 3 +--
extensions/source/plugin/unx/nppapi.cxx | 5 ++---
extensions/source/propctrlr/formlinkdialog.cxx | 3 +--
extensions/source/propctrlr/formlinkdialog.hxx | 2 +-
extensions/source/propctrlr/standardcontrol.cxx | 4 +---
extensions/source/propctrlr/standardcontrol.hxx | 8 ++++----
extensions/source/scanner/scanwin.cxx | 12 ++++--------
extensions/source/update/ui/updatecheckui.cxx | 6 ++----
20 files changed, 32 insertions(+), 47 deletions(-)
(limited to 'extensions')
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index ff1a73171875..4a3878e21aa8 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -272,11 +272,10 @@ namespace bib
pGridWin->GrabFocus();
}
- IMPL_LINK_NOARG( BibBeamer, RecalcLayout_Impl )
+ IMPL_LINK_NOARG_TYPED( BibBeamer, RecalcLayout_Impl, void*, void )
{
long nHeight = pToolBar->GetSizePixel().Height();
SetItemSize( ID_TOOLBAR, nHeight );
- return 0L;
}
} // namespace bib
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 3569ff506439..02e074a18a5e 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -54,7 +54,7 @@ namespace bib
VclPtr<BibToolBar> pToolBar;
VclPtr<BibGridwin> pGridWin;
- DECL_LINK( RecalcLayout_Impl, void* );
+ DECL_LINK_TYPED( RecalcLayout_Impl, void*, void );
protected:
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 23d4186f7537..e497ee80f69a 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -176,10 +176,9 @@ namespace bib
mpBibView->Resize();
}
- IMPL_LINK( BibView, CallMappingHdl, BibView*, )
+ IMPL_LINK_NOARG_TYPED( BibView, CallMappingHdl, void*, void)
{
m_pDatMan->CreateMappingDialog( this );
- return 0;
}
void BibView::Resize()
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index a27693221b03..86719c11b936 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -63,7 +63,7 @@ namespace bib
BibViewFormControlContainer m_aFormControlContainer;
private:
- DECL_LINK(CallMappingHdl, BibView*);
+ DECL_LINK_TYPED(CallMappingHdl, void*, void);
public:
// Window overridables
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 790b32ec8521..af476f6b251a 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -630,10 +630,9 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
}
}
-IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl )
+IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void )
{
xFrame->dispose();
- return 0;
};
void BibFrameController_Impl::addStatusListener(
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index ce93e27782e4..f56e56135628 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -69,7 +69,7 @@ friend class BibFrameCtrl_Impl;
BibDataManager* pDatMan;
HdlBibModul pBibMod;
- DECL_LINK( DisposeHdl, void* );
+ DECL_LINK_TYPED( DisposeHdl, void*, void );
static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController);
public:
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 56aeb13b1b76..f634b49271f7 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -176,7 +176,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw
}
}
-BibToolBar::BibToolBar(vcl::Window* pParent, Link<> aLink, WinBits nStyle):
+BibToolBar::BibToolBar(vcl::Window* pParent, Link<void*,void> aLink, WinBits nStyle):
ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)),
aImgLst(BibResId( RID_TOOLBAR_IMGLIST )),
aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )),
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 6c79ce1d2919..271e54dab088 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -123,7 +123,7 @@ class BibToolBar: public ToolBox
sal_uInt16 nMenuId;
sal_uInt16 nSelMenuItem;
OUString aQueryField;
- Link<> aLayoutManager;
+ Link<void*,void> aLayoutManager;
sal_Int16 nSymbolsSize;
sal_Int16 nOutStyle;
@@ -148,7 +148,7 @@ class BibToolBar: public ToolBox
public:
- BibToolBar(vcl::Window* pParent, Link<> aLink, WinBits nStyle = WB_3DLOOK );
+ BibToolBar(vcl::Window* pParent, Link<void*,void> aLink, WinBits nStyle = WB_3DLOOK );
virtual ~BibToolBar();
virtual void dispose() SAL_OVERRIDE;
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index f36e89b24079..f57540abd0ed 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -177,11 +177,12 @@ struct AsynchronousGetURL
OUString aTarget;
Reference< XEventListener > xListener;
- DECL_LINK( getURL, XPlugin_Impl* );
+ DECL_LINK_TYPED( getURL, void*, void );
};
-IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl )
+IMPL_LINK_TYPED( AsynchronousGetURL, getURL, void*, p, void )
{
+ XPlugin_Impl* pImpl = static_cast<XPlugin_Impl*>(p);
try
{
pImpl->enterPluginCallback();
@@ -202,7 +203,6 @@ IMPL_LINK( AsynchronousGetURL, getURL, XPlugin_Impl*, pImpl )
}
pImpl->leavePluginCallback();
delete this;
- return 0;
}
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index eab48cd11979..f8e69e757fc2 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -189,7 +189,7 @@ void XPlugin_Impl::checkListeners( const char* normalizedURL )
}
}
-IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
+IMPL_LINK_NOARG_TYPED( XPlugin_Impl, secondLevelDispose, void*, void )
{
Guard< Mutex > aGuard( m_aMutex );
@@ -206,7 +206,7 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
break;
}
if( iter == rList.end() || ! isDisposable() )
- return 0;
+ return;
}
if (m_pDisposer)
@@ -229,7 +229,6 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
#endif
destroyInstance();
PluginControl_Impl::dispose();
- return 0;
}
void XPlugin_Impl::dispose() throw(std::exception)
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index efbe9e366fe7..e0e9487926a9 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -201,7 +201,7 @@ public:
void enterPluginCallback() { m_nCalledFromPlugin++; }
void leavePluginCallback() { m_nCalledFromPlugin--; }
bool isDisposable() { return m_nCalledFromPlugin < 1; }
- DECL_LINK( secondLevelDispose, XPlugin_Impl* );
+ DECL_LINK_TYPED( secondLevelDispose, void*, void );
void addPluginEventListener( PluginEventListener* pListener )
{ m_aPEventListeners.push_back( pListener ); }
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 20db98077040..d0e3d33bc9af 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -133,7 +133,7 @@ protected:
static std::vector<PluginConnector*> allConnectors;
DECL_LINK( NewMessageHdl, Mediator* );
- DECL_LINK( WorkOnNewMessageHdl, Mediator* );
+ DECL_LINK_TYPED( WorkOnNewMessageHdl, void*, void );
std::vector<NPStream*> m_aNPWrapStreams;
std::vector<ConnectorInstance*> m_aInstances;
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 1129fc8ea3b9..5330c823bb04 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -520,7 +520,7 @@ PluginConnector::~PluginConnector()
{
}
-IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
+IMPL_LINK_NOARG_TYPED( PluginConnector, WorkOnNewMessageHdl, void*, void )
{
MediatorMessage* pMessage;
CommandAtoms nCommand;
@@ -928,7 +928,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
}
delete pMessage;
}
- return 0;
}
void LoadAdditionalLibs( const char* _pPluginLib )
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index e55b14b3d35c..e89ded2a74ca 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -80,7 +80,7 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, /*pMediator*/ )
return 0;
}
-IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
+IMPL_LINK_NOARG_TYPED( PluginConnector, WorkOnNewMessageHdl, void*, void )
{
bool bFound = false;
for( std::vector< PluginConnector* >::iterator it = allConnectors.begin();
@@ -90,7 +90,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
bFound = true;
}
if( ! bFound )
- return 0;
+ return;
MediatorMessage* pMessage;
CommandAtoms nCommand;
@@ -323,7 +323,6 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
delete pMessage;
}
- return 0;
}
#define GET_INSTANCE() \
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 1028a0e2cede..85efd4ef82df 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -673,13 +673,12 @@ namespace pcr
}
- IMPL_LINK_NOARG( FormLinkDialog, OnInitialize )
+ IMPL_LINK_NOARG_TYPED( FormLinkDialog, OnInitialize, void*, void )
{
initializeColumnLabels();
initializeFieldLists();
initializeLinks();
initializeSuggest();
- return 0L;
}
} // namespace pcr
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 044432c2bed0..3913257fb4c0 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -88,7 +88,7 @@ namespace pcr
private:
DECL_LINK_TYPED( OnSuggest, Button*, void );
DECL_LINK( OnFieldChanged, FieldLinkRow* );
- DECL_LINK( OnInitialize, void* );
+ DECL_LINK_TYPED( OnInitialize, void*, void);
void updateOkButton();
void initializeFieldLists();
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 94d3ee4cd57c..2a9005a3e9ef 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -460,15 +460,13 @@ namespace pcr
}
- IMPL_LINK_NOARG( OHyperlinkControl, OnHyperlinkClicked )
+ IMPL_LINK_NOARG_TYPED( OHyperlinkControl, OnHyperlinkClicked, void*, void )
{
ActionEvent aEvent( *this, OUString( "clicked" ) );
m_aActionListeners.forEach< XActionListener >(
boost::bind(
&XActionListener::actionPerformed,
_1, boost::cref(aEvent) ) );
-
- return 0;
}
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index 22edd9703358..e88111c453f7 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -165,8 +165,8 @@ namespace pcr
class HyperlinkInput : public Edit
{
private:
- Point m_aMouseButtonDownPos;
- Link<> m_aClickHandler;
+ Point m_aMouseButtonDownPos;
+ Link<void*,void> m_aClickHandler;
public:
HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle );
@@ -174,7 +174,7 @@ namespace pcr
/** sets the handler which will (asynchronously, with locked SolarMutex) be called
when the hyperlink has been clicked by the user
*/
- void SetClickHdl( const Link<>& _rHdl ) { m_aClickHandler = _rHdl; }
+ void SetClickHdl( const Link<void*,void>& _rHdl ) { m_aClickHandler = _rHdl; }
protected:
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -213,7 +213,7 @@ namespace pcr
virtual void SAL_CALL disposing() SAL_OVERRIDE;
protected:
- DECL_LINK( OnHyperlinkClicked, void* );
+ DECL_LINK_TYPED( OnHyperlinkClicked, void*, void );
};
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index ec249536032c..f4df5af73ae4 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -104,8 +104,8 @@ class ImpTwain : public ::cppu::WeakImplHelper< util::XCloseListener >
uno::Reference< frame::XFrame > ImplGetActiveFrame();
uno::Reference< util::XCloseBroadcaster > ImplGetActiveFrameCloseBroadcaster();
- DECL_LINK( ImplFallbackHdl, void* );
- DECL_LINK( ImplDestroyHdl, void* );
+ DECL_LINK_TYPED( ImplFallbackHdl, void*, void );
+ DECL_LINK_TYPED( ImplDestroyHdl, void*, void );
// from util::XCloseListener
virtual void SAL_CALL queryClosing( const lang::EventObject& Source, sal_Bool GetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
@@ -421,7 +421,7 @@ void ImpTwain::ImplFallback( ULONG_PTR nEvent )
Application::PostUserEvent( LINK( this, ImpTwain, ImplFallbackHdl ), (void*) nEvent );
}
-IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
+IMPL_LINK_TYPED( ImpTwain, ImplFallbackHdl, void*, pData, void )
{
const sal_uIntPtr nEvent = (sal_uIntPtr) pData;
bool bFallback = true;
@@ -489,11 +489,9 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
if( bFallback )
ImplFallback( nEvent );
-
- return 0L;
}
-IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl )
+IMPL_LINK_NOARG_TYPED( ImpTwain, ImplDestroyHdl, void*, void )
{
if( hTwainWnd )
DestroyWindow( hTwainWnd );
@@ -505,8 +503,6 @@ IMPL_LINK_NOARG( ImpTwain, ImplDestroyHdl )
// should drop to zero exactly here)
mxSelfRef = NULL;
pImpTwainInstance = NULL;
-
- return 0L;
}
uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index d2ce4062dca8..55c77b66d2d6 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -147,7 +147,7 @@ private:
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
DECL_LINK_TYPED(WaitTimeOutHdl, Idle *, void);
DECL_LINK_TYPED(TimeOutHdl, Timer *, void);
- DECL_LINK(UserEventHdl, void *);
+ DECL_LINK_TYPED(UserEventHdl, void *, void);
DECL_LINK( WindowEventHdl, VclWindowEvent* );
DECL_LINK( ApplicationEventHdl, VclSimpleEvent* );
@@ -631,7 +631,7 @@ IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void)
}
-IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
+IMPL_LINK_NOARG_TYPED(UpdateCheckUI, UserEventHdl, void*, void)
{
SolarMutexGuard aGuard;
@@ -659,8 +659,6 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
if ( pActiveSysWin )
AddMenuBarIcon( pActiveSysWin, true );
-
- return 0;
}
--
cgit