From 0cc53919440f150f4bfedb7a5b88cdb0cf3317dc Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 4 Jul 2017 08:12:27 +0200
Subject: loplugin:casttovoid in VCL_BUILDER_DECL_FACTORY

Change-Id: I4b0dd08963cf50daa41901975c6f92fe21db2048
---
 include/vcl/builderfactory.hxx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx
index fbb53cc5f89f..c2bada89ffe2 100644
--- a/include/vcl/builderfactory.hxx
+++ b/include/vcl/builderfactory.hxx
@@ -13,26 +13,22 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/builder.hxx>
 
-#define VCL_BUILDER_DECL_FACTORY(typeName) \
-    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL \
-        make##typeName(VclPtr<vcl::Window> &rRet, VclPtr<vcl::Window> &pParent, VclBuilder::stringmap &rMap)
-
 #define VCL_BUILDER_FACTORY(typeName) \
-    VCL_BUILDER_DECL_FACTORY(typeName) \
+    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
     { \
         (void)rMap; \
         rRet = VclPtr<typeName>::Create(pParent); \
     }
 
 #define VCL_BUILDER_FACTORY_ARGS(typeName,arg1) \
-    VCL_BUILDER_DECL_FACTORY(typeName) \
+    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
     { \
         (void)rMap; \
         rRet = VclPtr<typeName>::Create(pParent,arg1); \
     }
 
 #define VCL_BUILDER_FACTORY_CONSTRUCTOR(typeName,arg2) \
-    VCL_BUILDER_DECL_FACTORY(typeName) \
+    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
     { \
         OUString sBorder = VclBuilder::extractCustomProperty(rMap); \
         WinBits wb = arg2; \
-- 
cgit