summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-07 09:35:04 +0200
committerNoel Grandin <noel@peralex.com>2015-09-08 08:16:46 +0200
commit61623d5b90510ae6c791a41031d586a9316e74c4 (patch)
tree0b5a8115ae6d603cbe6208b958d8b440ea8fd06f /dbaccess
parentd7efea29cdc2faa57d172d7e4d8def18fd49536c (diff)
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx3
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx6
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx6
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx1
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx4
-rw-r--r--dbaccess/source/ui/inc/adtabdlg.hxx2
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx8
9 files changed, 16 insertions, 19 deletions
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index df30a5eef519..ebca1a143ee0 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -440,12 +440,11 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId)
}
-IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
+IMPL_LINK_NOARG_TYPED(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, void)
{
SvTreeListEntry* pEntry = m_aCreation->GetHdlEntry();
if ( pEntry )
m_aHelpText->SetText( ModuleRes( static_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) );
- return 1L;
}
void OTasksWindow::Resize()
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index bf578274c483..ec25f2c0e326 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -117,7 +117,7 @@ namespace dbaui
VclPtr<FixedLine> m_aFL;
VclPtr<OApplicationDetailView> m_pDetailView;
- DECL_LINK( OnEntrySelectHdl, SvTreeListBox* );
+ DECL_LINK_TYPED( OnEntrySelectHdl, SvTreeListBox*, void );
void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 575af56e9b00..8b0e43725597 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -435,10 +435,9 @@ IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl )
return 0L; // not handled
}
-IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl )
+IMPL_LINK_NOARG_TYPED( OAddTableDlg, TableListSelectHdl, SvTreeListBox*, void )
{
m_pAddButton->Enable( m_xCurrentList->isLeafSelected() );
- return 0;
}
IMPL_LINK_NOARG_TYPED( OAddTableDlg, CloseClickHdl, Button*, void )
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 1189f79f9a0c..994fd81eb30b 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -311,7 +311,7 @@ public:
}
protected:
- DECL_LINK(OnExceptionSelected, void*);
+ DECL_LINK_TYPED(OnExceptionSelected, SvTreeListBox*, void);
};
OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions)
@@ -366,7 +366,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti
}
}
-IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected)
+IMPL_LINK_NOARG_TYPED(OExceptionChainDialog, OnExceptionSelected, SvTreeListBox*, void)
{
SvTreeListEntry* pSelected = m_pExceptionList->FirstSelected();
OSL_ENSURE(!pSelected || !m_pExceptionList->NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?");
@@ -401,8 +401,6 @@ IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected)
}
m_pExceptionText->SetText(sText);
-
- return 0L;
}
// SQLMessageBox_Impl
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index f67f8333482a..1cdfa11681a2 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -93,7 +93,7 @@ namespace dbaui
m_pTablesList->Clear();
- m_pTablesList->SetCheckButtonHdl(LINK(this, OTableSubscriptionPage, OnTreeEntryChecked));
+ m_pTablesList->SetCheckButtonHdl(LINK(this, OTableSubscriptionPage, OnTreeEntryButtonChecked));
m_pTablesList->SetCheckHandler(LINK(this, OTableSubscriptionPage, OnTreeEntryChecked));
}
@@ -398,6 +398,10 @@ namespace dbaui
return nResult;
}
+ IMPL_LINK_NOARG_TYPED( OTableSubscriptionPage, OnTreeEntryButtonChecked, SvTreeListBox*, void )
+ {
+ callModifiedHdl();
+ }
IMPL_LINK( OTableSubscriptionPage, OnTreeEntryChecked, Control*, _pControl )
{
return OnControlModified(static_cast<Button*>(_pControl));
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 6913f27224b3..eb56894e750c 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -66,6 +66,7 @@ namespace dbaui
DECL_LINK_TYPED( OnTreeEntryCompare, const SvSortData&, sal_Int32 );
DECL_LINK( OnTreeEntryChecked, Control* );
+ DECL_LINK_TYPED( OnTreeEntryButtonChecked, SvTreeListBox*, void );
private:
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index f4119bed01cd..bcc63c59ac46 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -68,8 +68,8 @@ namespace dbaui
DECL_LINK_TYPED( ButtonClickHdl, Button *, void );
DECL_LINK_TYPED( RightButtonClickHdl, Button *, void );
DECL_LINK_TYPED( AllNoneClickHdl, Button *, void );
- DECL_LINK( TableListClickHdl, void* );
- DECL_LINK( TableListRightSelectHdl, void* );
+ DECL_LINK_TYPED( TableListClickHdl, SvTreeListBox*, void );
+ DECL_LINK_TYPED( TableListRightSelectHdl, SvTreeListBox*, void );
public:
virtual void Reset ( ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 855853bd1d95..e265bbce3674 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -73,7 +73,7 @@ namespace dbaui
DECL_LINK_TYPED( AddClickHdl, Button*, void );
DECL_LINK_TYPED( CloseClickHdl, Button*, void);
DECL_LINK( TableListDoubleClickHdl, void* );
- DECL_LINK( TableListSelectHdl, void* );
+ DECL_LINK_TYPED( TableListSelectHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( OnTypeSelected, Button*, void );
public:
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index f007eda758ff..9fb7ad10ff64 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -254,7 +254,7 @@ IMPL_LINK_TYPED( OWizNameMatching, RightButtonClickHdl, Button *, pButton, void
}
}
-IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl )
+IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListClickHdl, SvTreeListBox*, void )
{
SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected();
if(pEntry)
@@ -284,11 +284,9 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl )
}
}
}
-
- return 0;
}
-IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl )
+IMPL_LINK_NOARG_TYPED( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox*, void )
{
SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected();
if(pEntry)
@@ -318,8 +316,6 @@ IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl )
}
}
}
-
- return 0;
}
IMPL_LINK_TYPED( OWizNameMatching, AllNoneClickHdl, Button *, pButton, void )