Kaydet (Commit) 5ff68447 authored tarafından jan iversen's avatar jan iversen Kaydeden (comit) Norbert Thiebaud

cid#1338242 cid#1338241 removed throw from extern "C" function

Encapsulated throw from C++ to a return false in the "C" function

Change-Id: I2fc89b0dcf434395859300b3d3890247d1288295
Reviewed-on: https://gerrit.libreoffice.org/19872Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst 99e3ab6e
......@@ -1050,10 +1050,16 @@ static bool loadEnv(OUString const & cLibStem,
// late init with some code from matching uno language binding
// will be unloaded by environment
osl::Module aMod;
bool bMod = cppu::detail::loadModule(aMod, cLibStem);
if (!bMod)
try {
bool bMod = cppu::detail::loadModule(aMod, cLibStem);
if (!bMod)
return false;
}
catch(...) {
// Catch everything and convert to return false
return false;
}
uno_initEnvironmentFunc fpInit = reinterpret_cast<uno_initEnvironmentFunc>(aMod.getSymbol(UNO_INIT_ENVIRONMENT));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment