summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-20 14:18:22 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-09-20 14:26:31 +0300
commitb869b73947659c45c1edc5f9cff80bfbe61e52ac (patch)
treed3c21e46b583c895109ff3f76422797dd3d4da81 /idl
parent4b326ea35cb9193dbb530b9445a778d61bf8273d (diff)
Avoid duplicate symbols when DISABLE_DYNLOADING for Android
Change-Id: Iecd0ed802f6cc715ac77256bb4b49082b5976b4f
Diffstat (limited to 'idl')
-rw-r--r--idl/source/objects/types.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 9186857fe81f..e6cc6295832b 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1410,6 +1410,9 @@ void SvMetaType::WriteSfxItem(
// write the implementation part
rOutStm << "#ifdef SFX_TYPEMAP" << endl
+ << "#if defined(DISABLE_DYNLOADING) && defined(ANDROID)" << endl
+ << "__attribute__((__weak__))" << endl
+ << "#endif" << endl
<< aTypeName.getStr() << aVarName.getStr()
<< " = " << endl;
rOutStm << '{' << endl
a href='/cgit/lo/core/commit/xmlreader/source/xmlreader.cxx?h=libreoffice-7.0.4.1&id=f7a75a66fa46627aa6edc6439650c1e3c06836d7'>cleanup: remove unused Reference.h(xx) includesJochen Nitschke 2016-03-31use SAL_N_ELEMENTS in for loopsNoel Grandin 2016-02-15Rename rtl::isValidCodePoint -> rtl::isUnicodeCodePointStephan Bergmann 2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann 2014-06-17improve the inlinesimplememberfunctions clang pluginNoel Grandin 2014-06-05various: remove SAL_THROW macroNoel Grandin 2014-05-23remove boilerplate in UNO Exception constructor callsNoel Grandin 2014-04-30coverity#708727 Uninitialized pointer fieldCaolán McNamara 2014-01-23coverity#1158416 Uninitialized pointer fieldCaolán McNamara 2013-12-06Zip .ui translations per UIConfig target.Matúš Kukan 2013-11-11xmlreader: include <> for external includesNorbert Thiebaud