diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-01 14:12:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-01 14:54:22 +0100 |
| commit | da1d5307c3066dea1fbb5ba2483ba88302efe773 (patch) | |
| tree | 356c63dd9fcf967116db0ed315c259aa4d092b59 | |
| parent | e405f496cb199f758a777a3bc7459a0ff80e4619 (diff) | |
use weak attribute for Linux too
Change-Id: If6bad5be57c984930061629077b07eee287202f0
| -rw-r--r-- | idl/source/objects/types.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/typemap.cxx | 46 |
2 files changed, 1 insertions, 47 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 30b945c9abcb..ed58c172f39c 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -252,7 +252,7 @@ void SvMetaType::WriteSfxItem( // write the implementation part rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl; - rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || STATIC_LINKING)" ) << endl; + rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX))) || STATIC_LINKING)" ) << endl; rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl; rOutStm.WriteCharPtr( "#endif" ) << endl; rOutStm.WriteOString( aTypeName ).WriteOString( aVarName ) diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 9d4a7782146e..6a91ddd3c31d 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -103,54 +103,8 @@ #include <svx/AffineMatrixItem.hxx> #include <svx/galleryitem.hxx> -#ifdef DISABLE_DYNLOADING -/* Avoid clash with the ones from svx/source/form/typemap.cxx */ -#define aSfxInt16Item_Impl sd_source_core_typemap_aSfxInt16Item_Impl -#define aSfxInt32Item_Impl sd_source_core_typemap_aSfxInt32Item_Impl -#define aSfxUnoFrameItem_Impl sd_source_core_typemap_aSfxUnoFrameItem_Impl -#define aSvxClipboardFormatItem_Impl sd_source_core_typemap_aSvxClipboardFormatItem_Impl -#define aSvxColorItem_Impl sd_source_core_typemap_aSvxColorItem_Impl -#define aSvxContourItem_Impl sd_source_core_typemap_aSvxContourItem_Impl -#define aSvxCrossedOutItem_Impl sd_source_core_typemap_aSvxCrossedOutItem_Impl -#define aSvxFontHeightItem_Impl sd_source_core_typemap_aSvxFontHeightItem_Impl -#define aSvxFontItem_Impl sd_source_core_typemap_aSvxFontItem_Impl -#define aSvxKerningItem_Impl sd_source_core_typemap_aSvxKerningItem_Impl -#define aSvxLRSpaceItem_Impl sd_source_core_typemap_aSvxLRSpaceItem_Impl -#define aSvxLanguageItem_Impl sd_source_core_typemap_aSvxLanguageItem_Impl -#define aSvxLineSpacingItem_Impl sd_source_core_typemap_aSvxLineSpacingItem_Impl -#define aSvxPostureItem_Impl sd_source_core_typemap_aSvxPostureItem_Impl -#define aSvxShadowedItem_Impl sd_source_core_typemap_aSvxShadowedItem_Impl -#define aSvxTextLineItem_Impl sd_source_core_typemap_aSvxTextLineItem_Impl -#define aSvxULSpaceItem_Impl sd_source_core_typemap_aSvxULSpaceItem_Impl -#define aSvxWeightItem_Impl sd_source_core_typemap_aSvxWeightItem_Impl -#define aSvxSearchItem_Impl sd_source_core_typemap_aSvxSearchItem_Impl -#define aSvxSizeItem_Impl sd_source_core_typemap_aSvxSizeItem_Impl -#endif - #define SFX_TYPEMAP #include "sdslots.hxx" -#ifdef DISABLE_DYNLOADING -#undef aSfxInt16Item_Impl -#undef aSfxInt32Item_Impl -#undef aSfxUnoFrameItem_Impl -#undef aSvxClipboardFormatItem_Impl -#undef aSvxColorItem_Impl -#undef aSvxContourItem_Impl -#undef aSvxCrossedOutItem_Impl -#undef aSvxFontHeightItem_Impl -#undef aSvxFontItem_Impl -#undef aSvxKerningItem_Impl -#undef aSvxLRSpaceItem_Impl -#undef aSvxLanguageItem_Impl -#undef aSvxLineSpacingItem_Impl -#undef aSvxPostureItem_Impl -#undef aSvxShadowedItem_Impl -#undef aSvxTextLineItem_Impl -#undef aSvxULSpaceItem_Impl -#undef aSvxWeightItem_Impl -#undef aSvxSearchItem_Impl -#undef aSvxSizeItem_Impl -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |