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 /oox/source/helper | |
| 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 'oox/source/helper')
| -rw-r--r-- | oox/source/helper/binarystreambase.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/graphichelper.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/propertyset.cxx | 2 | ||||
| -rw-r--r-- | oox/source/helper/zipstorage.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index 1e3ef11ae9ea..0f35c44ac686 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -21,7 +21,7 @@ #include <oox/helper/helper.hxx> #include <com/sun/star/io/XSeekable.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace oox { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 3a4e67acf39a..d197b341da70 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <tools/gen.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index 98151d5fbe29..380354733591 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/propertymap.hxx> namespace oox { diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index d11d145bb764..10f7d79c25f1 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/storagehelper.hxx> namespace oox { |