diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 11:10:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-04 06:31:30 +0000 |
| commit | 4ea70f87f7a2b61eda6e5ab1f48debf6fcfadc1f (patch) | |
| tree | 83ba4d72bdf86a5fa252b14d32345fdf91fffe09 /dbaccess | |
| parent | 5338d2abe4078626d2cfa38cde99dfa1d4eb2f6b (diff) | |
convert Link<> to typed
Change-Id: I2136c3db2742afcb4722f69297276bea1e0119f4
Reviewed-on: https://gerrit.libreoffice.org/18306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 3 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/FieldDescControl.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/JoinTableView.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/JoinTableView.cxx | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index d2a95d8d6fb3..92cde5ca0261 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -242,10 +242,9 @@ void OFieldDescControl::Init() ::dbaui::setEvalDateFormatForFormatter(xFormatter); } -IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/) +IMPL_LINK_TYPED(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/, void) { ScrollAllAggregates(); - return 0; } namespace diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index e0c00701a589..791bcb4f7f9b 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -114,7 +114,7 @@ namespace dbaui OFieldDescription* pActFieldDescr; - DECL_LINK( OnScroll, ScrollBar*); + DECL_LINK_TYPED( OnScroll, ScrollBar*, void); DECL_LINK_TYPED( FormatClickHdl, Button *, void ); DECL_LINK( ChangeHdl, ListBox * ); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 09df160ab198..c80c2331f490 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -127,7 +127,7 @@ namespace dbaui // own methods ScrollBar& GetHScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetHScrollBar(); } ScrollBar& GetVScrollBar() { return static_cast<OScrollWindowHelper*>(GetParent())->GetVScrollBar(); } - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); void DrawConnections(vcl::RenderContext& rRenderContext, const Rectangle& rRect); void InvalidateConnections(); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 4de43b5c65e1..51e837419ebc 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -201,12 +201,10 @@ void OJoinTableView::dispose() vcl::Window::dispose(); } -IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar ) +IMPL_LINK_TYPED( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar, void ) { // move all windows ScrollPane( pScrollBar->GetDelta(), (pScrollBar == &GetHScrollBar()), false ); - - return 0; } void OJoinTableView::Resize() |