diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-26 20:45:17 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-26 21:02:38 +0200 |
| commit | 87d7ac7440808f8ed6c9c0f305b1b79f6860d208 (patch) | |
| tree | 9fd29a366ef4756059b29221910ab85e628e57e1 /sfx2 | |
| parent | a75873dea15719b5216cfd0476d30003ffc76e80 (diff) | |
Static linking for iOS effectively means "merged libs"
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 5e7ac142a892..bf4fb27c7119 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -85,7 +85,7 @@ #include <svl/srchitem.hxx> #include <osl/socket.hxx> -#ifdef LIBO_MERGELIBS +#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 #define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl @@ -98,7 +98,7 @@ #define Selection #include "sfxslots.hxx" -#ifdef LIBO_MERGELIBS +#if defined(LIBO_MERGELIBS) || defined(IOS) #undef aSfxBoolItem_Impl #undef aSfxStringItem_Impl #undef aSfxUInt16Item_Impl |