1 files changed, 16 insertions, 16 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 1f9ffad68546..cb7dbd6d5e93 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -347,7 +347,7 @@ public:
     virtual ~SdDesignNameDlg() override;
     virtual void dispose() override;
     OUString GetDesignName();
-    DECL_LINK_TYPED(ModifyHdl, Edit&, void);
+    DECL_LINK(ModifyHdl, Edit&, void);
 };
 
 // SdPublishingDlg Methods
@@ -931,7 +931,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
 }
 
 // Clickhandler for the radiobuttons of the design-selection
-IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 {
     if(pButton == pPage1_NewDesign)
     {
@@ -963,7 +963,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the choice of one design
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 {
     const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
     m_pDesign = &m_aDesignList[nPos];
@@ -976,7 +976,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 }
 
 // Clickhandler for the delete of one design
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl, Button*, void)
 {
     const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
 
@@ -997,7 +997,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void)
 }
 
 // Clickhandler for the other servertypess
-IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
 {
     bool bASP = pButton == pPage2_ASP;
 
@@ -1007,7 +1007,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the Radiobuttons of the graphicformat choice
-IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
 {
     pPage3_Png->Check( pButton == pPage3_Png );
     pPage3_Gif->Check( pButton == pPage3_Gif );
@@ -1016,13 +1016,13 @@ IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the Radiobuttons Standard/Frames
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, BaseHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl, Button*, void)
 {
     UpdatePage();
 }
 
 // Clickhandler for the Checkbox of the Title page
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, Button*, void)
 {
     if(pPage2_Content->IsChecked())
     {
@@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void)
 }
 
 // Clickhandler for the Resolution Radiobuttons
-IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
 {
     pPage3_Resolution_1->Check(pButton == pPage3_Resolution_1);
     pPage3_Resolution_2->Check(pButton == pPage3_Resolution_2);
@@ -1051,14 +1051,14 @@ IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the ValueSet with the bitmap-buttons
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ButtonsHdl, ValueSet*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, ValueSet*, void)
 {
     // if one bitmap-button is chosen, then disable TextOnly
     pPage5_TextOnly->Check(false);
 }
 
 // Fill the SfxItemSet with the settings of the dialog
-IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void)
+IMPL_LINK( SdPublishingDlg, ColorHdl, Button *, pButton, void)
 {
     SvColorDialog aDlg(this);
 
@@ -1099,13 +1099,13 @@ IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void)
     pPage6_Preview->Invalidate();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, SlideChgHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl, Button*, void)
 {
     UpdatePage();
 }
 
 // Clickhandler for the Ok Button
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, FinishHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl, Button*, void)
 {
     //End
     SdPublishingDesign aDesign;
@@ -1352,7 +1352,7 @@ void SdPublishingDlg::LoadPreviewButtons()
 }
 
 // Clickhandler for the Forward Button
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, NextPageHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl, Button*, void)
 {
     aAssistentFunc.NextPage();
     ChangePage();
@@ -1497,7 +1497,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
 }
 
 // Clickhandler for the back Button
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, LastPageHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl, Button*, void)
 {
     aAssistentFunc.PreviousPage();
     ChangePage();
@@ -1641,7 +1641,7 @@ OUString SdDesignNameDlg::GetDesignName()
     return m_pEdit->GetText();
 }
 
-IMPL_LINK_NOARG_TYPED(SdDesignNameDlg, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl, Edit&, void)
 {
     m_pBtnOK->Enable(!m_pEdit->GetText().isEmpty());
 }