From 8ae20343bba260073d4cee13118f507769fb0060 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 sc/source/ui/app/typemap.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sc')

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
-- 
cgit