summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-09 21:29:05 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-10 11:25:43 +0200
commita5e8f26a9e7d129b64e4427cefafdcf72fa6ad78 (patch)
treefb99da3418d3ac46fa7bed72a81fef8537db586e /extensions
parent5735f58cdc72667e22d8148c8cb09f73b5790f72 (diff)
Replace IMPL_STATIC_LINK[_TYPED] with more useful variants
Change-Id: I1a8a07623c264154451d36b55db1986be4a6f54c
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/bibview.cxx4
-rw-r--r--extensions/source/bibliography/bibview.hxx2
-rw-r--r--extensions/source/bibliography/framectr.cxx4
-rw-r--r--extensions/source/bibliography/framectr.hxx2
4 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index c51b579b283b..58cf4d44e54c 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -174,9 +174,9 @@ namespace bib
mpBibView->Resize();
}
- IMPL_STATIC_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )
+ IMPL_LINK( BibView, CallMappingHdl, BibView*, EMPTYARG )
{
- pThis->m_pDatMan->CreateMappingDialog( pThis );
+ m_pDatMan->CreateMappingDialog( this );
return 0;
}
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index 1f797c6e990f..a27693221b03 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -63,7 +63,7 @@ namespace bib
BibViewFormControlContainer m_aFormControlContainer;
private:
- DECL_STATIC_LINK(BibView, CallMappingHdl, BibView*);
+ DECL_LINK(CallMappingHdl, BibView*);
public:
// Window overridables
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index f317f32457f9..5e97cd464012 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -630,9 +630,9 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
}
}
-IMPL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG( BibFrameController_Impl, DisposeHdl )
{
- pThis->xFrame->dispose();
+ xFrame->dispose();
return 0;
};
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 2ad213beae05..60d7d45222f5 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -69,7 +69,7 @@ friend class BibFrameCtrl_Impl;
BibDataManager* pDatMan;
HdlBibModul pBibMod;
- DECL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void* );
+ DECL_LINK( DisposeHdl, void* );
static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController);
public: