diff options
| -rw-r--r-- | idl/source/objects/types.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/appbas.cxx | 23 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
3 files changed, 6 insertions, 25 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index e8de9dab6c20..af582515b614 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1410,7 +1410,7 @@ void SvMetaType::WriteSfxItem( // write the implementation part rOutStm << "#ifdef SFX_TYPEMAP" << endl - << "#if defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))" << endl + << "#if defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS)) || defined(LIBO_MERGELIBS)" << endl << "__attribute__((__weak__))" << endl << "#endif" << endl << aTypeName.getStr() << aVarName.getStr() 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; diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 87470feb98fb..a95db1998d1a 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -46,6 +46,7 @@ gb_MERGEDLIBS := \ i18nutil \ lng \ localebe1 \ + msfilter \ package2 \ sax \ sb \ @@ -57,16 +58,19 @@ gb_MERGEDLIBS := \ svt \ svx \ svxcore \ + sw \ + swd \ tk \ + $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \ ucb1 \ ucpfile1 \ utl \ uui \ + $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ xmlscript \ xo \ -gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) ifeq ($(OS),ANDROID) gb_MERGEDLIBS += \ |