diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-19 21:55:36 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-21 17:27:00 -0400 |
| commit | f294ecbe68f6839c19058dc0063942501ebd67da (patch) | |
| tree | b1d12ca3e49d3117185c6a04cabdfa1f98d5203c /sfx2 | |
| parent | e08159e244916e97b963874944923a79cb9dca2e (diff) | |
add sw swd msfilter vbahelper to Library_merged
Change-Id: If7fc0b480c58599e86bf3b75080b8b18d5d79488
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 23 |
1 files changed, 0 insertions, 23 deletions
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 <svl/srchitem.hxx> #include <osl/socket.hxx> -#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; |