Kaydet (Commit) 0cb0c7f0 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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 617479a0.
üst ba796f2c
...@@ -13,32 +13,22 @@ ...@@ -13,32 +13,22 @@
#include <vcl/vclptr.hxx> #include <vcl/vclptr.hxx>
#include <vcl/builder.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) \ #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; \ (void)rMap; \
rRet = VclPtr<typeName>::Create(pParent); \ rRet = VclPtr<typeName>::Create(pParent); \
} }
#define VCL_BUILDER_FACTORY_ARGS(typeName,arg1) \ #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; \ (void)rMap; \
rRet = VclPtr<typeName>::Create(pParent,arg1); \ rRet = VclPtr<typeName>::Create(pParent,arg1); \
} }
#define VCL_BUILDER_FACTORY_CONSTRUCTOR(typeName,arg2) \ #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); \ OUString sBorder = BuilderUtils::extractCustomProperty(rMap); \
WinBits wb = arg2; \ WinBits wb = arg2; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment