diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-11-05 20:45:34 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-05 21:54:20 +0200 |
| commit | 0cb0c7f02b745bc040c19aa26c6139dfc1833210 (patch) | |
| tree | 9970c889d9e301f497c23420712631aa87fa50db /include/vcl | |
| parent | ba796f2cddb8e63e1ec99e5c32b71d86fdf8e7d6 (diff) | |
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.
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/builderfactory.hxx | 16 |
1 files changed, 3 insertions, 13 deletions
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; \ |