From f294ecbe68f6839c19058dc0063942501ebd67da Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Tue, 19 Mar 2013 21:55:36 -0400 Subject: add sw swd msfilter vbahelper to Library_merged Change-Id: If7fc0b480c58599e86bf3b75080b8b18d5d79488 --- sfx2/source/appl/appbas.cxx | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'sfx2') diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 4eebb21e51d3..16ae3c4717ca 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -76,33 +76,10 @@ #include #include -#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 -#define aSfxVoidItem_Impl sfx2_source_appl_appbas_aSfxVoidtem_Impl -#endif - #define SFX_TYPEMAP #define Selection #include "sfxslots.hxx" -#if defined(LIBO_MERGELIBS) || defined(IOS) -#undef aSfxBoolItem_Impl -#ifdef IOS -#undef aSfxInt16Item_Impl -#endif -#undef aSfxStringItem_Impl -#undef aSfxUInt16Item_Impl -#undef aSfxUInt32Item_Impl -#undef aSfxVoidItem_Impl -#endif - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; -- cgit