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>

accessibility/source/extended/accessibleeditbrowseboxcell.cxx

@@ -23,7 +23,7 @@
 #include <extended/accessibleeditbrowseboxcell.hxx>
 #include <comphelper/processfactory.hxx>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace accessibility
 {

accessibility/source/extended/textwindowaccessibility.cxx

@@ -36,7 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/window.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <comphelper/sequence.hxx>
 

avmedia/source/framework/mediaitem.cxx

@@ -39,7 +39,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <mediamisc.hxx>
 #include <osl/file.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/graph.hxx>
 
 using namespace ::com::sun::star;

avmedia/source/viewer/mediawindow_impl.cxx

@@ -29,7 +29,7 @@
 
 #include <sal/log.hxx>
 #include <comphelper/processfactory.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/securityoptions.hxx>
 #include <vcl/bitmapex.hxx>

basctl/inc/pch/precompiled_basctl.hxx

@@ -511,7 +511,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>

basctl/source/accessibility/accessibledialogcontrolshape.cxx

@@ -31,7 +31,7 @@
 #include <toolkit/awt/vclxfont.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <i18nlangtag/languagetag.hxx>

basctl/source/basicide/baside3.cxx

@@ -50,7 +50,7 @@
 #include <svl/whiter.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svxids.hrc>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/weld.hxx>

basctl/source/basicide/basides3.cxx

@@ -27,7 +27,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 

basctl/source/basicide/basidesh.cxx

@@ -19,7 +19,7 @@
 
 #include <config_options.h>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <basic/basmgr.hxx>
 #include <svx/svxids.hrc>
 #include <iderid.hxx>

basctl/source/basicide/basobj2.cxx

@@ -34,7 +34,7 @@
 #include <comphelper/sequence.hxx>
 #include <framework/documentundoguard.hxx>
 #include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>

basctl/source/basicide/bastype2.cxx

@@ -25,7 +25,7 @@
 #include <bitmaps.hlst>
 #include <iderid.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <svtools/imagemgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>

basctl/source/basicide/doceventnotifier.cxx

@@ -24,7 +24,7 @@
 
 #include <vcl/svapp.hxx>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <comphelper/processfactory.hxx>
 

basctl/source/basicide/documentenumeration.cxx

@@ -27,7 +27,7 @@
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace basctl::docs {
 

basctl/source/basicide/moduldl2.cxx

@@ -38,7 +38,7 @@
 #include <svl/stritem.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 

basctl/source/basicide/moduldlg.cxx

@@ -42,7 +42,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 

basctl/source/basicide/scriptdocument.cxx

@@ -51,7 +51,7 @@
 
 #include <i18nlangtag/languagetag.hxx>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/debug.hxx>
 
 #include <comphelper/documentinfo.hxx>

basctl/source/dlged/propbrw.cxx

@@ -37,7 +37,7 @@
 #include <svx/svditer.hxx>
 #include <svx/svdview.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>

basic/source/basmgr/basicmanagerrepository.cxx

@@ -34,7 +34,7 @@
 #include <svl/hint.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentinfo.hxx>

basic/source/basmgr/basmgr.cxx

@@ -28,7 +28,7 @@
 #include <sot/storinfo.hxx>
 #include <unotools/pathoptions.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <basic/sbmod.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <sal/log.hxx>

basic/source/classes/eventatt.cxx

@@ -39,7 +39,7 @@
 #include <basic/basmgr.hxx>
 
 #include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
 #include <sbunoobj.hxx>
 #include <basic/sberrors.hxx>

basic/source/classes/sbxmod.cxx

@@ -21,7 +21,7 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <basic/codecompletecache.hxx>
 #include <basic/sbx.hxx>

basic/source/runtime/runtime.cxx

@@ -36,7 +36,7 @@
 #include <sal/log.hxx>
 
 #include <tools/wldcrd.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <utility>
 #include <vcl/svapp.hxx>

basic/source/uno/dlgcont.cxx

@@ -33,7 +33,7 @@
 #include <dlgcont.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>

basic/source/uno/namecont.cxx

@@ -44,7 +44,7 @@
 
 #include <namecont.hxx>
 #include <basic/basicmanagerrepository.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svtools/sfxecode.hxx>

canvas/inc/pch/precompiled_cairocanvas.hxx

@@ -77,7 +77,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/stream.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4

canvas/inc/pch/precompiled_canvastools.hxx

@@ -95,7 +95,7 @@
 #include <rendering/isurfaceproxy.hxx>
 #include <rendering/isurfaceproxymanager.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/time.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4

canvas/inc/pch/precompiled_oglcanvas.hxx

@@ -57,7 +57,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <epoxy/gl.h>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
 #include <canvas/canvastools.hxx>

canvas/inc/pch/precompiled_vclcanvas.hxx

@@ -80,7 +80,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/long.hxx>
 #include <tools/poly.hxx>
 #include <tools/stream.hxx>

canvas/source/cairo/cairo_cachedbitmap.cxx

@@ -22,7 +22,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/RepaintResult.hpp>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "cairo_cachedbitmap.hxx"
 #include "cairo_repainttarget.hxx"

canvas/source/cairo/cairo_canvas.cxx

@@ -23,7 +23,7 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <osl/mutex.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 #include <cppuhelper/supportsservice.hxx>

canvas/source/cairo/cairo_canvasbitmap.cxx

@@ -21,7 +21,7 @@
 #include <sal/log.hxx>
 
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <utility>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapTools.hxx>

canvas/source/cairo/cairo_canvascustomsprite.cxx

@@ -22,7 +22,7 @@
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 #include <cairo.h>

canvas/source/cairo/cairo_canvashelper.cxx

@@ -42,7 +42,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/canvastools.hxx>

canvas/source/cairo/cairo_canvashelper_text.cxx

@@ -23,7 +23,7 @@
 
 #include <rtl/math.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>

canvas/source/cairo/cairo_spritecanvas.cxx

@@ -27,7 +27,7 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include "cairo_spritecanvas.hxx"

canvas/source/cairo/cairo_spritecanvashelper.cxx

@@ -23,7 +23,7 @@
 #include <boost/cast.hpp>
 
 #include <basegfx/range/b2irange.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/cairo/cairo_spritehelper.cxx

@@ -25,7 +25,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <cairo.h>
 #include <pixman.h>

canvas/source/cairo/cairo_textlayout.cxx

@@ -27,7 +27,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <utility>
 #include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>

canvas/source/directx/dx_9rm.cxx

@@ -31,7 +31,7 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <osl/thread.hxx>
 #include <osl/time.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/window.hxx>

canvas/source/directx/dx_bitmap.cxx

@@ -23,7 +23,7 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2irange.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "dx_bitmap.hxx"
 #include "dx_graphicsprovider.hxx"

canvas/source/directx/dx_bitmapcanvashelper.cxx

@@ -31,7 +31,7 @@
 #include <com/sun/star/rendering/RepaintResult.hpp>
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/directx/dx_canvas.cxx

@@ -36,7 +36,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
 #include <vcl/window.hxx>

canvas/source/directx/dx_canvasbitmap.cxx

@@ -22,7 +22,7 @@
 #include <memory>
 
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/bitmapex.hxx>
 
 #include <canvas/canvastools.hxx>

canvas/source/directx/dx_canvascustomsprite.cxx

@@ -25,7 +25,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/directx/dx_canvashelper.cxx

@@ -34,7 +34,7 @@
 #include <comphelper/sequence.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/directx/dx_canvashelper_texturefill.cxx

@@ -35,7 +35,7 @@
 #include <basegfx/utils/tools.hxx>
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <parametricpolypolygon.hxx>
 

canvas/source/directx/dx_config.cxx

@@ -26,7 +26,7 @@
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/diagnose.h>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "dx_config.hxx"
 

canvas/source/directx/dx_devicehelper.cxx

@@ -23,7 +23,7 @@
 
 #include <basegfx/utils/canvastools.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/sysdata.hxx>

canvas/source/directx/dx_impltools.cxx

@@ -35,7 +35,7 @@
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 #include <verifyinput.hxx>

canvas/source/directx/dx_spritecanvas.cxx

@@ -31,7 +31,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/directx/dx_spritecanvashelper.cxx

@@ -24,7 +24,7 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <comphelper/scopeguard.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/directx/dx_spritedevicehelper.cxx

@@ -27,7 +27,7 @@
 #include <canvas/canvastools.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/window.hxx>
 

canvas/source/directx/dx_spritehelper.cxx

@@ -29,7 +29,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <canvas/canvastools.hxx>
 

canvas/source/directx/dx_surfacebitmap.cxx

@@ -26,7 +26,7 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2irange.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <rendering/icolorbuffer.hxx>
 
 #include "dx_graphicsprovider.hxx"

canvas/source/directx/dx_textlayout_drawhelper.cxx

@@ -31,7 +31,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/math.hxx>
 #include <tools/color.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/poly.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/metric.hxx>

canvas/source/directx/dx_vcltools.cxx

@@ -22,7 +22,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapReadAccess.hxx>

canvas/source/opengl/ogl_canvasbitmap.cxx

@@ -9,7 +9,7 @@
 
 #include <sal/config.h>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <utility>
 

canvas/source/opengl/ogl_canvascustomsprite.cxx

@@ -19,7 +19,7 @@
 #include <canvas/canvastools.hxx>
 #include <o3tl/safeint.hxx>
 #include <verifyinput.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "ogl_canvascustomsprite.hxx"
 #include "ogl_canvastools.hxx"

canvas/source/opengl/ogl_canvashelper.cxx

@@ -20,7 +20,7 @@
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <rtl/crc.h>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/font.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>

canvas/source/opengl/ogl_spritecanvas.cxx

@@ -13,7 +13,7 @@
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/window.hxx>
 

canvas/source/opengl/ogl_textlayout.cxx

@@ -11,7 +11,7 @@
 #include <sal/log.hxx>
 #include <utility>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "ogl_textlayout.hxx"
 

canvas/source/tools/canvascustomspritehelper.cxx

@@ -30,7 +30,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/vector/b2dsize.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <base/canvascustomspritehelper.hxx>
 #include <canvas/canvastools.hxx>

canvas/source/tools/canvastools.cxx

@@ -53,7 +53,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <sal/log.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/window.hxx>
 

canvas/source/tools/spriteredrawmanager.cxx

@@ -23,7 +23,7 @@
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/utils/canvastools.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
 
 #include <spriteredrawmanager.hxx>

canvas/source/vcl/cachedbitmap.cxx

@@ -22,7 +22,7 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/RepaintResult.hpp>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "cachedbitmap.hxx"
 #include "repainttarget.hxx"

canvas/source/vcl/canvas.cxx

@@ -23,7 +23,7 @@
 
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/outdev.hxx>
 
 #include "outdevholder.hxx"

canvas/source/vcl/canvasbitmaphelper.cxx

@@ -21,7 +21,7 @@
 #include <sal/log.hxx>
 
 #include <canvas/canvastools.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/canvastools.hxx>

canvas/source/vcl/canvascustomsprite.cxx

@@ -22,7 +22,7 @@
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/outdev.hxx>
 
 #include "canvascustomsprite.hxx"

canvas/source/vcl/canvashelper.cxx

@@ -35,7 +35,7 @@
 #include <com/sun/star/rendering/TextDirection.hpp>
 #include <comphelper/sequence.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/poly.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapReadAccess.hxx>

canvas/source/vcl/canvashelper_texturefill.cxx

@@ -34,7 +34,7 @@
 #include <basegfx/utils/tools.hxx>
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/poly.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>

canvas/source/vcl/impltools.cxx

@@ -27,7 +27,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sal/log.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>

canvas/source/vcl/spritecanvas.cxx

@@ -23,7 +23,7 @@
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include "spritecanvas.hxx"
 #include "outdevholder.hxx"

canvas/source/vcl/spritecanvashelper.cxx

@@ -24,7 +24,7 @@
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>

canvas/source/vcl/spritehelper.cxx

@@ -26,7 +26,7 @@
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>

canvas/source/vcl/textlayout.cxx

@@ -20,7 +20,7 @@
 
 #include <sal/config.h>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/utils/canvastools.hxx>

chart2/inc/pch/precompiled_chartcontroller.hxx

@@ -419,7 +419,7 @@
 #include <tools/date.hxx>
 #include <tools/datetime.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>

chart2/inc/pch/precompiled_chartcore.hxx

@@ -249,7 +249,7 @@
 #include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/degree.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <tools/gen.hxx>
 #include <tools/helpers.hxx>
 #include <tools/lineend.hxx>

chart2/source/controller/accessibility/AccessibleBase.cxx

@@ -42,7 +42,7 @@
 #include <vcl/settings.hxx>
 #include <o3tl/functional.hxx>
 #include <o3tl/safeint.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <algorithm>
 #include <iterator>

chart2/source/controller/accessibility/AccessibleChartElement.cxx

@@ -32,7 +32,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;

chart2/source/controller/chartapiwrapper/AxisWrapper.cxx

@@ -49,7 +49,7 @@
 
 #include <algorithm>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;

chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx

@@ -34,7 +34,7 @@
 #include <ChartModel.hxx>
 
 #include <com/sun/star/chart2/XDataSeries.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;

chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx

@@ -61,7 +61,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <algorithm>
 #include <map>

chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx

@@ -65,7 +65,7 @@
 #include <map>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <o3tl/string_view.hxx>
 #include <utility>
 

chart2/source/controller/chartapiwrapper/GridWrapper.cxx

@@ -31,7 +31,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <algorithm>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;

chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx

@@ -30,7 +30,7 @@
 #include <LinePropertiesHelper.hxx>
 #include <UserDefinedProperties.hxx>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;

chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx

@@ -30,7 +30,7 @@
 #include <FillProperties.hxx>
 #include <UserDefinedProperties.hxx>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;

chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx

@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;

chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx

@@ -26,7 +26,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;

chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx

@@ -25,7 +25,7 @@
 #include <ControllerLockGuard.hxx>
 #include <WrappedProperty.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <ChartTypeManager.hxx>
 #include <ChartTypeTemplate.hxx>
 #include <utility>

chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx

@@ -32,7 +32,7 @@
 #include <vcl/GraphicLoader.hxx>
 
 #include <vcl/graph.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;

chart2/source/controller/dialogs/ChartTypeDialogController.cxx

@@ -39,7 +39,7 @@
 #include <vcl/image.hxx>
 #include <vcl/settings.hxx>
 
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace chart
 {

chart2/source/controller/dialogs/DataBrowserModel.cxx

@@ -42,7 +42,7 @@
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <o3tl/safeint.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/property.hxx>
 
 #include <algorithm>

chart2/source/controller/dialogs/DialogModel.cxx

@@ -38,7 +38,7 @@
 
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 #include <rtl/ustring.hxx>
 

chart2/source/controller/dialogs/ObjectNameProvider.cxx

@@ -48,7 +48,7 @@
 
 #include <com/sun/star/chart2/XTitle.hpp>
 #include <com/sun/star/chart2/MovingAverageType.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <o3tl/string_view.hxx>
 
 namespace chart

chart2/source/controller/dialogs/RangeSelectionHelper.cxx

@@ -21,7 +21,7 @@
 #include <RangeSelectionListener.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <ChartModel.hxx>
 #include <utility>
 

chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx

@@ -29,7 +29,7 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <sfx2/viewsh.hxx>
 
 namespace chart

chart2/source/controller/dialogs/dlg_ObjectProperties.cxx

@@ -73,7 +73,7 @@
 
 #include <svl/cjkoptions.hxx>
 #include <utility>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 
 namespace com::sun::star::chart2 { class XChartType; }
 namespace com::sun::star::chart2 { class XDataSeries; }

chart2/source/controller/dialogs/res_ErrorBar.cxx

@@ -26,7 +26,7 @@
 #include <ChartModel.hxx>
 
 #include <rtl/math.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <osl/diagnose.h>
 #include <svl/stritem.hxx>
 

chart2/source/controller/dialogs/res_LegendPosition.cxx

@@ -31,7 +31,7 @@
 #include <chartview/ChartSfxItemIds.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <utility>
 #include <vcl/weld.hxx>
 

chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx

@@ -24,7 +24,7 @@
 #include <ControllerLockGuard.hxx>
 #include <Diagram.hxx>
 #include <com/sun/star/drawing/ShadeMode.hpp>
-#include <tools/diagnose_ex.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>