From 2a4ccc0c1e836fb7cde991c1233ca5a63599ec8b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 11 Sep 2015 13:27:40 +0200 Subject: convert Link<> to typed Change-Id: I1c501671d72edd5b998e80c7fa1e91dbeb507af8 --- dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4 ++-- dbaccess/source/ui/dlg/adminpages.cxx | 4 ++++ dbaccess/source/ui/dlg/adminpages.hxx | 1 + dbaccess/source/ui/dlg/detailpages.cxx | 6 +++--- dbaccess/source/ui/querydesign/querydlg.cxx | 8 +++----- dbaccess/source/ui/querydesign/querydlg.hxx | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index b8e744cbb373..5284f1c3e543 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -151,7 +151,7 @@ using namespace ::com::sun::star; m_pETHostServer->SetModifyHdl(getControlModifiedLink()); m_pETBaseDN->SetModifyHdl(getControlModifiedLink()); m_pNFPortNumber->SetModifyHdl(getControlModifiedLink()); - m_pCBUseSSL->SetToggleHdl(getControlModifiedLink()); + m_pCBUseSSL->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) ); SetRoadmapStateValue(false); } @@ -701,7 +701,7 @@ using namespace ::com::sun::star; :OConnectionTabPageSetup(pParent, "DBWizSpreadsheetPage", "dbaccess/ui/dbwizspreadsheetpage.ui", _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH) { get(m_pPasswordrequired, "passwordrequired"); - m_pPasswordrequired->SetToggleHdl(getControlModifiedLink()); + m_pPasswordrequired->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) ); } OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup() diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 82b68b3633e2..aae3d1272fe3 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -111,6 +111,10 @@ namespace dbaui { getControlModifiedLink().Call(pCtrl); } + IMPL_LINK_TYPED(OGenericAdministrationPage, ControlModifiedCheckBoxHdl, CheckBox&, rCtrl, void) + { + getControlModifiedLink().Call(&rCtrl); + } bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString& _sCurr) { // collect all ODBC data source names diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 552857c1e9cc..f046c46e2f1f 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -213,6 +213,7 @@ namespace dbaui virtual Link<> getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); } // calls via getControlModifiedLink() Link getControlModifiedClickLink() { return LINK(this, OGenericAdministrationPage, OnControlModifiedClick); } + DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void); private: DECL_LINK_TYPED(OnControlModifiedClick, Button*, void); }; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index d51829ca1655..00f6027d2d09 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -275,7 +275,7 @@ namespace dbaui :OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS) { get(m_pUseCatalog, "useCatalogCheckbutton"); - m_pUseCatalog->SetToggleHdl(getControlModifiedLink()); + m_pUseCatalog->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) ); } OOdbcDetailsPage::~OOdbcDetailsPage() @@ -324,7 +324,7 @@ namespace dbaui get(m_pNFPortNumber, "portnumber"); m_pNFPortNumber->SetUseThousandSep(false); get(m_pUseCatalog, "usecatalog"); - m_pUseCatalog->SetToggleHdl(getControlModifiedLink()); + m_pUseCatalog->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) ); } OUserDriverDetailsPage::~OUserDriverDetailsPage() @@ -662,7 +662,7 @@ namespace dbaui get(m_pNFRowCount, "LDAPRowCountspinbutton"); m_pETBaseDN->SetModifyHdl(getControlModifiedLink()); - m_pCBUseSSL->SetToggleHdl(getControlModifiedLink()); + m_pCBUseSSL->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) ); m_pNFPortNumber->SetModifyHdl(getControlModifiedLink()); m_pNFRowCount->SetModifyHdl(getControlModifiedLink()); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index e0a903888cb6..ebb3188f6c7d 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -219,7 +219,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) if ( eJoinType != CROSS_JOIN ) { m_pTableControl->NotifyCellChange(); - NaturalToggleHdl(m_pCBNatural); + NaturalToggleHdl(*m_pCBNatural); } m_pTableControl->Invalidate(); @@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, OKClickHdl, Button*, void ) EndDialog(RET_OK); } -IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) +IMPL_LINK_NOARG_TYPED( DlgQryJoin, NaturalToggleHdl, CheckBox&, void ) { bool bChecked = m_pCBNatural->IsChecked(); static_cast(m_pConnData.get())->setNatural(bChecked); @@ -275,8 +275,6 @@ IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ ) m_pTableControl->NotifyCellChange(); m_pTableControl->Invalidate(); } - - return 1; } TTableConnectionData::value_type DlgQryJoin::getConnectionData() const @@ -293,7 +291,7 @@ void DlgQryJoin::notifyConnectionChange( ) { setJoinType( static_cast(m_pConnData.get())->GetJoinType() ); m_pCBNatural->Check(static_cast(m_pConnData.get())->isNatural()); - NaturalToggleHdl(m_pCBNatural); + NaturalToggleHdl(*m_pCBNatural); } void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index c90d13b812d6..feca1afc0ed9 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -56,7 +56,7 @@ namespace dbaui DECL_LINK_TYPED( OKClickHdl, Button*, void ); DECL_LINK( LBChangeHdl, ListBox* ); - DECL_LINK( NaturalToggleHdl, CheckBox* ); + DECL_LINK_TYPED( NaturalToggleHdl, CheckBox&, void ); /** setJoinType enables and set the new join type @param _eNewJoinType the new jointype -- cgit