diff options
| -rw-r--r-- | dbaccess/source/ui/inc/WCopyTable.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WCopyTable.cxx | 3 | ||||
| -rw-r--r-- | include/svtools/wizdlg.hxx | 19 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizdlg.cxx | 5 |
4 files changed, 12 insertions, 17 deletions
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 711d9c145124..b5db8375115a 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/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, diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 1baf3a9b1fab..8ab22d6d4fa2 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/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() diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 6ae5c03773f0..984ec15858eb 100644 --- a/include/svtools/wizdlg.hxx +++ b/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 diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index b35b901e462a..185725bcda3b 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/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; } |