diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-19 12:59:43 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-10-11 10:07:05 +0300 |
| commit | b62bead21d0c956a7da239931069b7e972bfbaf1 (patch) | |
| tree | 89608a4de3833c4cf5ad755f745fda691e1280ba /sfx2/source/appl/appbas.cxx | |
| parent | 3851616b3fcfd8dc7043908e650e881c367d064b (diff) | |
Revert "More clash avoidance for DISABLE_DYNLOADING in general, not just iOS"
Not needed after all, at least for DISABLE_DYNLOADING on Android,
instead let's use the weak attribute for the problematic data.
This reverts commit 769f3957c5c72f2952d6b8d0d1d811a6b19226ad.
Diffstat (limited to 'sfx2/source/appl/appbas.cxx')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index d272f5160609..4eebb21e51d3 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -76,12 +76,11 @@ #include <svl/srchitem.hxx> #include <osl/socket.hxx> -#if defined(LIBO_MERGELIBS) || defined(DISABLE_DYNLOADING) +#if defined(LIBO_MERGELIBS) || defined(IOS) /* Avoid clash with the ones from svx/source/form/typemap.cxx */ #define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl -#ifdef DISABLE_DYNLOADING +#ifdef IOS #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 @@ -93,11 +92,10 @@ #define Selection #include "sfxslots.hxx" -#if defined(LIBO_MERGELIBS) || defined(DISABLE_DYNLOADING) +#if defined(LIBO_MERGELIBS) || defined(IOS) #undef aSfxBoolItem_Impl -#ifdef DISABLE_DYNLOADING +#ifdef IOS #undef aSfxInt16Item_Impl -#undef aSfxUnoFrameItem_Impl #endif #undef aSfxStringItem_Impl #undef aSfxUInt16Item_Impl |