[Libreoffice-commits] .: Branch 'feature/android' - sfx2/source

[Michael Meeks]

 sfx2/source/appl/appbas.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 202735c33de9342b9477eb13c8523531d20901b3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Mon Feb 27 23:43:18 2012 +0200

    Deduplication of aSfxInt16Item_Impl only for iOS

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 9943157..12ef3f0 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