make IOS hack a DISABLE_DYNLOADING hack and extend for basctl+starmath

Change-Id: I07057dec477051ddc96600f467ffbb0c8bd1da5f
Reviewed-on: https://gerrit.libreoffice.org/32144Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

basctl/source/basicide/basidesh.cxx

@@ -39,10 +39,20 @@
 #include <svl/aeitem.hxx>
 #include <svl/srchitem.hxx>
 
+#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 <idetemp.hxx>
 #include <basslots.hxx>
+
+#ifdef DISABLE_DYNLOADING
+#undef aSfxDocumentInfoItem_Impl
+#endif
+
 #include <iderdll.hxx>
 #include <svx/pszctrl.hxx>
 #include <svx/insctrl.hxx>

sc/source/ui/app/typemap.cxx

@@ -102,7 +102,7 @@
 #define SvxDrawAlignItem            SfxAllEnumItem
 #define avmedia_MediaItem           ::avmedia::MediaItem
 
-#if defined(IOS)
+#ifdef DISABLE_DYNLOADING
 /* Avoid clash with the ones from svx/source/form/typemap.cxx */
 #define aSfxBoolItem_Impl sc_source_ui_appl_typemap_aSfxBoolItem_Impl
 #define aSfxInt32Item_Impl sc_source_ui_appl_typemap_aSfxInt32Item_Impl
@@ -128,7 +128,7 @@
 #define SFX_TYPEMAP
 #include "scslots.hxx"
 
-#if defined(IOS)
+#ifdef DISABLE_DYNLOADING
 #undef aSfxBoolItem_Impl
 #undef aSfxInt32Item_Impl
 #undef aSfxObjectItem_Impl

starmath/source/typemap.cxx

@@ -27,8 +27,16 @@
 #include <svx/svxids.hrc>
 #include <svl/slstitm.hxx>
 
+#ifdef DISABLE_DYNLOADING
+/* Avoid clash with the ones from svx/source/form/typemap.cxx */
+#define aSfxInt16Item_Impl starmath_source_appl_typemap_aSfxInt16Item_Impl
+#endif
+
 #define SFX_TYPEMAP
 #include "smslots.hxx"
 
+#ifdef DISABLE_DYNLOADING
+#undef aSfxInt16Item_Impl
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */