convert Link<> to typed

Change-Id: Ia2706c308c6297d05b2862e9f86fc0f2ee90e4f0

14 files changed, 24 insertions, 24 deletions

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index bd2c1faaacdf..ead5720a322e 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1297,7 +1297,7 @@ SfxTabPage::sfxpg SwColumnPage::DeactivatePage(SfxItemSet *_pSet)
     return LEAVE_PAGE;
 }
 
-IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
+IMPL_LINK_TYPED( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void )
 {
     const sal_uInt16 nItem = pVS->GetSelectItemId();
     if( nItem < 4 )
@@ -1330,7 +1330,6 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS )
         Timeout();
 
     }
-    return 0;
 }
 
 void SwColumnPage::SetFrmMode(bool bMod)
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 18985b33ed1b..0d043bf574a1 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -142,7 +142,7 @@ class SwColumnPage : public SfxTabPage
     DECL_LINK( GapModify, MetricField * );
     DECL_LINK( EdModify, MetricField * );
     DECL_LINK_TYPED( AutoWidthHdl, Button *, void );
-    DECL_LINK( SetDefaultsHdl, ValueSet * );
+    DECL_LINK_TYPED( SetDefaultsHdl, ValueSet *, void );
 
     DECL_LINK_TYPED(Up, Button *, void);
     DECL_LINK_TYPED(Down, Button *, void);
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 6c9e7bd3e89d..bfcdd2dc36d0 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -88,7 +88,7 @@ void PageColumnControl::dispose()
     svx::sidebar::PopupControl::dispose();
 }
 
-IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
+IMPL_LINK_TYPED(PageColumnControl, ImplColumnHdl, ValueSet*, pControl, void)
 {
     mpColumnValueSet->SetNoSelection();
     if ( pControl == mpColumnValueSet )
@@ -102,7 +102,6 @@ IMPL_LINK(PageColumnControl, ImplColumnHdl, void *, pControl)
     }
 
     mrPagePropPanel.ClosePageColumnPopup();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(PageColumnControl, MoreButtonClickHdl_Impl, Button*, void)
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index 3989ea9ae2d6..c7671c144d31 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -29,6 +29,7 @@
 namespace svx { namespace sidebar {
     class ValueSetWithTextControl;
 } }
+class ValueSet;
 
 namespace sw { namespace sidebar {
 
@@ -55,7 +56,7 @@ private:
 
     PagePropertyPanel& mrPagePropPanel;
 
-    DECL_LINK(ImplColumnHdl, void*);
+    DECL_LINK_TYPED(ImplColumnHdl, ValueSet*, void);
     DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void);
 };
 
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 7d5fe569f41d..7e3a206c63ac 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -323,7 +323,7 @@ void PageMarginControl::SelectValueSetItem()
     mpMarginValueSet->StartSelection();
 };
 
-IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl)
+IMPL_LINK_TYPED(PageMarginControl, ImplMarginHdl, ValueSet*, pControl, void)
 {
     if ( pControl == mpMarginValueSet )
     {
@@ -397,8 +397,6 @@ IMPL_LINK(PageMarginControl, ImplMarginHdl, void *, pControl)
             SelectValueSetItem();
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, )
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index 12a6754b83aa..be2ded8d722c 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -39,6 +39,7 @@
 namespace svx { namespace sidebar {
     class ValueSetWithTextControl;
 } }
+class ValueSet;
 
 static const long MINBODY = 284; //0.5 cm in twips
 
@@ -100,7 +101,7 @@ private:
 
     PagePropertyPanel& mrPagePropPanel;
 
-    DECL_LINK( ImplMarginHdl, void* );
+    DECL_LINK_TYPED( ImplMarginHdl, ValueSet*, void );
     DECL_LINK( ModifyLRMarginHdl, MetricField* );
     DECL_LINK( ModifyULMarginHdl, MetricField* );
 
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 18da73a34ba5..73ff9eb676f9 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -48,8 +48,7 @@ PageOrientationControl::PageOrientationControl(
                     SW_RES(STR_LANDSCAPE), 0 );
     }
 
-    Link<> aLink = LINK(this, PageOrientationControl,ImplOrientationHdl );
-    mpOrientationValueSet->SetSelectHdl(aLink);
+    mpOrientationValueSet->SetSelectHdl(LINK(this, PageOrientationControl,ImplOrientationHdl ));
     mpOrientationValueSet->SetNoSelection();
     mpOrientationValueSet->StartSelection();
     mpOrientationValueSet->Show();
@@ -73,7 +72,7 @@ void PageOrientationControl::dispose()
     svx::sidebar::PopupControl::dispose();
 }
 
-IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl)
+IMPL_LINK_TYPED(PageOrientationControl, ImplOrientationHdl, ValueSet*, pControl, void)
 {
     mpOrientationValueSet->SetNoSelection();
     if ( pControl == mpOrientationValueSet )
@@ -89,7 +88,6 @@ IMPL_LINK(PageOrientationControl, ImplOrientationHdl, void *, pControl)
     }
 
     mrPagePropPanel.ClosePageOrientationPopup();
-    return 0;
 }
 
 } } // end of namespace sw::sidebar
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index a2ceecff2a5a..69dc50074848 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -24,6 +24,8 @@
 namespace svx { namespace sidebar {
     class ValueSetWithTextControl;
 } }
+class ValueSet;
+
 
 namespace sw { namespace sidebar {
 
@@ -47,7 +49,7 @@ private:
 
     PagePropertyPanel& mrPagePropPanel;
 
-    DECL_LINK(ImplOrientationHdl, void*);
+    DECL_LINK_TYPED(ImplOrientationHdl, ValueSet*, void);
 };
 
 } } // end of namespace sw::sidebar
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 88484f26b143..e43cd140850a 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -155,7 +155,7 @@ void PageSizeControl::dispose()
     svx::sidebar::PopupControl::dispose();
 }
 
-IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl)
+IMPL_LINK_TYPED(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void)
 {
     mpSizeValueSet->SetNoSelection();
     if ( pControl == mpSizeValueSet )
@@ -170,7 +170,6 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, void *, pControl)
     }
 
     mrPagePropPanel.ClosePageSizePopup();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(PageSizeControl, MoreButtonClickHdl_Impl, Button*, void)
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index 7bb7e08ccdd2..59ce8845cdd2 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.hxx
@@ -32,6 +32,7 @@
 namespace svx { namespace sidebar {
     class ValueSetWithTextControl;
 } }
+class ValueSet;
 
 namespace sw { namespace sidebar {
 
@@ -61,7 +62,7 @@ private:
 
     PagePropertyPanel& mrPagePropPanel;
 
-    DECL_LINK(ImplSizeHdl, void*);
+    DECL_LINK_TYPED(ImplSizeHdl, ::ValueSet*, void);
     DECL_LINK_TYPED(MoreButtonClickHdl_Impl, Button*, void);
 };
 
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 51137958338b..da36ab5378a1 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -207,7 +207,7 @@ void StylePresetsPanel::dispose()
     PanelLayout::dispose();
 }
 
-IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl)
+IMPL_LINK_NOARG_TYPED(StylePresetsPanel, DoubleClickHdl, ValueSet*, void)
 {
     sal_Int32 nItemId = mpValueSet->GetSelectItemId();
     TemplateEntry* pEntry = static_cast<TemplateEntry*>(mpValueSet->GetItemData(nItemId));
@@ -220,8 +220,6 @@ IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl)
         aOption.SetNumRules(true);
         pDocSh->LoadStylesFromFile(pEntry->maURL, aOption, false);
     }
-
-    return 0;
 }
 
 void StylePresetsPanel::NotifyItemUpdate(const sal_uInt16 /*nSId*/,
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index c86276728bcf..f30d560667cc 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -83,7 +83,7 @@ private:
 
     std::vector<std::unique_ptr<TemplateEntry>> maTemplateEntries;
 
-    DECL_LINK(DoubleClickHdl, void*);
+    DECL_LINK_TYPED(DoubleClickHdl, ValueSet*, void);
 };
 
 }} // end of namespace sw::sidebar
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 838cc1b147d7..c183a14eb404 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -457,7 +457,7 @@ ThemePanel::ThemePanel(vcl::Window* pParent,
 
     mpApplyButton->SetClickHdl(LINK(this, ThemePanel, ClickHdl));
     mpListBoxFonts->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl));
-    mpValueSetColors->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl));
+    mpValueSetColors->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickValueSetHdl));
 
     std::vector<FontSet> aFontSets = initFontSets();
     for (size_t i = 0; i < aFontSets.size(); ++i)
@@ -496,7 +496,10 @@ IMPL_LINK_NOARG_TYPED(ThemePanel, ClickHdl, Button*, void)
 {
     DoubleClickHdl(NULL);
 }
-
+IMPL_LINK_NOARG_TYPED(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void)
+{
+    DoubleClickHdl(NULL);
+}
 IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl)
 {
     SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current());
diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx
index 870690d6492e..173fb76c4375 100644
--- a/sw/source/uibase/sidebar/ThemePanel.hxx
+++ b/sw/source/uibase/sidebar/ThemePanel.hxx
@@ -74,6 +74,7 @@ private:
 
     DECL_LINK_TYPED(ClickHdl, Button*, void);
     DECL_LINK(DoubleClickHdl, void*);
+    DECL_LINK_TYPED(DoubleClickValueSetHdl, ValueSet*, void);
 
 };