diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-18 20:26:44 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-11 10:07:04 +0300 |
| commit | 3851616b3fcfd8dc7043908e650e881c367d064b (patch) | |
| tree | d3a349d2723da13b5b60e41ce9ba2f7a20803c95 /sfx2/source/appl/appbas.cxx | |
| parent | 97f27e2cdadb28dc249806effd33c58811a0ebc2 (diff) | |
More clash avoidance for DISABLE_DYNLOADING in general, not just iOS
Change-Id: I1995d68a654a7eb56a46241ffa8946ce1e52761a
Diffstat (limited to 'sfx2/source/appl/appbas.cxx')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 4eebb21e51d3..d272f5160609 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -76,11 +76,12 @@ #include <svl/srchitem.hxx> #include <osl/socket.hxx> -#if defined(LIBO_MERGELIBS) || defined(IOS) +#if defined(LIBO_MERGELIBS) || defined(DISABLE_DYNLOADING) /* Avoid clash with the ones from svx/source/form/typemap.cxx */ #define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl -#ifdef IOS +#ifdef DISABLE_DYNLOADING #define aSfxInt16Item_Impl sfx2_source_appl_appbas_aSfxInt16Item_Impl +#define aSfxUnoFrameItem_Impl sfx2_source_appl_appbas_aSfxUnoFrameItem_Impl #endif #define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl #define aSfxUInt16Item_Impl sfx2_source_appl_appbas_aSfxUInt16Item_Impl @@ -92,10 +93,11 @@ #define Selection #include "sfxslots.hxx" -#if defined(LIBO_MERGELIBS) || defined(IOS) +#if defined(LIBO_MERGELIBS) || defined(DISABLE_DYNLOADING) #undef aSfxBoolItem_Impl -#ifdef IOS +#ifdef DISABLE_DYNLOADING #undef aSfxInt16Item_Impl +#undef aSfxUnoFrameItem_Impl #endif #undef aSfxStringItem_Impl #undef aSfxUInt16Item_Impl |