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 /unotools | |
| 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 'unotools')
| -rw-r--r-- | unotools/source/config/confignode.cxx | 24 | ||||
| -rw-r--r-- | unotools/source/misc/sharedunocomponent.cxx | 2 |
2 files changed, 5 insertions, 21 deletions
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 59c5fbba8224..7c604d1067dc 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -197,7 +197,7 @@ namespace utl } catch(Exception&) { - OSL_FAIL("OConfigurationNode::getNodeNames: caught a generic exception!"); + TOOLS_WARN_EXCEPTION( "unotools", "OConfigurationNode::getNodeNames"); } } @@ -219,13 +219,9 @@ namespace utl { SAL_WARN( "unotools", "OConfigurationNode::removeNode: there is no element named: " << _rName ); } - catch (WrappedTargetException&) - { - OSL_FAIL("OConfigurationNode::removeNode: caught a WrappedTargetException!"); - } catch(Exception&) { - OSL_FAIL("OConfigurationNode::removeNode: caught a generic exception!"); + TOOLS_WARN_EXCEPTION( "unotools", "OConfigurationNode::removeNode"); } } return false; @@ -311,7 +307,7 @@ namespace utl } catch(Exception&) { - OSL_FAIL("OConfigurationNode::openNode: caught an exception while retrieving the node!"); + TOOLS_WARN_EXCEPTION( "unotools", "OConfigurationNode::openNode: caught an exception while retrieving the node!"); } return OConfigurationNode(); } @@ -398,21 +394,9 @@ namespace utl } } - catch(IllegalArgumentException&) - { - OSL_FAIL("OConfigurationNode::setNodeValue: could not replace the value: caught an IllegalArgumentException!"); - } - catch(NoSuchElementException&) - { - OSL_FAIL("OConfigurationNode::setNodeValue: could not replace the value: caught a NoSuchElementException!"); - } - catch(WrappedTargetException&) - { - OSL_FAIL("OConfigurationNode::setNodeValue: could not replace the value: caught a WrappedTargetException!"); - } catch(Exception&) { - OSL_FAIL("OConfigurationNode::setNodeValue: could not replace the value: caught a generic Exception!"); + TOOLS_WARN_EXCEPTION( "unotools", "OConfigurationNode::setNodeValue: could not replace the value"); } } diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 789054104a31..41a383d1004c 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -133,7 +133,7 @@ namespace utl catch( const CloseVetoException& ) { /* fine */ } catch( const Exception& ) { - OSL_FAIL( "CloseableComponentImpl::nf_closeComponent: caught an unexpected exception!" ); + TOOLS_WARN_EXCEPTION( "unotools", "CloseableComponentImpl::nf_closeComponent: caught an unexpected exception!" ); } // reset |