make PostUserEvent Link<> typed

Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a

6 files changed, 9 insertions, 12 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 9d5f55dc7031..62fd0b6860fc 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -415,7 +415,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
 void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException, std::exception)
 {
     // Asynchronous for css::util::URL-Button
-    ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) );
+    ImplSVEvent * n = Application::PostUserEvent( LINK(this, OButtonControl, OnClick) );
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_nClickEvent = n;
@@ -423,7 +423,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::co
 }
 
 
-IMPL_LINK_NOARG(OButtonControl, OnClick)
+IMPL_LINK_NOARG_TYPED(OButtonControl, OnClick, void*, void)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     m_nClickEvent = 0;
@@ -443,7 +443,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
         // recognize the button type
         Reference<XPropertySet>  xSet(getModel(), UNO_QUERY);
         if (!xSet.is())
-            return 0L;
+            return;
 
         if (FormButtonType_PUSH == *static_cast<FormButtonType const *>(xSet->getPropertyValue(PROPERTY_BUTTONTYPE).getValue()))
         {
@@ -474,7 +474,6 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
         else
             actionPerformed_Impl( false, ::com::sun::star::awt::MouseEvent() );
     }
-    return 0L;
 }
 
 
diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx
index 825d8dcb645e..c6a3139b3c4b 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -181,7 +181,7 @@ protected:
     virtual void    actionPerformed_Impl( bool bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt ) SAL_OVERRIDE;
 
 private:
-    DECL_LINK( OnClick, void* );
+    DECL_LINK_TYPED( OnClick, void*, void );
 
     /// to be called whenever the feature URL represented by our model has potentially changed
     void        modelFeatureUrlPotentiallyChanged( );
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 3c4f6bf6cb0e..a135db3a7fa6 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -238,7 +238,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
     // Because we're still in the header, trigger submit asynchronously
     if( m_nKeyEvent )
         Application::RemoveUserEvent( m_nKeyEvent );
-    m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl,OnKeyPressed) );
+    m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl, OnKeyPressed) );
 }
 
 
@@ -247,7 +247,7 @@ void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) thr
 }
 
 
-IMPL_LINK_NOARG(OEditControl, OnKeyPressed)
+IMPL_LINK_NOARG_TYPED(OEditControl, OnKeyPressed, void*, void)
 {
     m_nKeyEvent = 0;
 
@@ -256,7 +256,6 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed)
     Reference<XSubmit>  xSubmit(xParent, UNO_QUERY);
     if (xSubmit.is())
         xSubmit->submit( Reference<XControl>(), ::com::sun::star::awt::MouseEvent() );
-    return 0L;
 }
 
 
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 52b32b370d7e..3f89f221efc9 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -170,7 +170,7 @@ public:
     virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rxParent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
 private:
-    DECL_LINK( OnKeyPressed, void* );
+    DECL_LINK_TYPED( OnKeyPressed, void*, void );
 };
 
 }
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 036605d0df7d..8fde4d8a8534 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -240,7 +240,7 @@ void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/
 {
 }
 
-IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed)
+IMPL_LINK_NOARG_TYPED(OFormattedControl, OnKeyPressed, void*, void)
 {
     m_nKeyEvent = 0;
     Reference<XFormComponent>  xFComp(getModel(), UNO_QUERY);
@@ -248,7 +248,6 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed)
     Reference<XSubmit>  xSubmit(xParent, UNO_QUERY);
     if (xSubmit.is())
         xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() );
-    return 0L;
 }
 
 css::uno::Sequence<OUString>  OFormattedControl::getSupportedServiceNames() throw(std::exception)
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 812f7f252a00..84132df1f478 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -181,7 +181,7 @@ class OFormattedModel
         using OBoundControl::disposing;
 
     private:
-        DECL_LINK( OnKeyPressed, void* );
+        DECL_LINK_TYPED( OnKeyPressed, void*, void );
     };
 }
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX