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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/inc/pch/precompiled_svt.hxx | 2 | ||||
-rw-r--r-- | svtools/langsupport/langsupport.cxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/brwimpl.hxx | 2 | ||||
-rw-r--r-- | svtools/source/brwbox/editbrowsebox2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/accessibilityoptions.cxx | 2 | ||||
-rw-r--r-- | svtools/source/config/itemholder2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/valueacc.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/ServerDetailsControls.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/embedhlp.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/imagemgr.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/imageresourceaccess.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/langhelp.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/templatefoldercache.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/genericunodialog.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/wizard/unowizard.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/wizard/wizardpagecontroller.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/wizard/wizardshell.cxx | 2 |
19 files changed, 19 insertions, 19 deletions
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 4550d83aba59..74026330dc24 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -279,7 +279,7 @@ #include <tools/datetime.hxx> #include <tools/debug.hxx> #include <tools/degree.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx index 7c25d8382b1f..711669c8c3f8 100644 --- a/svtools/langsupport/langsupport.cxx +++ b/svtools/langsupport/langsupport.cxx @@ -15,7 +15,7 @@ #include <i18nlangtag/languagetag.hxx> #include <sal/main.h> #include <svtools/langtab.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/extendapplicationenvironment.hxx> #include <vcl/svapp.hxx> #include <iostream> diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx index af591fbcb5f6..e822d7ef52c2 100644 --- a/svtools/source/brwbox/brwimpl.hxx +++ b/svtools/source/brwbox/brwimpl.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <map> diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index 0c6adee0476b..a72918ebb0fb 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -26,7 +26,7 @@ #include <vcl/accessiblefactory.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace svt { diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 4922326fa0f0..f10be38bed2f 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -30,7 +30,7 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <mutex> #include "itemholder2.hxx" diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 8880655d3887..c41095247eca 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -29,7 +29,7 @@ #include <svtools/colorcfg.hxx> #include <unotools/options.hxx> #include <svtools/miscopt.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <rtl/ref.hxx> namespace svtools { diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 77dffa93230d..cfecf910f94b 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -22,7 +22,7 @@ #endif #include <svtools/inettbc.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/beans/Property.hpp> diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 44b6b94375fe..0a575c6ea3d6 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -21,7 +21,7 @@ #include <vcl/settings.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <svtools/valueset.hxx> #include "valueimp.hxx" #include <comphelper/servicehelper.hxx> diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 3ae8e2ebe466..65d6c41645a9 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -19,7 +19,7 @@ #include <rtl/uri.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/commandenvironment.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <svtools/PlaceEditDialog.hxx> #include <utility> diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 85928dc7661c..4e26d912b219 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,7 +32,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <osl/diagnose.h> #include <com/sun/star/util/AliasProgrammaticPair.hpp> #include <com/sun/star/ui/dialogs/AddressBookSourcePilot.hpp> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 91a591ec8724..827a2d9a41a9 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -54,7 +54,7 @@ #include <embeddedobj/embeddedupdate.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/svapp.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/debug.hxx> #include <sfx2/xmldump.hxx> #include <memory> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 66f786dc190f..7dc6705da29d 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -18,7 +18,7 @@ */ #include <svtools/imagemgr.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <vcl/image.hxx> diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 7523efaea3a1..7a44a4d90dee 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -30,7 +30,7 @@ #include <o3tl/string_view.hxx> #include <osl/diagnose.h> #include <tools/stream.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/streamwrap.hxx> #include <cppuhelper/implbase.hxx> #include <utility> diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx index ff48868e17aa..793e3f7d0e10 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -19,7 +19,7 @@ #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp> #include <rtl/ustring.hxx> #include <svtools/langhelp.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <vcl/idle.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 43e2123532c8..d8e473350e10 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -36,7 +36,7 @@ #include <tools/time.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <unotools/pathoptions.hxx> #include <comphelper/processfactory.hxx> diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index b6a49365404e..349d9a73a4d4 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -28,7 +28,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> #include <osl/diagnose.h> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 0a73eb49adf3..d7680893f40a 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -36,7 +36,7 @@ #include <cppuhelper/implbase.hxx> #include <svtools/genericunodialog.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 69b864fbf049..333d7ce27351 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -22,7 +22,7 @@ #include "wizardshell.hxx" #include <toolkit/helper/vclunohelper.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace svt::uno diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 7c946f0cf34f..93113d4fd739 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -21,7 +21,7 @@ #include "wizardshell.hxx" #include "wizardpagecontroller.hxx" -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/ui/dialogs/WizardTravelType.hpp> |