diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-02-09 22:31:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-02-13 17:53:36 +0200 |
| commit | 25f8330004409edf8007df0cc80ef540c03d18da (patch) | |
| tree | cd57dc9c10abd268628a226f2cbaaf8479266a9c /sfx2 | |
| parent | a092057d2b8ff8abd1172b4163979ecf799d5888 (diff) | |
Add fw* and sfx to libmerged
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index c16338bee821..5e7ac142a892 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -85,10 +85,27 @@ #include <svl/srchitem.hxx> #include <osl/socket.hxx> +#ifdef LIBO_MERGELIBS +/* 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 +#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" +#ifdef LIBO_MERGELIBS +#undef aSfxBoolItem_Impl +#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; |