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 /unotools | |
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 'unotools')
20 files changed, 20 insertions, 20 deletions
diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx index d5d4f54d326e..7af5466cb9a3 100644 --- a/unotools/inc/pch/precompiled_utl.hxx +++ b/unotools/inc/pch/precompiled_utl.hxx @@ -116,7 +116,7 @@ #include <salhelper/condition.hxx> #include <tools/date.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/lineend.hxx> #include <tools/long.hxx> #include <tools/ref.hxx> diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 90da75c043eb..55e79e30c8a4 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -38,7 +38,7 @@ #include <osl/diagnose.h> #include <comphelper/sequence.hxx> #include <comphelper/solarmutex.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace utl; using namespace com::sun::star::uno; diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 85aa6c3bada5..93b89532072d 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -19,7 +19,7 @@ #include <unotools/confignode.hxx> #include <unotools/configpaths.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index db5ef4087481..27cd3a2d97b8 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <optional> using namespace ::com::sun::star; diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 88ab894491b0..a8fa0dbd5ccc 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -33,7 +33,7 @@ #include <unotools/syslocaleoptions.hxx> #include <rtl/ref.hxx> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> ItemHolder1::ItemHolder1() { diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index a38fb51b61b7..efee41e6bbb2 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index c1a53627060b..e7d2bbfd0987 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -21,7 +21,7 @@ #include <sal/log.hxx> #include <unotools/pathoptions.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index fb8b24d9f05c..1e181e8813d6 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -38,7 +38,7 @@ #include <i18nlangtag/languagetag.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/string_view.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace utl; using namespace com::sun::star; diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 173ccdc10f66..f62cce6a7182 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -28,7 +28,7 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> #include <utility> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> constexpr OUStringLiteral PACKAGE_VIEWS = u"org.openoffice.Office.Views"; constexpr OUStringLiteral PROPERTY_WINDOWSTATE = u"WindowState"; diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index fd5d166fdcf9..51e975bbe906 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -21,7 +21,7 @@ #include <unotools/calendarwrapper.hxx> #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/LocaleCalendar2.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index b577d2577884..ace153d03a74 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -20,7 +20,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/charclass.hxx> #include <rtl/character.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/i18n/CharacterClassification.hpp> #include <utility> diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 220d850885cb..54aa49f44877 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -24,7 +24,7 @@ #include <sal/log.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/digitgroupingiterator.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> #include <o3tl/safeint.hxx> diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index 9c7b7d422919..882005ebf705 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.cxx @@ -21,7 +21,7 @@ #include <unotools/nativenumberwrapper.hxx> #include <com/sun/star/i18n/NativeNumberSupplier2.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star; diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 79d5cc68f580..91f70d2fb641 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -32,7 +32,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/textsearch.hxx> #include <rtl/ustrbuf.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <mutex> using namespace ::com::sun::star::util; diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 904ec82dc326..a8e4baedf905 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -22,7 +22,7 @@ #include <unotools/transliterationwrapper.hxx> #include <i18nlangtag/languagetag.hxx> #include <i18nutil/transliteration.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/i18n/Transliteration.hpp> diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx index 02e5dc5faaea..cb5ee7facedd 100644 --- a/unotools/source/misc/closeveto.cxx +++ b/unotools/source/misc/closeveto.cxx @@ -24,7 +24,7 @@ #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace utl { diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index f5ea04bd49ed..138125a4fc10 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <vector> diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index 3b848817e891..b8bb7f13469e 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -43,7 +43,7 @@ #include <comphelper/processfactory.hxx> #include <tools/urlobj.hxx> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace utl { diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 41a383d1004c..1b724a2b94f6 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <cppuhelper/implbase.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace utl { diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 4878ec1ce231..aaa9d214bb2b 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -47,7 +47,7 @@ #include <sal/log.hxx> #include <tools/datetime.hxx> #include <tools/urlobj.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbhelper.hxx> |