From 91ba9654baa8d525e31614b03cd459cf7cb1f951 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 17 Aug 2022 17:09:09 +0200
Subject: 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>
---
 cui/inc/pch/precompiled_cui.hxx                 | 2 +-
 cui/source/customize/CommandCategoryListBox.cxx | 2 +-
 cui/source/customize/SvxToolbarConfigPage.cxx   | 2 +-
 cui/source/customize/cfg.cxx                    | 2 +-
 cui/source/customize/cfgutil.cxx                | 2 +-
 cui/source/customize/eventdlg.cxx               | 2 +-
 cui/source/customize/macropg.cxx                | 2 +-
 cui/source/dialogs/AdditionsDialog.cxx          | 2 +-
 cui/source/dialogs/insdlg.cxx                   | 2 +-
 cui/source/dialogs/linkdlg.cxx                  | 2 +-
 cui/source/dialogs/scriptdlg.cxx                | 2 +-
 cui/source/dialogs/showcols.cxx                 | 2 +-
 cui/source/options/certpath.cxx                 | 2 +-
 cui/source/options/dbregisterednamesconfig.cxx  | 2 +-
 cui/source/options/optaboutconfig.cxx           | 2 +-
 cui/source/options/optasian.cxx                 | 2 +-
 cui/source/options/optgdlg.cxx                  | 2 +-
 cui/source/options/optinet2.cxx                 | 2 +-
 cui/source/options/optjava.cxx                  | 2 +-
 cui/source/options/optlingu.cxx                 | 2 +-
 cui/source/options/optpath.cxx                  | 2 +-
 cui/source/options/optsave.cxx                  | 2 +-
 cui/source/options/optupdt.cxx                  | 2 +-
 cui/source/options/sdbcdriverenum.cxx           | 2 +-
 cui/source/options/treeopt.cxx                  | 2 +-
 cui/source/options/tsaurls.cxx                  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'cui')

diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index b9de39fea919..92248cddbd5d 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -402,7 +402,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/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index f6b34076fa02..f7f3295a921d 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -35,7 +35,7 @@
 // include search util
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <unotools/textsearch.hxx>
 
 #include <dialmgr.hxx>
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index bc8346922790..359dc02bb1f5 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -27,7 +27,7 @@
 
 #include <sfx2/sfxsids.hrc>
 #include <svl/stritem.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <algorithm>
 #include <helpids.h>
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 4c8192b61283..eefa264ba3bd 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -43,7 +43,7 @@
 #include <svl/stritem.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <algorithm>
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6b39170e18f7..90b5592d44cc 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -49,7 +49,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <dialmgr.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/help.hxx>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 54ebcdefa0c7..7aa67e3f5a81 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 7e3ff8bc3128..db36fe10713a 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -20,7 +20,7 @@
 #include <macropg.hxx>
 #include <svl/eitem.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <bitmaps.hlst>
 #include <cfgutil.hxx>
 #include <dialmgr.hxx>
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx
index c26a0d97456e..76b215a0b777 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -29,7 +29,7 @@
 #include <rtl/bootstrap.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 3806c4dc2aff..9e328b00cb04 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -41,7 +41,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <utility>
 #include <vcl/image.hxx>
 #include <vcl/weld.hxx>
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 055721d739a0..b31c5d74a783 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -21,7 +21,7 @@
 #include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/idle.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 8e787e8d1f91..c7784393ac6b 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -54,7 +54,7 @@
 
 #include <svtools/imagemgr.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace css::uno;
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 1e8485513f16..ec281b8a3c30 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/types.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 constexpr OUStringLiteral CUIFM_PROP_HIDDEN = u"Hidden";
 constexpr OUStringLiteral CUIFM_PROP_LABEL = u"Label";
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 3aff94b3217e..91526e587cbd 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -11,7 +11,7 @@
 #include <osl/file.hxx>
 #include <osl/security.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include "certpath.hxx"
 
 #include <com/sun/star/xml/crypto/NSSInitializer.hpp>
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index b33e9ded61c5..edbf3168560b 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svl/itemset.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 
 namespace svx
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index c4dafaf5c199..0914310f2800 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -33,7 +33,7 @@
 #include <utility>
 #include <vcl/event.hxx>
 #include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 84d23b42e906..9340cb587cc3 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -21,7 +21,7 @@
 #include <map>
 #include <optasian.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <o3tl/any.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <svl/asiancfg.hxx>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f1e3fcf4bf45..d58176ff00eb 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -54,7 +54,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
 #include <comphelper/configuration.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #if HAVE_FEATURE_BREAKPAD
 #include <desktop/crashreport.hxx>
 #endif
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a3dd5826f6f3..95d0ec18346b 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -29,7 +29,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/securityoptions.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <dialmgr.hxx>
 #include "optinet2.hxx"
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 69302982214e..c1528138f326 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -44,7 +44,7 @@
 #include <svtools/restartdialog.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/inputdlg.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 331cc2cabf83..6db7634159b1 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -31,7 +31,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/dispatchcommand.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 18c3e32a1deb..dfca56dfae59 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -40,7 +40,7 @@
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
 #include <o3tl/string_view.hxx>
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 43468715cd3a..0abadfd03e92 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -41,7 +41,7 @@
 #include <svtools/restartdialog.hxx>
 #include <unotools/optionsdlg.hxx>
 #include <osl/diagnose.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <officecfg/Office/Recovery.hxx>
 
 #include <sfx2/fcontnr.hxx>
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 754fb5fdce27..faeac7f421c7 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -42,7 +42,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <osl/file.hxx>
 #include <osl/security.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <unotools/configmgr.hxx>
 
 using namespace ::css;
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 629fb7056c1e..0ddd7f8f9f08 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -20,7 +20,7 @@
 #include "sdbcdriverenum.hxx"
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5973f422a7ae..1089114e5ddc 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -95,7 +95,7 @@
 #include <svx/databaseregistrationui.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/optionsdlg.hxx>
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 5c01e1c5b425..b33c76c58d43 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -10,7 +10,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <svx/svxdlg.hxx>
 #include <comphelper/sequence.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "tsaurls.hxx"
 
-- 
cgit