diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-18 21:23:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-19 08:53:21 +0000 |
| commit | 8ae20343bba260073d4cee13118f507769fb0060 (patch) | |
| tree | fbb71da34f408ce1a10de2e3e5ed47ef05ea892e | |
| parent | b8fa395288a1f3a24a4fca392afdf3a9b58373ea (diff) | |
make IOS hack a DISABLE_DYNLOADING hack and extend for basctl+starmath
Change-Id: I07057dec477051ddc96600f467ffbb0c8bd1da5f
Reviewed-on: https://gerrit.libreoffice.org/32144
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/app/typemap.cxx | 4 | ||||
| -rw-r--r-- | starmath/source/typemap.cxx | 8 |
3 files changed, 20 insertions, 2 deletions
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 <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> diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 63f07ffe8e82..81f112bd0f0c 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/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 diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index aaa5b01358b7..cfe482ec4de9 100644 --- a/starmath/source/typemap.cxx +++ b/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: */ |