convert Link<> to typed

Change-Id: I6de6c831e7401413149100784726ce6c986f8eea
Reviewed-on: https://gerrit.libreoffice.org/18852
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 17 insertions, 14 deletions

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 9f39f38c432c..88806b38b530 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -518,7 +518,7 @@ OUString AbstractSvxTransformTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
-void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
+void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
 {
     pDlg->SetValidateFramePosLink( rLink );
 }
@@ -557,7 +557,7 @@ OUString AbstractSvxCaptionDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
-void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
+void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
 {
     pDlg->SetValidateFramePosLink( rLink );
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 4c8b228850d1..5477392c99e7 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -282,7 +282,7 @@ class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDial
 class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
-    virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
+    virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE;
     virtual void                SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void                SetCurPageId( const OString& rName ) SAL_OVERRIDE;
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
@@ -295,7 +295,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
 class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
-    virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
+    virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE;
     virtual void                SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void                SetCurPageId( const OString& rName ) SAL_OVERRIDE;
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 14469df96bd6..571559a101d9 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -92,7 +92,7 @@ public:
 };
 
 // class SvxCaptionTabDialog ---------------------------------------------
-
+struct SvxSwFrameValidation;
 class SvxCaptionTabDialog : public SfxTabDialog
 {
 private:
@@ -102,7 +102,7 @@ private:
     sal_uInt16 m_nPositionSizePageId;
     sal_uInt16 m_nCaptionPageId;
 
-    Link<>              aValidateLink;
+    Link<SvxSwFrameValidation&,void> aValidateLink;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
 
@@ -111,7 +111,7 @@ public:
                             sal_uInt16 nAnchorTypes = 0);
 
     /// link for the Writer to validate positions
-    void SetValidateFramePosLink( const Link<>& rLink );
+    void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
 };
 
 
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 10f63451d0e2..6003fc6c1385 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -30,6 +30,8 @@
 // SvxSwPosSizeTabPage - position and size page for Writer drawing objects
 struct FrmMap;
 class SdrView;
+struct SvxSwFrameValidation;
+
 class SvxSwPosSizeTabPage : public SfxTabPage
 {
     using TabPage::DeactivatePage;
@@ -68,7 +70,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
 
     VclPtr<SvxSwFrameExample> m_pExampleWN;
 
-    Link<>      m_aValidateLink;
+    Link<SvxSwFrameValidation&,void> m_aValidateLink;
 
     //'string provider'
     SvxSwFramePosString m_aFramePosString;
@@ -137,7 +139,7 @@ public:
 
     void    EnableAnchorTypes(sal_uInt16 nAnchorEnable);
 
-    void SetValidateFramePosLink( const Link<>& rLink )
+    void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
             {m_aValidateLink = rLink;}
 
     void SetView( const SdrView* pSdrView );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 6a967756f2a9..c1282808200c 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -43,6 +43,7 @@ const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
     to disable the protect controls */
 const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
 
+struct SvxSwFrameValidation;
 class SvxTransformTabDialog : public SfxTabDialog
 {
     sal_uInt16         nPosSize;
@@ -53,7 +54,7 @@ private:
     const SdrView*      pView;
 
     sal_uInt16          nAnchorCtrls;
-    Link<>              aValidateLink;
+    Link<SvxSwFrameValidation&,void> aValidateLink;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
 
@@ -64,7 +65,7 @@ public:
                             sal_uInt16 nAnchorTypes = 0);
 
             //link for the Writer to validate positions
-            void SetValidateFramePosLink( const Link<>& rLink );
+            void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
 };
 
 /*************************************************************************
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 3a1c7fbaaca6..61ebffe4687f 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -569,7 +569,7 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
 }
 
-void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<>& rLink )
+void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
 {
     aValidateLink = rLink;
 }
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index b51ef9553ed3..f2d48ace54b7 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1193,7 +1193,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void)
     aVal.nHeight = nHeight;
 
     if(m_aValidateLink.IsSet())
-        m_aValidateLink.Call(&aVal);
+        m_aValidateLink.Call(aVal);
 
     nWidth = aVal.nWidth;
     nHeight = aVal.nHeight;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index aa75a5d56c51..7a8ea1920177 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 
 
 
-void SvxTransformTabDialog::SetValidateFramePosLink(const Link<>& rLink)
+void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidation&,void>& rLink)
 {
     aValidateLink = rLink;
 }