Kaydet (Commit) f5b57774 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I6f8ffaf59a1b22b66d3b92246384cd3203808bcf
üst 5a915202
......@@ -111,13 +111,12 @@ void ODbTypeWizDialog::dispose()
svt::OWizardMachine::dispose();
}
IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage)
IMPL_LINK_TYPED(ODbTypeWizDialog, OnTypeSelected, OGeneralPage&, _rTabPage, void)
{
m_eType = _pTabPage->GetSelectedType();
m_eType = _rTabPage.GetSelectedType();
const bool bURLRequired = m_pCollection->isConnectionUrlRequired(m_eType);
enableButtons(WizardButtonFlags::NEXT,bURLRequired);
enableButtons(WizardButtonFlags::FINISH,!bURLRequired);
return 1L;
}
WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCurrentState ) const
......
......@@ -278,10 +278,9 @@ void ODbTypeWizDialogSetup::dispose()
svt::RoadmapWizard::dispose();
}
IMPL_LINK(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage*, /*_pTabPage*/)
IMPL_LINK_NOARG_TYPED(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage&, void)
{
activateDatabasePath();
return 1L;
}
void lcl_removeUnused(const ::comphelper::NamedValueCollection& _aOld,const ::comphelper::NamedValueCollection& _aNew,::comphelper::NamedValueCollection& _rDSInfo)
......
......@@ -218,7 +218,7 @@ namespace dbaui
switchMessage(_sURLPrefix);
if ( m_aTypeSelectHandler.IsSet() )
m_aTypeSelectHandler.Call(this);
m_aTypeSelectHandler.Call(*this);
}
void OGeneralPage::implInitControls( const SfxItemSet& _rSet, bool _bSaveValue )
......
......@@ -49,7 +49,7 @@ namespace dbaui
};
SPECIAL_MESSAGE m_eLastMessage;
Link<> m_aTypeSelectHandler; /// to be called if a new type is selected
Link<OGeneralPage&,void> m_aTypeSelectHandler; /// to be called if a new type is selected
bool m_bDisplayingInvalid : 1; /// the currently displayed data source is deleted
bool m_bInitTypeList : 1;
bool approveDatasourceType( const OUString& _sURLPrefix, OUString& _inout_rDisplayName );
......@@ -69,7 +69,7 @@ namespace dbaui
virtual void dispose() SAL_OVERRIDE;
/// set a handler which gets called every time the user selects a new type
void SetTypeSelectHandler( const Link<>& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
void SetTypeSelectHandler( const Link<OGeneralPage&,void>& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
/// get the currently selected datasource type
OUString GetSelectedType() const { return m_eCurrentSelection; }
......
......@@ -119,7 +119,7 @@ protected:
ApplyResult implApplyChanges();
private:
DECL_LINK(OnTypeSelected, OGeneralPage*);
DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void);
};
} // namespace dbaui
......
......@@ -175,7 +175,7 @@ private:
void updateTypeDependentStates();
bool callSaveAsDialog();
bool IsConnectionUrlRequired();
DECL_LINK(OnTypeSelected, OGeneralPage*);
DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void);
DECL_LINK_TYPED(OnChangeCreationMode, OGeneralPageWizard*, void);
DECL_LINK(OnRecentDocumentSelected, OGeneralPageWizard*);
DECL_LINK(OnSingleDocumentChosen, OGeneralPageWizard*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment