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 /ucb | |
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 'ucb')
-rw-r--r-- | ucb/source/core/provprox.cxx | 2 | ||||
-rw-r--r-- | ucb/source/core/ucb.cxx | 2 | ||||
-rw-r--r-- | ucb/source/core/ucbstore.cxx | 2 | ||||
-rw-r--r-- | ucb/source/sorter/sortresult.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/expand/ucpexpand.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydata.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_provider.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 9bb2fad45665..68b329e83708 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -20,7 +20,7 @@ #include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/strbuf.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include "provprox.hxx" #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 4782118488ca..e0e6953a63a7 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -46,7 +46,7 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <ucbhelper/cancelcommandexecution.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include "identify.hxx" #include "ucbcmds.hxx" diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index b94425afa36c..be97f81f636f 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -27,7 +27,7 @@ #include <optional> #include <unordered_map> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> #include <comphelper/interfacecontainer2.hxx> diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index e5b7ce7465c6..20bc73c08175 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -26,7 +26,7 @@ #include <com/sun/star/ucb/XAnyCompare.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <memory> using namespace com::sun::star::beans; diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index ab9080f45ea3..cf4664ffbf65 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/XContentProvider.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #define EXPAND_PROTOCOL "vnd.sun.star.expand" diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 71d6cbbaeb42..a04da9a96ecd 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -36,7 +36,7 @@ #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/content.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> #include <sal/macros.h> diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 68a6bc7b2f07..b718ef076c34 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -29,7 +29,7 @@ #include <ucbhelper/providerhelper.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/propertyvalueset.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8865911c9960..9b0618690331 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -21,7 +21,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 1e133232b105..44c8ed3a51b8 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -28,7 +28,7 @@ *************************************************************************/ #include "hierarchydata.hxx" -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <rtl/ustrbuf.hxx> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index b956695eab75..89335ce58493 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -29,7 +29,7 @@ #include <string_view> #include <o3tl/string_view.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <rtl/ustrbuf.hxx> #include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 1ecc775204ba..34f87ef60223 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -19,7 +19,7 @@ #include <rtl/ref.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/documentinfo.hxx> #include <comphelper/namedvaluecollection.hxx> diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 23fd324a550b..29f0524373c6 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -24,7 +24,7 @@ *************************************************************************/ -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/embed/InvalidStorageException.hpp> #include <com/sun/star/embed/StorageWrappedTargetException.hpp> diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index fe687c05a87f..acd2b26db5f1 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -26,7 +26,7 @@ *************************************************************************/ -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> diff --git a/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx index c5a008af8409..b129872a78b3 100644 --- a/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-curl/webdavdatasupplier.cxx @@ -32,7 +32,7 @@ #include "CurlUri.hxx" #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/ResultSetException.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace com::sun::star; using namespace http_dav_ucp; |