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 /basctl | |
| 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 'basctl')
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 10 |
1 files changed, 10 insertions, 0 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> |