summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr
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 /extensions/source/propctrlr
parent1b9c3a17e8496aedfb80528c5275e6658154789d (diff)
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'extensions/source/propctrlr')
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx3
-rw-r--r--extensions/source/propctrlr/formlinkdialog.hxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx4
-rw-r--r--extensions/source/propctrlr/standardcontrol.hxx8
4 files changed, 7 insertions, 10 deletions
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 );
};