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 /package | |
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 'package')
-rw-r--r-- | package/inc/pch/precompiled_package2.hxx | 2 | ||||
-rw-r--r-- | package/inc/pch/precompiled_xstor.hxx | 2 | ||||
-rw-r--r-- | package/source/manifest/ManifestReader.cxx | 2 | ||||
-rw-r--r-- | package/source/xstor/owriteablestream.cxx | 2 | ||||
-rw-r--r-- | package/source/xstor/xstorage.cxx | 2 | ||||
-rw-r--r-- | package/source/zipapi/XUnbufferedStream.cxx | 2 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackageStream.cxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/package/inc/pch/precompiled_package2.hxx b/package/inc/pch/precompiled_package2.hxx index 7b1192067a08..46d0b427c93e 100644 --- a/package/inc/pch/precompiled_package2.hxx +++ b/package/inc/pch/precompiled_package2.hxx @@ -146,7 +146,7 @@ #include <o3tl/underlyingenumvalue.hxx> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/toolsdllapi.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> diff --git a/package/inc/pch/precompiled_xstor.hxx b/package/inc/pch/precompiled_xstor.hxx index a1e548eb7969..9b5e894a1eb0 100644 --- a/package/inc/pch/precompiled_xstor.hxx +++ b/package/inc/pch/precompiled_xstor.hxx @@ -97,7 +97,7 @@ #include <cppuhelper/typeprovider.hxx> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index 6464681f2aa3..e79d005cb17a 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -19,7 +19,7 @@ #include "ManifestReader.hxx" #include "ManifestImport.hxx" -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index e380d971c770..9f1360a4256b 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -51,7 +51,7 @@ #include <comphelper/refcountedmutex.hxx> #include <comphelper/sequence.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <PackageConstants.hxx> #include <utility> diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index bed733b10532..e18c398436b2 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -56,7 +56,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/ofopxmlhelper.hxx> #include <utility> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include "xstorage.hxx" #include "owriteablestream.hxx" diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 649760a5125d..b0a18cc0a683 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -31,7 +31,7 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <utility> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star; using namespace com::sun::star::packages::zip::ZipConstants; diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index cf1567983d8e..368d687e2886 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -52,7 +52,7 @@ #include <rtl/random.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <PackageConstants.hxx> |