diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-30 14:19:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-12-01 09:28:52 +0100 |
| commit | d6d80c4e1783b4459bd4a8fbcbdfeebe416c1cb5 (patch) | |
| tree | 995c41a30f4224233267a8cfb05da41ae8c10275 /stoc | |
| parent | 102fdc08b86599b9e538d2f38df865d56b3ec63d (diff) | |
OSL_FAIL.*exception -> TOOLS_WARN_EXCEPTION
Change-Id: I6800e23ead2767d245d5da71d2d40e0f8a6d7e1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106859
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/implementationregistration/implreg.cxx | 3 | ||||
| -rw-r--r-- | stoc/source/javavm/javavm.cxx | 8 | ||||
| -rw-r--r-- | stoc/source/servicemanager/servicemanager.cxx | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index d6c80d16b5dc..972b4f9d9b0f 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequence.hxx> #include <rtl/ustring.hxx> +#include <tools/diagnose_ex.h> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -1362,7 +1363,7 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati { // no way to transport the error, as no exception is specified and a runtime // exception is not appropriate. - OSL_FAIL( "InvalidRegistryException during revokeImplementation" ); + TOOLS_WARN_EXCEPTION( "stoc", "InvalidRegistryException during revokeImplementation" ); } } diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 8600a23eb759..bbc962c17466 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -1133,7 +1133,7 @@ JavaVirtualMachine::~JavaVirtualMachine() } catch (css::uno::Exception &) { - OSL_FAIL("com.sun.star.uno.Exception caught"); + TOOLS_WARN_EXCEPTION( "stoc", ""); } if (m_xJavaConfiguration.is()) // We should never get here, but just in case... @@ -1143,7 +1143,7 @@ JavaVirtualMachine::~JavaVirtualMachine() } catch (css::uno::Exception &) { - OSL_FAIL("com.sun.star.uno.Exception caught"); + TOOLS_WARN_EXCEPTION( "stoc", ""); } } @@ -1342,11 +1342,11 @@ void JavaVirtualMachine::setINetSettingsInVM(bool set_reset) } catch (css::uno::RuntimeException &) { - OSL_FAIL("RuntimeException"); + TOOLS_WARN_EXCEPTION( "stoc", ""); } catch (jvmaccess::VirtualMachine::AttachGuard::CreationException &) { - OSL_FAIL("jvmaccess::VirtualMachine::AttachGuard::CreationException"); + TOOLS_WARN_EXCEPTION( "stoc", ""); } } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index ba728ba1fa88..628bdb877b23 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -288,11 +288,11 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt ) } catch( const IllegalArgumentException & ) { - OSL_FAIL( "IllegalArgumentException caught" ); + TOOLS_WARN_EXCEPTION( "stoc", "" ); } catch( const NoSuchElementException & ) { - OSL_FAIL( "NoSuchElementException caught" ); + TOOLS_WARN_EXCEPTION( "stoc", "" ); } } |