diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-08-17 17:09:09 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-08-18 17:10:19 +0200 |
commit | 91ba9654baa8d525e31614b03cd459cf7cb1f951 (patch) | |
tree | 81d58fed74cced15b450580fffb507f9e8f1511f /vcl/source/app | |
parent | 9144e8c3f4dd9c0460ea8f258682825688920537 (diff) |
Move tools/diagnose_ex.h to comphelper/diagnose_ex.hxx
...so that its TOOLS_WARN_EXCEPTION can be used in
comphelper/source/misc/logging.cxx in a follow-up commit. (And while at it,
rename from diangose_ex.h to the more appropriate diagnose_ex.hxx. The
comphelper module is sufficiently low-level for this immediate use case, so use
that at least for now; o3tl might be even more suitable but doesn't have a
Library until now. Also, for the immediate use case it would have sufficed to
only break DbgGetCaughtException, exceptionToString, TOOLS_WARN_EXCEPTION,
TOOLS_WARN_EXCEPTION_IF, and TOOLS_INFO_EXCEPTION out of
include/tools/diagnose_ex.h into an additional new
include/comphelper/diagnose_ex.hxx, but its probably easier overall to just move
the complete include file as is.)
Change-Id: I9f3222d4ccf1a9ac29d7eb9ba1530d53e2affaee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138451
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source/app')
-rw-r--r-- | vcl/source/app/help.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/salusereventlist.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/scheduler.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/session.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svdata.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 611bf3422bb2..2f995d0fce9f 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -20,7 +20,7 @@ #include <comphelper/string.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/time.hxx> #include <vcl/window.hxx> diff --git a/vcl/source/app/salusereventlist.cxx b/vcl/source/app/salusereventlist.cxx index 1e3f78cc43bf..c677ff56a411 100644 --- a/vcl/source/app/salusereventlist.cxx +++ b/vcl/source/app/salusereventlist.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/uno/Exception.hpp> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> #include <sal/types.h> #include <svdata.hxx> diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 5da5c2465c60..7db89bcdaf42 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -30,7 +30,7 @@ #include <svdata.hxx> #include <tools/time.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/configmgr.hxx> #include <vcl/TaskStopwatch.hxx> #include <vcl/scheduler.hxx> diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 5fb78dad31f0..9f9313ad6722 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -24,7 +24,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <utility> #include <vcl/svapp.hxx> diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index b56e8c05ec0f..7c9a5378588e 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -21,7 +21,7 @@ #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/resmgr.hxx> #include <sal/log.hxx> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index fe2159767a8c..7c5505f364cb 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -100,7 +100,7 @@ #include <watchdog.hxx> #include <basegfx/utils/systemdependentdata.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #if OSL_DEBUG_LEVEL > 0 #include <typeinfo> |