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 /sc | |
| 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>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/typemap.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 |