From 0cb0c7f02b745bc040c19aa26c6139dfc1833210 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 5 Nov 2018 20:45:34 +0200
Subject: Revert "For iOS, do actually export UI builder factory functions"

This doesn't work in a Release build. The functions in question don't
get included in the binary. Will have to use a different approach,
with actual references to the needed functions.

This reverts commit 617479a003b5f3fa876e371fe16d3a5678f2c501.
---
 include/vcl/builderfactory.hxx | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'include/vcl')

diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx
index 1b2d01bd918c..4b8801341f49 100644
--- a/include/vcl/builderfactory.hxx
+++ b/include/vcl/builderfactory.hxx
@@ -13,32 +13,22 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/builder.hxx>
 
-// For iOS, SAL_DLLPUBLIC_EXPORT actually expands to __attribute__
-// ((visibility("hidden"))). (Ditto for other DISABLE_DYNLOADING
-// cases, but let it be as is for them for now.) Undo that trick.
-
-#ifdef IOS
-#define BUILDER_FACTORY_EXPORT __attribute__ ((visibility("default")))
-#else
-#define BUILDER_FACTORY_EXPORT SAL_DLLPUBLIC_EXPORT
-#endif
-
 #define VCL_BUILDER_FACTORY(typeName) \
-    extern "C" BUILDER_FACTORY_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
+    extern "C" SAL_DLLPUBLIC_EXPORT void 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) \
-    extern "C" BUILDER_FACTORY_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
+    extern "C" SAL_DLLPUBLIC_EXPORT void 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) \
-    extern "C" BUILDER_FACTORY_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
+    extern "C" SAL_DLLPUBLIC_EXPORT void make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap & rMap) \
     { \
         OUString sBorder = BuilderUtils::extractCustomProperty(rMap); \
         WinBits wb = arg2; \
-- 
cgit