convert Link<> to typed

Change-Id: Ibd1baf909bc49ad0e7fa1fc9fdd2f42d59162960

5 files changed, 12 insertions, 16 deletions

diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index b3eeca1021bc..3088e0857201 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -33,10 +33,10 @@ namespace rptui
         void operator =(const OColorListener&) SAL_DELETED_FUNCTION;
     protected:
         OModuleClient                       m_aModuleClient;
-        Link<>                              m_aCollapsedLink;
+        Link<OColorListener&,void>          m_aCollapsedLink;
         svtools::ColorConfig                m_aColorConfig;
         svtools::ExtendedColorConfig        m_aExtendedColorConfig;
-        OUString                     m_sColorEntry;
+        OUString                            m_sColorEntry;
         sal_Int32                           m_nColor;
         sal_Int32                           m_nTextBoundaries;
         bool                            m_bCollapsed;
@@ -63,7 +63,7 @@ namespace rptui
         */
         inline bool isMarked() const { return m_bMarked; }
 
-        inline void     setCollapsedHdl(const Link<>& _aLink ){ m_aCollapsedLink = _aLink; }
+        inline void     setCollapsedHdl(const Link<OColorListener&,void>& _aLink ){ m_aCollapsedLink = _aLink; }
         inline bool isCollapsed() const { return m_bCollapsed; }
 
         /** collapse or expand
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 5e232a14358a..c0fee43b6ac0 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -79,7 +79,7 @@ namespace rptui
         bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn);
         void ImplInitSettings();
 
-        DECL_LINK(Collapsed,OColorListener*);
+        DECL_LINK_TYPED(Collapsed, OColorListener&, void);
         DECL_LINK_TYPED(StartSplitHdl, Splitter*, void);
         DECL_LINK_TYPED(SplitHdl, Splitter*, void);
         DECL_LINK_TYPED(EndSplitHdl, Splitter*, void);
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 12be6c3fd337..448913ec501b 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -78,7 +78,7 @@ void OColorListener::setCollapsed(bool _bCollapsed)
     {
         m_bCollapsed = _bCollapsed;
         if ( m_aCollapsedLink.IsSet() )
-            m_aCollapsedLink.Call(this);
+            m_aCollapsedLink.Call(*this);
     }
 }
 
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index deaa0f48c7de..2c6de371290f 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -296,18 +296,14 @@ void OSectionWindow::setMarked(bool _bMark)
     m_aEndMarker->setMarked(_bMark);
 }
 
-IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
+IMPL_LINK_TYPED( OSectionWindow, Collapsed, OColorListener&, _rMarker, void )
 {
-    if ( _pMarker )
-    {
-        bool bShow = !_pMarker->isCollapsed();
-        m_aReportSection->Show(bShow);
-        m_aEndMarker->Show(bShow);
-        m_aSplitter->Show(bShow);
+    bool bShow = !_rMarker.isCollapsed();
+    m_aReportSection->Show(bShow);
+    m_aEndMarker->Show(bShow);
+    m_aSplitter->Show(bShow);
 
-        m_pParent->resize(*this);
-    }
-    return 0L;
+    m_pParent->resize(*this);
 }
 
 void OSectionWindow::zoom(const Fraction& _aZoom)
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index 4dde6f5fb5d1..5bb48bc5ef5d 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -183,7 +183,7 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
 
         m_aVRuler->Show(!m_bCollapsed && m_bShowRuler);
         if ( m_aCollapsedLink.IsSet() )
-            m_aCollapsedLink.Call(this);
+            m_aCollapsedLink.Call(*this);
     }
 
     m_pParent->showProperties();