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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/Library_cmdmail.mk | 2 | ||||
| -rw-r--r-- | shell/Library_desktopbe.mk | 2 | ||||
| -rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 2 | ||||
| -rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk index 6e0683738453..4440284c20bf 100644 --- a/shell/Library_cmdmail.mk +++ b/shell/Library_cmdmail.mk @@ -12,10 +12,10 @@ $(eval $(call gb_Library_Library,cmdmail)) $(eval $(call gb_Library_use_sdk_api,cmdmail)) $(eval $(call gb_Library_use_libraries,cmdmail,\ + comphelper \ cppu \ cppuhelper \ sal \ - tl \ )) $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail,services)) diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk index c494b5e1cdb3..741127ce3cb1 100644 --- a/shell/Library_desktopbe.mk +++ b/shell/Library_desktopbe.mk @@ -14,10 +14,10 @@ $(eval $(call gb_Library_use_external,desktopbe1,boost_headers)) $(eval $(call gb_Library_use_sdk_api,desktopbe1)) $(eval $(call gb_Library_use_libraries,desktopbe1,\ + comphelper \ cppu \ cppuhelper \ sal \ - tl \ vcl \ )) diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 4dcc91967cba..c14c679a608a 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -44,7 +44,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <uno/current_context.hxx> namespace { diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 00b6517c4648..2128ae009ab2 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using com::sun::star::beans::PropertyValue; using com::sun::star::system::XSimpleMailClientSupplier; |