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 /starmath | |
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 'starmath')
-rw-r--r-- | starmath/inc/ElementsDockingWindow.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/dialog.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/edit.hxx | 2 | ||||
-rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 3 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 3 | ||||
-rw-r--r-- | starmath/source/edit.cxx | 3 |
6 files changed, 6 insertions, 9 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 7cf8abb353da..c8ad31788839 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -121,7 +121,7 @@ public: Size GetOptimalSize() const SAL_OVERRIDE; - DECL_LINK( ScrollHdl, void* ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); void DoScroll(long nDelta); boost::signals2::signal< void ( SmElement* ) > selectedSignal; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index ec94f62ce7a5..70b627368501 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -287,7 +287,7 @@ class SmShowSymbolSetWindow : public Control virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); public: SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); virtual ~SmShowSymbolSetWindow(); diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 75d1d34826d8..b69d90af9d83 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -73,7 +73,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; DECL_LINK(EditStatusHdl ,EditStatus *); - DECL_LINK(ScrollHdl, ScrollBar *); + DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); void CreateEditView(); Rectangle AdjustScrollBars(); diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 3c29f5e7c0c4..fbea9403064e 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -441,10 +441,9 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent) } } -IMPL_LINK_NOARG( SmElementsControl, ScrollHdl ) +IMPL_LINK_NOARG_TYPED( SmElementsControl, ScrollHdl, ScrollBar*, void ) { DoScroll(mxScroll->GetDelta()); - return 0; } void SmElementsControl::DoScroll(long nDelta) diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 7fe760c9bb6d..d47bd1229b2d 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1354,10 +1354,9 @@ void SmShowSymbolSetWindow::Resize() calccols(); } -IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/) +IMPL_LINK_TYPED( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void) { Invalidate(); - return 0; } VCL_BUILDER_DECL_FACTORY(SmShowSymbol) diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 53a2b87a99de..983ab9a3d70d 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -581,7 +581,7 @@ IMPL_LINK( SmEditWindow, EditStatusHdl, EditStatus *, /*pStat*/ ) } } -IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/ ) +IMPL_LINK_TYPED( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void ) { OSL_ENSURE(pEditView, "EditView missing"); if (pEditView) @@ -591,7 +591,6 @@ IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/ ) pEditView->GetVisArea().GetSize())); pEditView->Invalidate(); } - return 0; } Rectangle SmEditWindow::AdjustScrollBars() |