4 files changed, 4 insertions, 7 deletions
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 1f9efb73c6c6..e99a84ce22f8 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -309,7 +309,7 @@ namespace rptui
         impl_ensureConditionVisible( nNewConditionIndex );
     }
 
-    IMPL_LINK( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/ )
+    IMPL_LINK_TYPED( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/, void )
     {
         size_t nFirstCondIndex( impl_getFirstVisibleConditionIndex() );
         size_t nFocusCondIndex = impl_getFocusedConditionIndex( nFirstCondIndex );
@@ -320,8 +320,6 @@ namespace rptui
             impl_focusCondition( nFirstCondIndex );
         else if ( nFocusCondIndex >= nFirstCondIndex + MAX_CONDITIONS )
             impl_focusCondition( nFirstCondIndex + MAX_CONDITIONS - 1 );
-
-        return 0;
     }
 
     void ConditionalFormattingDialog::impl_layoutConditions()
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index e0ebc887027d..56da7f6e9643 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -110,7 +110,7 @@ namespace rptui
         virtual bool        PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
     private:
-        DECL_LINK( OnScroll, ScrollBar* );
+        DECL_LINK_TYPED( OnScroll, ScrollBar*, void );
 
     private:
         /// returns the current number of conditions
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index af65cccbdcf7..373c7a3dd40b 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -57,7 +57,7 @@ namespace rptui
         ::rtl::Reference<comphelper::OPropertyChangeMultiplexer >
                                     m_pReportDefinitionMultiPlexer; // listener for property changes
 
-        DECL_LINK( ScrollHdl, ScrollBar*);
+        DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void);
         Size ResizeScrollBars();
         void ImplInitSettings();
         void impl_initScrollBar( ScrollBar& _rScrollBar ) const;
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 2d80af0c01e7..71e2cddc8de1 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -193,10 +193,9 @@ void OScrollWindowHelper::Resize()
     m_aReportWindow->SetPosSizePixel(Point( 0, 0 ),aTotalOutputSize);
 }
 
-IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/ )
+IMPL_LINK_TYPED( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/, void )
 {
     m_aReportWindow->ScrollChildren( getThumbPos() );
-    return 0;
 }
 
 void OScrollWindowHelper::addSection(const uno::Reference< report::XSection >& _xSection