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/ole | |
| 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/ole')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ole/vbaproject.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index b624fb38a8c7..c1f57996088f 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -63,7 +63,7 @@ #include <oox/ole/axbinarywriter.hxx> #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <o3tl/string_view.hxx> namespace oox::ole { diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 921caf475aab..d87c689f8eeb 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -36,7 +36,7 @@ #include <osl/diagnose.h> #include <rtl/tencinfo.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/propertyset.hxx> #include <oox/helper/textinputstream.hxx> |