diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-09 21:29:29 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 11:25:44 +0200 |
commit | eb63709c2bc678d137167697004209a949fa7493 (patch) | |
tree | 2ce58db9f655861db0df20dce97e20b3ca5cc76a | |
parent | 39707f9448d65ba14e04fc9377f87086dab58e89 (diff) |
Replace IMPL_STATIC_LINK[_TYPED] with more useful variants
Change-Id: I356c56f5025b1cef4861bb6208ef4f0b04ddf605
-rw-r--r-- | sc/source/ui/inc/content.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/navipi/content.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 11ff60501331..a801a97f9d16 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -103,7 +103,7 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); DECL_LINK( ContentDoubleClickHdl, void* ); - DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* ); + DECL_LINK( ExecDragHdl, void* ); public: SvTreeListEntry* pTmpEntry; bool m_bFirstPaint; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 4b8149cf555d..2e131c804bb4 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1447,12 +1447,12 @@ void ScContentTree::DoDrag() delete pDocLoader; // falls Dokument zum Draggen geladen wurde } -IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScContentTree, ExecDragHdl) { // als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch der // Navigator geloescht werden darf - pThis->DoDrag(); + DoDrag(); return 0; } diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index d4adc42769e9..07ce02a88e5d 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -927,10 +927,8 @@ void ScPreview::StaticInvalidate() rBindings.Invalidate(SID_ATTR_ZOOMSLIDER); } -IMPL_STATIC_LINK( ScPreview, InvalidateHdl, void*, EMPTYARG ) +IMPL_STATIC_LINK_NOINSTANCE_NOARG( ScPreview, InvalidateHdl ) { - (void)pThis; // avoid warning - StaticInvalidate(); return 0; } |