convert Link<> to typed

Change-Id: Ia520982b6764994fc4ab02cb12d1bd051e37883a

dbaccess/source/ui/inc/WCopyTable.hxx

@@ -282,7 +282,7 @@ namespace dbaui
         DECL_LINK_TYPED( ImplPrevHdl, Button*, void );
         DECL_LINK_TYPED( ImplNextHdl, Button*, void);
         DECL_LINK_TYPED( ImplOKHdl, Button*, void );
-        DECL_LINK( ImplActivateHdl, void* );
+        DECL_LINK_TYPED( ImplActivateHdl, WizardDialog*, void );
         bool CheckColumns(sal_Int32& _rnBreakPos);
         void loadData( const ICopyTableSourceObject& _rSourceObject,
                        ODatabaseExport::TColumns& _rColumns,

dbaccess/source/ui/misc/WCopyTable.cxx

@@ -937,7 +937,7 @@ void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rS
         pSettingsPage->setCreatePrimaryKey( _bDoCreate, _rSuggestedName );
 }
 
-IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl)
+IMPL_LINK_NOARG_TYPED(OCopyTableWizard, ImplActivateHdl, WizardDialog*, void)
 {
     OWizardPage* pCurrent = static_cast<OWizardPage*>(GetPage(GetCurLevel()));
     if(pCurrent)
@@ -952,7 +952,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl)
 
         Invalidate();
     }
-    return 0;
 }
 
 void OCopyTableWizard::CheckButtons()

include/svtools/wizdlg.hxx

@@ -198,20 +198,19 @@ IMPL_LINK( MyWizardDlg, ImplNextHdl, PushButton*, pBtn )
 class SVT_DLLPUBLIC WizardDialog : public ModalDialog
 {
 private:
-    Idle               maWizardLayoutIdle;
-    Size                maPageSize;
-    ImplWizPageData*    mpFirstPage;
-    ImplWizButtonData*  mpFirstBtn;
+    Idle                    maWizardLayoutIdle;
+    Size                    maPageSize;
+    ImplWizPageData*        mpFirstPage;
+    ImplWizButtonData*      mpFirstBtn;
     VclPtr<TabPage>         mpCurTabPage;
     VclPtr<PushButton>      mpPrevBtn;
     VclPtr<PushButton>      mpNextBtn;
     VclPtr<vcl::Window>     mpViewWindow;
     sal_uInt16              mnCurLevel;
-    WindowAlign         meViewAlign;
-    Link<>              maActivateHdl;
-    Link<>              maDeactivateHdl;
-    sal_Int16           mnLeftAlignCount;
-    bool                mbEmptyViewMargin;
+    WindowAlign             meViewAlign;
+    Link<WizardDialog*,void>  maActivateHdl;
+    sal_Int16               mnLeftAlignCount;
+    bool                    mbEmptyViewMargin;
 
     DECL_DLLPRIVATE_LINK_TYPED( ImplHandleWizardLayoutTimerHdl, Idle*, void );
     bool hasWizardPendingLayout() const;
@@ -276,7 +275,7 @@ public:
     void                SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
     const Size&         GetPageSizePixel() const { return maPageSize; }
 
-    void                SetActivatePageHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+    void                SetActivatePageHdl( const Link<WizardDialog*,void>& rLink ) { maActivateHdl = rLink; }
 };
 
 #endif // INCLUDED_SVTOOLS_WIZDLG_HXX

svtools/source/dialogs/wizdlg.cxx

@@ -492,10 +492,7 @@ void WizardDialog::ActivatePage()
 
 bool WizardDialog::DeactivatePage()
 {
-    if ( maDeactivateHdl.IsSet() )
-        return maDeactivateHdl.Call( this );
-    else
-        return true;
+    return true;
 }