summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-03-19 21:55:36 -0400
committerPeter Foley <pefoley2@verizon.net>2013-03-21 17:27:00 -0400
commitf294ecbe68f6839c19058dc0063942501ebd67da (patch)
treeb1d12ca3e49d3117185c6a04cabdfa1f98d5203c /idl
parente08159e244916e97b963874944923a79cb9dca2e (diff)
add sw swd msfilter vbahelper to Library_merged
Change-Id: If7fc0b480c58599e86bf3b75080b8b18d5d79488
Diffstat (limited to 'idl')
-rw-r--r--idl/source/objects/types.cxx2
1 files changed, 1 insertions, 1 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()