basctl/source/basicide/basidesh.cxx | 10 ++++++++++ sc/source/ui/app/typemap.cxx | 4 ++-- starmath/source/typemap.cxx | 8 ++++++++ 3 files changed, 20 insertions(+), 2 deletions(-)
New commits: commit 8ae20343bba260073d4cee13118f507769fb0060 Author: Caolán McNamara <[email protected]> Date: Sun Dec 18 21:23:50 2016 +0000 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 90e093a..8e7ddc1 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 63f07ff..81f112b 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 aaa5b01..cfe482e 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: */
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
