From 8ae20343bba260073d4cee13118f507769fb0060 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 18 Dec 2016 21:23:50 +0000 Subject: make IOS hack a DISABLE_DYNLOADING hack and extend for basctl+starmath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I07057dec477051ddc96600f467ffbb0c8bd1da5f Reviewed-on: https://gerrit.libreoffice.org/32144 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/basicide/basidesh.cxx | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'basctl') diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 90e093ae885e..8e7ddc17e9b4 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -39,10 +39,20 @@ #include #include +#ifdef DISABLE_DYNLOADING +/* Avoid clash with the ones from svx/source/form/typemap.cxx */ +#define aSfxDocumentInfoItem_Impl basctl_source_basicide_basidesh_aSfxDocumentInfoItem_Impl +#endif + #define basctl_Shell #define SFX_TYPEMAP #include #include + +#ifdef DISABLE_DYNLOADING +#undef aSfxDocumentInfoItem_Impl +#endif + #include #include #include -- cgit