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 /oox | |
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 'oox')
-rw-r--r-- | oox/inc/pch/precompiled_oox.hxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/shape.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/textfield.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/textparagraphpropertiescontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/textrun.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/drawingml.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/shapes.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/binarystreambase.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/graphichelper.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/propertyset.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/zipstorage.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/axcontrol.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/vbaproject.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/presentationfragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidetransition.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/timenode.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/timenodelistcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/vml/vmldrawing.cxx | 2 | ||||
-rw-r--r-- | oox/source/vml/vmltextbox.cxx | 2 |
21 files changed, 21 insertions, 21 deletions
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 691c0fc5c226..4281760d10cc 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -214,7 +214,7 @@ #include <svx/svxdllapi.h> #include <tools/color.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/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 4d8ab3b3cb45..bd4d773c15d0 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -56,7 +56,7 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/gen.hxx> #include <tools/globname.hxx> #include <tools/mapunit.hxx> diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index ee2f9313b2d8..2640aa52ce12 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -36,7 +36,7 @@ #include <oox/core/xmlfilterbase.hxx> #include <drawingml/textparagraphproperties.hxx> #include <drawingml/textcharacterproperties.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <editeng/flditem.hxx> using namespace ::com::sun::star; diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index 8cbeee66408a..4e83d2ece24b 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/UnitConversion.hxx> #include <drawingml/colorchoicecontext.hxx> diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 24b94b6e4db2..339d50bb4ff0 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -33,7 +33,7 @@ #include <oox/core/xmlfilterbase.hxx> #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 0b9345b4eeef..6bdede718f05 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -99,7 +99,7 @@ #include <svl/numformat.hxx> #include <svl/numuno.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> #include <set> diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 0f3008bc3482..2a536b809220 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -36,7 +36,7 @@ #include <oox/drawingml/drawingmltypes.hxx> #include <svtools/unitconv.hxx> #include <sax/fastattribs.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 19ef8156f3e3..79258d7d10e2 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -76,7 +76,7 @@ #include <filter/msfilter/escherex.hxx> #include <svx/svdoashp.hxx> #include <svx/svdoole2.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/export/chartexport.hxx> #include <oox/mathml/export.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index 1e3ef11ae9ea..0f35c44ac686 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -21,7 +21,7 @@ #include <oox/helper/helper.hxx> #include <com/sun/star/io/XSeekable.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> namespace oox { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 3a4e67acf39a..d197b341da70 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <tools/gen.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/properties.hxx> diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index 98151d5fbe29..380354733591 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -23,7 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/propertymap.hxx> namespace oox { diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index d11d145bb764..10f7d79c25f1 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/storagehelper.hxx> namespace oox { diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index b624fb38a8c7..c1f57996088f 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -63,7 +63,7 @@ #include <oox/ole/axbinarywriter.hxx> #include <oox/token/properties.hxx> #include <oox/token/tokens.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <o3tl/string_view.hxx> namespace oox::ole { diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 921caf475aab..d87c689f8eeb 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -36,7 +36,7 @@ #include <osl/diagnose.h> #include <rtl/tencinfo.h> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/propertyset.hxx> #include <oox/helper/textinputstream.hxx> diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index f2abf183430b..2db197ce3a90 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -23,7 +23,7 @@ #include <o3tl/string_view.hxx> #include <sal/log.hxx> #include <tools/multisel.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 0c6f183e81e9..87fc980b0757 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 5221c2f68710..8379f9e4b6b9 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -25,7 +25,7 @@ #include <sal/log.hxx> #include <tools/color.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <oox/helper/propertymap.hxx> #include <oox/token/namespaces.hxx> diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index 2701a3f60465..e8732e8858a6 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -41,7 +41,7 @@ #include <oox/ppt/pptfilterhelpers.hxx> #include <oox/token/tokens.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> using namespace ::oox::core; using namespace ::com::sun::star::beans; diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 728cbb5b970b..50d5c032f612 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -21,7 +21,7 @@ #include <rtl/math.hxx> #include <sal/log.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/animations/AnimationTransformType.hpp> #include <com/sun/star/animations/AnimationCalcMode.hpp> diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 081322a4600c..c38bf96ad7f2 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -36,7 +36,7 @@ #include <oox/ole/axcontrol.hxx> #include <oox/vml/vmlshape.hxx> #include <oox/vml/vmlshapecontainer.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <tools/gen.hxx> #include <o3tl/string_view.hxx> diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx index ab45720f9cad..b2c6fd407ea6 100644 --- a/oox/source/vml/vmltextbox.cxx +++ b/oox/source/vml/vmltextbox.cxx @@ -20,7 +20,7 @@ #include <oox/vml/vmltextbox.hxx> #include <rtl/ustrbuf.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> |