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/workben | |
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/workben')
-rw-r--r-- | vcl/workben/listfonts.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/mtfdemo.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/svdem.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/svpclient.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/svptest.cxx | 2 | ||||
-rw-r--r-- | vcl/workben/vcldemo.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/vcl/workben/listfonts.cxx b/vcl/workben/listfonts.cxx index 60b3209683e2..b76bdd4a2c92 100644 --- a/vcl/workben/listfonts.cxx +++ b/vcl/workben/listfonts.cxx @@ -13,7 +13,7 @@ #include <sal/main.h> #include <comphelper/processfactory.hxx> #include <cppuhelper/bootstrap.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/degree.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index 9ed8a2404a5b..8cc9363a04de 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -20,7 +20,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/wmf.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <tools/vcompat.hxx> diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 27245ac84388..5c7cbb12ad89 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -19,7 +19,7 @@ #include <sal/main.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/extendapplicationenvironment.hxx> #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index b8774548547f..ad980fd2b76d 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -35,7 +35,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/graph.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/extendapplicationenvironment.hxx> #include <tools/stream.hxx> diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index dde13e256ddd..e152365a1342 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -21,7 +21,7 @@ #include <sal/main.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/extendapplicationenvironment.hxx> #include <cppuhelper/bootstrap.hxx> diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 5cdfbcf8abd5..f37a99666143 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -35,7 +35,7 @@ #include <vcl/ptrstyle.hxx> #include <salhelper/thread.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <vcl/svapp.hxx> |