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
---
 reportdesign/source/ui/dlg/GroupsSorting.cxx       | 13 +++++--------
 reportdesign/source/ui/inc/ReportController.hxx    |  4 ++--
 reportdesign/source/ui/inc/propbrw.hxx             |  2 +-
 reportdesign/source/ui/report/ReportController.cxx |  6 ++----
 reportdesign/source/ui/report/propbrw.cxx          |  3 +--
 5 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'reportdesign')

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 88bc3164a971..d2f4281dc90d 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -168,13 +168,13 @@ protected:
 
 private:
 
-    DECL_LINK( DelayedPaste, void* );
-    DECL_LINK( CBChangeHdl,ComboBox*);
+    DECL_LINK_TYPED( DelayedPaste, void*, void );
+    DECL_LINK( CBChangeHdl, ComboBox*);
 
     void InsertRows( long nRow );
 
 public:
-    DECL_LINK( DelayedDelete, void* );
+    DECL_LINK_TYPED( DelayedDelete, void*, void );
 
 };
 
@@ -858,7 +858,7 @@ void OFieldExpressionControl::paste()
     }
 }
 
-IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste )
+IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void )
 {
     m_nPasteEvent = 0;
 
@@ -867,15 +867,12 @@ IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste )
     InsertRows( nPastePosition );
     SetNoSelection();
     GoToRow( nPastePosition );
-
-    return 0;
 }
 
-IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete )
+IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedDelete, void*, void )
 {
     m_nDeleteEvent = 0;
     DeleteRows();
-    return 0;
 }
 
 void OFieldExpressionControl::InsertRows( long nRow )
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 4c85a2c3159a..b53f1b32bb85 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -316,8 +316,8 @@ namespace rptui
 
         void OnInvalidateClipboard();
         DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void );
-        DECL_LINK( OnExecuteReport, void* );
-        DECL_LINK( OnOpenHelpAgent, void* );
+        DECL_LINK_TYPED( OnExecuteReport, void*, void );
+        DECL_LINK_TYPED( OnOpenHelpAgent, void*, void );
         // all the features which should be handled by this class
         virtual void            describeSupportedFeatures() SAL_OVERRIDE;
         // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 4f5b9f712c84..811d57c2c389 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -83,7 +83,7 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> CreateComponentPair(
              const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xFormComponent
             ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xReportComponent);
-    DECL_LINK( OnAsyncGetFocus, void* );
+    DECL_LINK_TYPED( OnAsyncGetFocus, void*, void );
 
 public:
     PropBrw(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 301385410da6..f706f88351ce 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1746,10 +1746,9 @@ void OReportController::impl_initialize( )
     }
 }
 
-IMPL_LINK_NOARG( OReportController, OnOpenHelpAgent )
+IMPL_LINK_NOARG_TYPED( OReportController, OnOpenHelpAgent, void*, void )
 {
     doOpenHelpAgent();
-    return 0L;
 }
 
 IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow* ,_pAddFieldDlg)
@@ -3147,10 +3146,9 @@ void OReportController::createNewFunction(const uno::Any& _aValue)
     xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction));
 }
 
-IMPL_LINK_NOARG( OReportController, OnExecuteReport )
+IMPL_LINK_NOARG_TYPED( OReportController, OnExecuteReport, void*, void )
 {
     executeReport();
-    return 0L;
 }
 
 void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId)
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 6706c74cfe85..76e66e891ca3 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -569,11 +569,10 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
     }
 }
 
-IMPL_LINK_NOARG( PropBrw, OnAsyncGetFocus )
+IMPL_LINK_NOARG_TYPED( PropBrw, OnAsyncGetFocus, void*, void )
 {
     if (m_xBrowserComponentWindow.is())
         m_xBrowserComponentWindow->setFocus();
-    return 0L;
 }
 
 void PropBrw::LoseFocus()
-- 
cgit