summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorjan iversen <jani@documentfoundation.org>2015-11-09 19:30:30 +0100
committerNorbert Thiebaud <nthiebaud@gmail.com>2015-11-10 07:21:43 +0000
commit6a2440ea91bb86cba74ecbb8afd520c8afa41ded (patch)
tree6d8ae3ad37ff5e561f2d646bec737c5011c0113c /cppu
parent5ff684477d7cb67a52223d555ae5f1341c6f8517 (diff)
cid#1338241 removed throw from C function.
Lower level C++ make a throw, this cannot be passed back in a C function. Change-Id: I54ace0284d0291d54f53b8947e9f4ffc2e0a56ab Reviewed-on: https://gerrit.libreoffice.org/19873 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/uno/lbmap.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 51e1c26dc617..82060fd72b01 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -350,7 +350,14 @@ static inline bool loadModule(osl::Module & rModule, const OUString & rBridgeNam
if (!bNeg)
{
- bool bModule = cppu::detail::loadModule(rModule, rBridgeName);
+ bool bModule;
+ try {
+ bModule = cppu::detail::loadModule(rModule, rBridgeName);
+ }
+ catch(...) {
+ // convert throw to return false
+ bModule = false;
+ }
if (bModule)
return true;