[Libreoffice-commits] .: 2 commits - sfx2/source

[Tor Lillqvist]

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

New commits:
commit 42b11e861a6eb4fef43225259c300f87b8d1a625
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Feb 26 20:47:03 2012 +0200

    aSfxInt16Item_Impl, too

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index bf4fb27..9943157 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -88,6 +88,7 @@
 #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 aSfxInt16Item_Impl sfx2_source_appl_appbas_aSfxInt16Item_Impl
 #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
@@ -100,6 +101,7 @@
 
 #if defined(LIBO_MERGELIBS) || defined(IOS)
 #undef aSfxBoolItem_Impl
+#undef aSfxInt16Item_Impl
 #undef aSfxStringItem_Impl
 #undef aSfxUInt16Item_Impl
 #undef aSfxUInt32Item_Impl
commit 87d7ac7440808f8ed6c9c0f305b1b79f6860d208
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Feb 26 20:45:17 2012 +0200

    Static linking for iOS effectively means "merged libs"

diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 5e7ac14..bf4fb27 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