[Libreoffice-commits] core.git: dbaccess/source
Noel Grandin
noel at peralex.com
Wed Oct 14 23:12:45 PDT 2015
dbaccess/source/ui/dlg/ConnectionPage.cxx | 6 +--
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 40 ++++++++++------------
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 14 +------
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 2 -
dbaccess/source/ui/dlg/adminpages.cxx | 8 ++--
dbaccess/source/ui/dlg/adminpages.hxx | 15 ++------
dbaccess/source/ui/dlg/advancedsettings.cxx | 14 +++----
dbaccess/source/ui/dlg/detailpages.cxx | 24 ++++++-------
dbaccess/source/ui/dlg/tablespage.cxx | 2 -
9 files changed, 55 insertions(+), 70 deletions(-)
New commits:
commit 4b55c28940d741e53648115a9cfb58f2d6db38a5
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 14 16:55:36 2015 +0200
simplify the way we override behaviour here
just send everything via callModifiedHdl()
Change-Id: I011df1d1c376deae962b465e4a27e98af968de6f
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 5d79776..93ac96e 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -101,10 +101,10 @@ namespace dbaui
get(m_pTestConnection, "connectionButton");
m_pConnectionURL->SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified));
- m_pJavaDriver->SetModifyHdl(getControlModifiedLink());
+ m_pJavaDriver->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
m_pJavaDriver->SetModifyHdl(LINK(this, OConnectionTabPage, OnEditModified));
- m_pUserName->SetModifyHdl(getControlModifiedLink());
- m_pPasswordRequired->SetClickHdl(getControlModifiedClickLink());
+ m_pUserName->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
+ m_pPasswordRequired->SetClickHdl(LINK(this, OGenericAdministrationPage, OnControlModifiedClick));
m_pTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
m_pTestJavaDriver->SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 5029c63..0a106c0 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -148,9 +148,9 @@ using namespace ::com::sun::star;
get(m_pFTDefaultPortNumber, "portNumDefLabel");
get(m_pCBUseSSL, "useSSLCheckbutton");
- m_pETHostServer->SetModifyHdl(getControlModifiedLink());
- m_pETBaseDN->SetModifyHdl(getControlModifiedLink());
- m_pNFPortNumber->SetModifyHdl(getControlModifiedLink());
+ m_pETHostServer->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
+ m_pETBaseDN->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
+ m_pNFPortNumber->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
m_pCBUseSSL->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) );
SetRoadmapStateValue(false);
}
@@ -232,12 +232,11 @@ using namespace ::com::sun::star;
callModifiedHdl();
}
- IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/)
+ void OLDAPConnectionPageSetup::callModifiedHdl(void *)
{
bool bRoadmapState = ((!m_pETHostServer->GetText().isEmpty() ) && ( !m_pETBaseDN->GetText().isEmpty() ) && (!m_pFTPortNumber->GetText().isEmpty() ));
SetRoadmapStateValue(bRoadmapState);
- callModifiedHdl();
- return 0L;
+ OGenericAdministrationPage::callModifiedHdl();
}
VclPtr<OMySQLIntroPageSetup> OMySQLIntroPageSetup::CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet )
@@ -322,7 +321,7 @@ using namespace ::com::sun::star;
// MySQLNativeSetupPage
MySQLNativeSetupPage::MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs )
:OGenericAdministrationPage( _pParent, "DBWizMysqlNativePage", "dbaccess/ui/dbwizmysqlnativepage.ui", _rCoreAttrs )
- ,m_aMySQLSettings ( VclPtr<MySQLNativeSettings>::Create(*get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink()) )
+ ,m_aMySQLSettings ( VclPtr<MySQLNativeSettings>::Create(*get<VclVBox>("MySQLSettingsContainer"), LINK(this, OGenericAdministrationPage, OnControlModified)) )
{
get(m_pHelpText, "helptext");
m_aMySQLSettings->Show();
@@ -369,14 +368,14 @@ using namespace ::com::sun::star;
OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue );
- OnModified( NULL );
+ callModifiedHdl();
}
- IMPL_LINK( MySQLNativeSetupPage, OnModified, Edit*, _pEdit )
+ void MySQLNativeSetupPage::callModifiedHdl(void*)
{
SetRoadmapStateValue( m_aMySQLSettings->canAdvance() );
- return OGenericAdministrationPage::getControlModifiedLink().Call( _pEdit );
+ OGenericAdministrationPage::callModifiedHdl();
}
// OMySQLJDBCConnectionPageSetup
@@ -406,11 +405,11 @@ using namespace ::com::sun::star;
//TODO this code snippet is redundant
m_pHeaderText->SetText(ModuleRes(_nHeaderTextResId));
- m_pETDatabasename->SetModifyHdl(getControlModifiedLink());
- m_pETHostname->SetModifyHdl(getControlModifiedLink());
- m_pNFPortNumber->SetModifyHdl(getControlModifiedLink());
+ m_pETDatabasename->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
+ m_pETHostname->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
+ m_pNFPortNumber->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
- m_pETDriverClass->SetModifyHdl(LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified));
+ m_pETDriverClass->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
m_pPBTestJavaDriver->SetClickHdl(LINK(this,OGeneralSpecialJDBCConnectionPageSetup,OnTestJavaClickHdl));
SFX_ITEMSET_GET(_rCoreAttrs, pUrlItem, SfxStringItem, DSID_CONNECTURL, true);
@@ -560,14 +559,13 @@ using namespace ::com::sun::star;
aMsg->Execute();
}
- IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
+ void OGeneralSpecialJDBCConnectionPageSetup::callModifiedHdl(void* pControl)
{
- if ( _pEdit == m_pETDriverClass )
+ if ( pControl == m_pETDriverClass )
m_pPBTestJavaDriver->Enable( !m_pETDriverClass->GetText().trim().isEmpty() );
bool bRoadmapState = ((!m_pETDatabasename->GetText().isEmpty() ) && ( !m_pETHostname->GetText().isEmpty() ) && (!m_pNFPortNumber->GetText().isEmpty() ) && ( !m_pETDriverClass->GetText().trim().isEmpty() ));
SetRoadmapStateValue(bRoadmapState);
- callModifiedHdl();
- return 0L;
+ OGenericAdministrationPage::callModifiedHdl();
}
VclPtr<OGenericAdministrationPage> OJDBCConnectionPageSetup::CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet )
@@ -752,8 +750,8 @@ using namespace ::com::sun::star;
get(m_pETUserName, "generalUserNameEntry");
get(m_pCBPasswordRequired, "passRequiredCheckbutton");
get(m_pPBTestConnection, "testConnectionButton");
- m_pETUserName->SetModifyHdl(getControlModifiedLink());
- m_pCBPasswordRequired->SetClickHdl(getControlModifiedClickLink());
+ m_pETUserName->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
+ m_pCBPasswordRequired->SetClickHdl(LINK(this,OGenericAdministrationPage,OnControlModifiedClick));
m_pPBTestConnection->SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
LayoutHelper::fitSizeRightAligned( *m_pPBTestConnection );
@@ -835,7 +833,7 @@ using namespace ::com::sun::star;
get(m_pFTFinalText, "finishText");
m_pCBOpenAfterwards->SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
- m_pCBStartTableWizard->SetClickHdl(getControlModifiedClickLink());
+ m_pCBStartTableWizard->SetClickHdl(LINK(this,OGenericAdministrationPage,OnControlModifiedClick));
m_pRBRegisterDataSource->SetState(true);
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 0baf12e..b153569 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -86,13 +86,12 @@ namespace dbaui
OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
virtual ~OLDAPConnectionPageSetup();
virtual void dispose() override;
- virtual Link<> getControlModifiedLink() override { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
+ virtual void callModifiedHdl(void* pControl = 0) override;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override;
- DECL_LINK(OnEditModified,Edit*);
private:
VclPtr<FixedText> m_pFTHelpText;
@@ -127,10 +126,7 @@ namespace dbaui
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
- virtual Link<> getControlModifiedLink() override { return LINK( this, MySQLNativeSetupPage, OnModified ); }
-
- private:
- DECL_LINK( OnModified, Edit* );
+ virtual void callModifiedHdl(void* pControl = 0) override;
};
// OGeneralSpecialJDBCConnectionPageSetup
@@ -154,10 +150,9 @@ namespace dbaui
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override;
- virtual Link<> getControlModifiedLink() override { return LINK(this, OGeneralSpecialJDBCConnectionPageSetup, OnEditModified); }
+ virtual void callModifiedHdl(void* pControl = 0) override;
DECL_LINK_TYPED(OnTestJavaClickHdl, Button*, void);
- DECL_LINK(OnEditModified,Edit*);
VclPtr<FixedText> m_pHeaderText;
VclPtr<FixedText> m_pFTHelpText;
VclPtr<FixedText> m_pFTDatabasename;
@@ -282,9 +277,6 @@ namespace dbaui
bool IsTableWizardToBeStarted();
void enableTableWizardCheckBox( bool _bSupportsTableCreation);
- /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
- Link<> getControlModifiedLink() override { return LINK(this, OGenericAdministrationPage, OnControlModified); }
-
DECL_LINK_TYPED(OnOpenSelected, Button*, void);
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index d53091c..75fa11b 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -80,7 +80,7 @@ namespace dbaui
short m_nAvailableSections;
protected:
- void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call(const_cast<OTextConnectionHelper *>(this)); }
+ void callModifiedHdl() const { m_aModifiedHandler.Call(const_cast<OTextConnectionHelper *>(this)); }
Link<> getControlModifiedLink() { return LINK(this, OTextConnectionHelper, OnControlModified); }
DECL_LINK_TYPED(OnSetExtensionHdl,RadioButton&,void);
DECL_LINK(OnControlModified,Control*);
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index aae3d12..8efbeff 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -102,18 +102,18 @@ namespace dbaui
_rReadonly = !_rValid || (pReadonly && pReadonly->GetValue());
}
- IMPL_LINK(OGenericAdministrationPage, OnControlModified, Button*, /*pCtrl*/)
+ IMPL_LINK(OGenericAdministrationPage, OnControlModified, void*, pCtrl)
{
- callModifiedHdl();
+ callModifiedHdl(pCtrl);
return 0;
}
IMPL_LINK_TYPED(OGenericAdministrationPage, OnControlModifiedClick, Button*, pCtrl, void)
{
- getControlModifiedLink().Call(pCtrl);
+ callModifiedHdl(pCtrl);
}
IMPL_LINK_TYPED(OGenericAdministrationPage, ControlModifiedCheckBoxHdl, CheckBox&, rCtrl, void)
{
- getControlModifiedLink().Call(&rCtrl);
+ callModifiedHdl(&rCtrl);
}
bool OGenericAdministrationPage::getSelectedDataSource(OUString& _sReturn, OUString& _sCurr)
{
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index c292821..b1247da 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -136,7 +136,7 @@ namespace dbaui
virtual void ActivatePage() override;
protected:
- void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call(this); }
+ virtual void callModifiedHdl(void* /*pControl*/ = 0) { m_aModifiedHandler.Call(this); }
/// called from within DeactivatePage. The page is allowed to be deactivated if this method returns sal_True
virtual bool prepareLeave() { return true; }
@@ -206,16 +206,11 @@ namespace dbaui
/** This link be used for controls where the tabpage does not need to take any special action when the control
is modified. The implementation just calls callModifiedHdl.
*/
- DECL_LINK(OnControlModified, Button*);
- DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void);
-
- /// may be used in SetXXXHdl calls to controls, is a link to <method>OnControlModified</method>
- virtual Link<> getControlModifiedLink() { return LINK(this, OGenericAdministrationPage, OnControlModified); }
- // calls via getControlModifiedLink()
- Link<Button*,void> getControlModifiedClickLink() { return LINK(this, OGenericAdministrationPage, OnControlModifiedClick); }
- DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void);
- private:
+ DECL_LINK(OnControlModified, void*);
DECL_LINK_TYPED(OnControlModifiedClick, Button*, void);
+ DECL_LINK_TYPED(ControlModifiedCheckBoxHdl, CheckBox&, void);
+
+ DECL_LINK_TYPED(OnTestConnectionClickHdl, Button*, void);
};
// ControlRelation
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 513d939..035bdb8 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -100,7 +100,7 @@ namespace dbaui
if ( rFeatures.has( nItemId ) )
{
get(*setting->ppControl, setting->sControlId);
- (*setting->ppControl)->SetClickHdl( getControlModifiedClickLink() );
+ (*setting->ppControl)->SetClickHdl( LINK(this, OGenericAdministrationPage, OnControlModifiedClick) );
(*setting->ppControl)->Show();
// check whether this must be a tristate check box
@@ -129,16 +129,16 @@ namespace dbaui
{
get(m_pMaxRowScanLabel, "rowsft");
get(m_pMaxRowScan, "rows");
- m_pMaxRowScan->SetModifyHdl(getControlModifiedLink());
+ m_pMaxRowScan->SetModifyHdl(LINK(this, OGenericAdministrationPage, OnControlModified));
m_pMaxRowScan->SetUseThousandSep(false);
m_pMaxRowScanLabel->Show();
m_pMaxRowScan->Show();
}
}
- IMPL_LINK_TYPED(SpecialSettingsPage, BooleanComparisonSelectHdl, ListBox&, rListBox, void)
+ IMPL_LINK_TYPED(SpecialSettingsPage, BooleanComparisonSelectHdl, ListBox&, rControl, void)
{
- getControlModifiedLink().Call(&rListBox);
+ callModifiedHdl(&rControl);
}
SpecialSettingsPage::~SpecialSettingsPage()
@@ -341,9 +341,9 @@ namespace dbaui
get(m_pAutoRetrievingLabel, "queryft");
get(m_pAutoRetrieving, "query");
- m_pAutoRetrievingEnabled->SetClickHdl( getControlModifiedClickLink() );
- m_pAutoIncrement->SetModifyHdl( getControlModifiedLink() );
- m_pAutoRetrieving->SetModifyHdl( getControlModifiedLink() );
+ m_pAutoRetrievingEnabled->SetClickHdl( LINK(this, OGenericAdministrationPage, OnControlModifiedClick) );
+ m_pAutoIncrement->SetModifyHdl( LINK(this, OGenericAdministrationPage, OnControlModified) );
+ m_pAutoRetrieving->SetModifyHdl( LINK(this, OGenericAdministrationPage, OnControlModified) );
m_aControlDependencies.enableOnCheckMark( *m_pAutoRetrievingEnabled,
*m_pAutoIncrementLabel, *m_pAutoIncrement, *m_pAutoRetrievingLabel, *m_pAutoRetrieving );
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index bf8d856..6369172 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -79,7 +79,7 @@ namespace dbaui
m_pOptionsLabel->Show();
m_pOptions = get<Edit>("options");
m_pOptions->Show();
- m_pOptions->SetModifyHdl(getControlModifiedLink());
+ m_pOptions->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
}
if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
@@ -94,9 +94,9 @@ namespace dbaui
}
}
- IMPL_LINK_TYPED(OCommonBehaviourTabPage, CharsetSelectHdl, ListBox&, rListBox, void)
+ IMPL_LINK_NOARG_TYPED(OCommonBehaviourTabPage, CharsetSelectHdl, ListBox&, void)
{
- getControlModifiedLink().Call(&rListBox);
+ callModifiedHdl();
}
OCommonBehaviourTabPage::~OCommonBehaviourTabPage()
@@ -433,7 +433,7 @@ namespace dbaui
}
if ( m_sDefaultJdbcDriverName.getLength() )
{
- m_pEDDriverClass->SetModifyHdl(getControlModifiedLink());
+ m_pEDDriverClass->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
m_pEDDriverClass->SetModifyHdl(LINK(this, OGeneralSpecialJDBCDetailsPage, OnEditModified));
m_pTestJavaDriver->SetClickHdl(LINK(this,OGeneralSpecialJDBCDetailsPage,OnTestJavaClickHdl));
}
@@ -448,9 +448,9 @@ namespace dbaui
m_pFTSocket->Show(bShowSocket && !m_bUseClass);
m_pEDSocket->Show(bShowSocket && !m_bUseClass);
- m_pEDHostname->SetModifyHdl(getControlModifiedLink());
- m_pNFPortNumber->SetModifyHdl(getControlModifiedLink());
- m_pEDSocket->SetModifyHdl(getControlModifiedLink());
+ m_pEDHostname->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
+ m_pNFPortNumber->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
+ m_pEDSocket->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
}
OGeneralSpecialJDBCDetailsPage::~OGeneralSpecialJDBCDetailsPage()
@@ -558,7 +558,7 @@ namespace dbaui
// MySQLNativePage
MySQLNativePage::MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, "MysqlNativePage", "dbaccess/ui/mysqlnativepage.ui", _rCoreAttrs, CBTP_USE_CHARSET )
- ,m_aMySQLSettings ( VclPtr<MySQLNativeSettings>::Create(*get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink()) )
+ ,m_aMySQLSettings ( VclPtr<MySQLNativeSettings>::Create(*get<VclVBox>("MySQLSettingsContainer"), LINK(this,OGenericAdministrationPage,OnControlModified)) )
{
get(m_pSeparator1, "connectionheader");
get(m_pSeparator2, "userheader");
@@ -566,7 +566,7 @@ namespace dbaui
get(m_pUserName, "username");
get(m_pPasswordRequired, "passwordrequired");
- m_pUserName->SetModifyHdl(getControlModifiedLink());
+ m_pUserName->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
m_aMySQLSettings->Show();
}
@@ -666,10 +666,10 @@ namespace dbaui
m_pNFPortNumber->SetUseThousandSep(false);
get(m_pNFRowCount, "LDAPRowCountspinbutton");
- m_pETBaseDN->SetModifyHdl(getControlModifiedLink());
+ m_pETBaseDN->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
m_pCBUseSSL->SetToggleHdl( LINK(this, OGenericAdministrationPage, ControlModifiedCheckBoxHdl) );
- m_pNFPortNumber->SetModifyHdl(getControlModifiedLink());
- m_pNFRowCount->SetModifyHdl(getControlModifiedLink());
+ m_pNFPortNumber->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
+ m_pNFRowCount->SetModifyHdl(LINK(this,OGenericAdministrationPage,OnControlModified));
m_pNFRowCount->SetUseThousandSep(false);
m_iNormalPort = 389;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 1cdfa11..75a51be 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -83,7 +83,7 @@ namespace dbaui
m_pTablesList->set_width_request(56 * m_pTablesList->approximate_char_width());
m_pTablesList->set_height_request(12 * m_pTablesList->GetTextHeight());
- m_pTablesList->SetCheckHandler(getControlModifiedLink());
+ m_pTablesList->SetCheckHandler(LINK(this,OGenericAdministrationPage,OnControlModified));
// initialize the TabListBox
m_pTablesList->SetSelectionMode( MULTIPLE_SELECTION );
More information about the Libreoffice-commits
mailing list