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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx | 5 | ||||
| -rw-r--r-- | vcl/win/dtrans/WinClipboard.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/dtrans/XNotifyingDataObject.cxx | 3 | ||||
| -rw-r--r-- | vcl/win/dtrans/source.cxx | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx index 2442e6ab665d..cbce84b09fd1 100644 --- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx +++ b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx @@ -43,6 +43,7 @@ #include <rtl/strbuf.hxx> #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #include "atkwrapper.hxx" #include "atkregistry.hxx" @@ -414,7 +415,7 @@ wrapper_get_n_children( AtkObject *atk_obj ) n = obj->mpContext->getAccessibleChildCount(); } catch(const uno::Exception&) { - OSL_FAIL("Exception in getAccessibleChildCount()" ); + TOOLS_WARN_EXCEPTION( "vcl", "Exception" ); } } @@ -446,7 +447,7 @@ wrapper_ref_child( AtkObject *atk_obj, child = atk_object_wrapper_ref( xAccessible ); } catch(const uno::Exception&) { - OSL_FAIL("Exception in getAccessibleChild"); + TOOLS_WARN_EXCEPTION( "vcl", "getAccessibleChild"); } } diff --git a/vcl/win/dtrans/WinClipboard.cxx b/vcl/win/dtrans/WinClipboard.cxx index f553ba3dd34e..f50c1810f4ea 100644 --- a/vcl/win/dtrans/WinClipboard.cxx +++ b/vcl/win/dtrans/WinClipboard.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #include <com/sun/star/datatransfer/clipboard/ClipboardEvent.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -268,7 +269,7 @@ void CWinClipboard::notifyAllClipboardListener() } catch (uno::RuntimeException&) { - OSL_FAIL("RuntimeException caught"); + TOOLS_WARN_EXCEPTION("vcl", ""); } } } diff --git a/vcl/win/dtrans/XNotifyingDataObject.cxx b/vcl/win/dtrans/XNotifyingDataObject.cxx index a989b47e938d..e791f5cd97d0 100644 --- a/vcl/win/dtrans/XNotifyingDataObject.cxx +++ b/vcl/win/dtrans/XNotifyingDataObject.cxx @@ -18,6 +18,7 @@ */ #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #include "XNotifyingDataObject.hxx" #include "WinClipboard.hxx" @@ -141,7 +142,7 @@ void CXNotifyingDataObject::lostOwnership( ) } catch(RuntimeException&) { - OSL_FAIL( "RuntimeException caught" ); + TOOLS_WARN_EXCEPTION( "vcl", "" ); } } diff --git a/vcl/win/dtrans/source.cxx b/vcl/win/dtrans/source.cxx index 1e76dc2250f5..81275560a806 100644 --- a/vcl/win/dtrans/source.cxx +++ b/vcl/win/dtrans/source.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/awt/MouseEvent.hpp> #include <cppuhelper/supportsservice.hxx> #include <o3tl/any.hxx> +#include <tools/diagnose_ex.h> #include <process.h> #include <memory> @@ -181,7 +182,7 @@ void SAL_CALL DragSource::startDrag( } catch(RuntimeException&) { - OSL_FAIL("Runtime exception during event dispatching"); + TOOLS_WARN_EXCEPTION( "vcl", "Runtime exception during event dispatching"); } } } |