include/vcl/builderfactory.hxx | 16 +++-------------
svx/source/dialog/langbox.cxx | 4 ++--
2 files changed, 5 insertions(+), 15 deletions(-)
New commits:
commit eaa09946c71f8112586afd0248297a797008dc56
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Mon Nov 5 22:04:12 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Tue Nov 6 11:50:15 2018 +0100
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.
Also revert "Use BUILDER_FACTORY_EXPORT instead of SAL_DLLPUBLIC_EXPORT"
This reverts commit 6e9ca7c925671165057743cfdc73272afeffe7ab.
This reverts commit 911742479eb5e8e406808f615697fea7caf82479.
Change-Id: Iae26d0aac2ea14400725cc330a339c3a9499d85c
Reviewed-on: https://gerrit.libreoffice.org/62941
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx
index 69a7a6b12796..8014832b3ac2 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 SAL_CALL
make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap) \
+ 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) \
- extern "C" BUILDER_FACTORY_EXPORT void SAL_CALL
make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap) \
+ 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) \
- extern "C" BUILDER_FACTORY_EXPORT void SAL_CALL
make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap) \
+ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
make##typeName(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap) \
{ \
OUString sBorder = BuilderUtils::extractCustomProperty(rMap); \
WinBits wb = arg2; \
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 371c55e99003..a50adec606d8 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -110,7 +110,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > &
rLangSeq, sal_Int16 nL
return i >= 0 && i < nLen;
}
-extern "C" BUILDER_FACTORY_EXPORT void SAL_CALL
makeSvxLanguageBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
makeSvxLanguageBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent,
VclBuilder::stringmap & rMap)
{
WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
bool bDropdown = BuilderUtils::extractDropdown(rMap);
@@ -123,7 +123,7 @@ extern "C" BUILDER_FACTORY_EXPORT void SAL_CALL
makeSvxLanguageBox(VclPtr<vcl::W
rRet = pLanguageBox;
}
-extern "C" BUILDER_FACTORY_EXPORT void SAL_CALL
makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
makeSvxLanguageComboBox(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> &
pParent, VclBuilder::stringmap & rMap)
{
WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
bool bDropdown = BuilderUtils::extractDropdown(rMap);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
