diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-27 23:43:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-27 23:44:12 +0200 |
| commit | 3eff0e79154d73098f8b1ace1015bdb436f423a8 (patch) | |
| tree | efd27c26e38404a17cab683b2b528bc313c2c216 /sfx2 | |
| parent | 207dbaaf83a9955f0b02978551340080ddac10cc (diff) | |
Deduplication of aSfxInt16Item_Impl only for iOS
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 99431576b7cf..12ef3f0226da 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -88,7 +88,9 @@ #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 IOS #define aSfxInt16Item_Impl sfx2_source_appl_appbas_aSfxInt16Item_Impl +#endif #define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl #define aSfxUInt16Item_Impl sfx2_source_appl_appbas_aSfxUInt16Item_Impl #define aSfxUInt32Item_Impl sfx2_source_appl_appbas_aSfxUInt32Item_Impl @@ -101,7 +103,9 @@ #if defined(LIBO_MERGELIBS) || defined(IOS) #undef aSfxBoolItem_Impl +#ifdef IOS #undef aSfxInt16Item_Impl +#endif #undef aSfxStringItem_Impl #undef aSfxUInt16Item_Impl #undef aSfxUInt32Item_Impl |