From 9ea0390f17d5183471a27cf7666b45abf3f1e8a0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 9 Sep 2015 15:52:39 +0200
Subject: convert Link<> to typed

Change-Id: Iaca21344f6a38f508f79e6d5983e515162a6dca3
---
 test/source/bootstrapfixture.cxx      | 5 ++---
 test/source/vclbootstrapprotector.cxx | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index e9aefb82e9bf..eb50025a9fd1 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -85,12 +85,11 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
 }
 
 struct InitHook {
-    DECL_STATIC_LINK(InitHook, deinitHook, void*);
+    DECL_STATIC_LINK_TYPED(InitHook, deinitHook, LinkParamNone*, void);
 };
 
-IMPL_STATIC_LINK_NOARG(InitHook, deinitHook) {
+IMPL_STATIC_LINK_NOARG_TYPED(InitHook, deinitHook, LinkParamNone*, void) {
     // nothing to do for now
-    return 0;
 }
 
 // this is called from pyuno
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx
index 2aad56303df6..f0c4e92c8e93 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -56,14 +56,15 @@ private:
         SAL_OVERRIDE
     { return functor(); }
 
-    DECL_STATIC_LINK(Protector, deinitHook, void *);
+    DECL_STATIC_LINK_TYPED(Protector, deinitHook, LinkParamNone*, void);
 };
 
 // HACK so that defaultBootstrap_InitialComponentContext (in
 // unobootstrapprotector) is called before InitVCL (above), but component
 // context is disposed (redundantly again in unobootstrapprotector) from within
 // DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx):
-IMPL_STATIC_LINK_NOARG(Protector, deinitHook) {
+IMPL_STATIC_LINK_NOARG_TYPED(Protector, deinitHook, LinkParamNone*, void)
+{
     css::uno::Reference<css::uno::XComponentContext> context;
     try {
         context = comphelper::getProcessComponentContext();
@@ -82,7 +83,6 @@ IMPL_STATIC_LINK_NOARG(Protector, deinitHook) {
             context, css::uno::UNO_QUERY_THROW)->dispose();
         comphelper::setProcessServiceFactory(0);
     }
-    return 0;
 }
 
 }
-- 
cgit