diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-14 22:52:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-17 11:06:53 +0100 |
| commit | 6a0fe37dec107392fbe468a35b89071b9a93d2c1 (patch) | |
| tree | 4334feae68fa1ddc1ef293cd46ef483f44081c1c | |
| parent | 30f3b36e07ce37a3fe1909fb4b1419a00d2fdd81 (diff) | |
sal: clean up public headers with include-what-you-use
Sadly cannot forward declare "struct {...} TimeValue;".
rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h
was painful enough for now...
Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05
599 files changed, 731 insertions, 28 deletions
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 8fc0f2bf75d4..ece9d58ad1e1 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -20,6 +20,7 @@ #include "manager.hxx" #include "player.hxx" #include <tools/urlobj.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm index fa315fdff341..7de493c895dd 100644 --- a/avmedia/source/quicktime/manager.mm +++ b/avmedia/source/quicktime/manager.mm @@ -20,6 +20,7 @@ #include "manager.hxx" #include "player.hxx" #include <tools/urlobj.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx index 0553bbd191be..0212f9e6924b 100644 --- a/basctl/source/basicide/docsignature.cxx +++ b/basctl/source/basicide/docsignature.cxx @@ -23,6 +23,9 @@ #include <sfx2/objsh.hxx> #include <sfx2/signaturestate.hxx> +#include <osl/diagnose.h> + + namespace basctl { using ::com::sun::star::uno::Reference; diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx index 44515fa51dbb..7727efdb034c 100644 --- a/basegfx/source/color/bcolormodifier.cxx +++ b/basegfx/source/color/bcolormodifier.cxx @@ -19,6 +19,8 @@ #include <basegfx/color/bcolormodifier.hxx> +#include <osl/diagnose.h> + namespace basegfx { BColorModifier::~BColorModifier() diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx index b2b53fc31970..bbafb7bbfa0d 100644 --- a/basegfx/source/curve/b2dcubicbezier.cxx +++ b/basegfx/source/curve/b2dcubicbezier.cxx @@ -22,6 +22,8 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/numeric/ftools.hxx> +#include <osl/diagnose.h> + #include <limits> // #i37443# diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx index 386ee9bc78bc..645d4c7e261a 100644 --- a/basegfx/source/matrix/b2dhommatrixtools.cxx +++ b/basegfx/source/matrix/b2dhommatrixtools.cxx @@ -18,6 +18,8 @@ */ #include <basegfx/matrix/b2dhommatrixtools.hxx> + +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx index c4cb856186f2..5b0c3c8e5601 100644 --- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx +++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx @@ -22,6 +22,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> + +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/math.hxx> #include <stringconversiontools.hxx> diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx index 3b80c0bc1bd7..a5ac050af4fe 100644 --- a/basegfx/source/polygon/b2dtrapezoid.cxx +++ b/basegfx/source/polygon/b2dtrapezoid.cxx @@ -20,6 +20,9 @@ #include <basegfx/polygon/b2dtrapezoid.hxx> #include <basegfx/range/b1drange.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> + +#include <osl/diagnose.h> + #include <list> namespace basegfx diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx index e77cb911cdf8..0f74f6e58829 100644 --- a/basegfx/source/polygon/b3dpolypolygontools.cxx +++ b/basegfx/source/polygon/b3dpolypolygontools.cxx @@ -18,6 +18,7 @@ */ #include <rtl/instance.hxx> +#include <osl/diagnose.h> #include <basegfx/polygon/b3dpolypolygontools.hxx> #include <basegfx/range/b3drange.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index 3f8f6f641d80..60100beb2382 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -18,6 +18,7 @@ */ #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/range/b2drange.hxx> diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index ddb23181cb87..54d2797f245d 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -28,6 +28,8 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolypolygoncutter.hxx> +#include <osl/diagnose.h> + namespace basegfx { namespace tools diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx index 70bdb7e9298b..14a031280d2b 100644 --- a/basegfx/source/tools/keystoplerp.cxx +++ b/basegfx/source/tools/keystoplerp.cxx @@ -19,6 +19,7 @@ #include <basegfx/tools/keystoplerp.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <osl/diagnose.h> #include <algorithm> diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index d7928d883397..3f873e4e6d5c 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -41,6 +41,7 @@ #include <comphelper/documentinfo.hxx> #include <unotools/eventlisteneradapter.hxx> +#include <osl/getglobalmutex.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index e0e1decaa9b3..9d8ac5762584 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -23,6 +23,7 @@ #include "image.hxx" #include <limits> #include <algorithm> +#include <osl/diagnose.h> #include <com/sun/star/script/ModuleType.hpp> // nInc is the increment size of the buffers diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index a838be8f0bab..2142324f4662 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -21,6 +21,7 @@ #include "sbcomp.hxx" #include "sbunoobj.hxx" #include <svtools/miscopt.hxx> +#include <osl/diagnose.h> #include <com/sun/star/reflection/theCoreReflection.hpp> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index c7e122ae317f..9ce5bdb6cc8f 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -19,6 +19,7 @@ #include <basic/sbx.hxx> #include "sbcomp.hxx" +#include <osl/diagnose.h> #include <com/sun/star/script/ModuleType.hpp> #include <svtools/miscopt.hxx> diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx index 99e02e3b3ae5..9cef215bec82 100644 --- a/basic/source/comp/symtbl.cxx +++ b/basic/source/comp/symtbl.cxx @@ -19,6 +19,9 @@ #include "sbcomp.hxx" + +#include <osl/diagnose.h> + #include <stdio.h> #include <string.h> #include <ctype.h> diff --git a/binaryurp/source/outgoingrequests.cxx b/binaryurp/source/outgoingrequests.cxx index 06b2553629e9..1f4254f6c672 100644 --- a/binaryurp/source/outgoingrequests.cxx +++ b/binaryurp/source/outgoingrequests.cxx @@ -22,6 +22,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "rtl/byteseq.hxx" #include "osl/mutex.hxx" +#include <osl/diagnose.h> #include "lessoperators.hxx" #include "outgoingrequest.hxx" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx index facdcddad4bc..2a6668684912 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx @@ -54,6 +54,8 @@ #include "abi.hxx" +#include <osl/diagnose.h> + using namespace x86_64; /* Register class used for passing given 64bit part of the argument. diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx index 3c489d425f8b..aa91f3f7ed21 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx @@ -24,6 +24,7 @@ #include <rtl/alloc.h> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx index 52826e07c307..c0da72837aa2 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx @@ -24,6 +24,7 @@ #include "rtl/alloc.h" #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx index facdcddad4bc..2a6668684912 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx @@ -54,6 +54,8 @@ #include "abi.hxx" +#include <osl/diagnose.h> + using namespace x86_64; /* Register class used for passing given 64bit part of the argument. diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 53992842142a..a299fc5b2eb9 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -24,6 +24,7 @@ #include <rtl/alloc.h> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx index 1ff023427a08..fd8eab4d9e2f 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx @@ -24,6 +24,7 @@ #include "rtl/alloc.h" #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx index 0927cf6f6a1a..48a865019faf 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx @@ -20,6 +20,7 @@ #include <malloc.h> +#include <osl/diagnose.h> #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> #include <typelib/typedescription.hxx> diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index d2b9d5c02c95..27c8ef6f4157 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -28,6 +28,7 @@ #include "rtl/alloc.h" #include "rtl/strbuf.hxx" #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> #include "com/sun/star/uno/Any.hxx" diff --git a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx index 55cbeb2167c4..a7cf474c8947 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> +#include <osl/diagnose.h> #include "bridges/cpp_uno/shared/bridge.hxx" #include "bridges/cpp_uno/shared/types.hxx" diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index 7ecfe52b5c8e..64d591a5dad1 100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx @@ -25,6 +25,7 @@ #include <comphelper/anytostring.hxx> #include <basegfx/vector/b2ivector.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index a7e7dc1d8bbe..78a0076f82f8 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -21,6 +21,7 @@ #include "macros.hxx" #include "RelativeSizeHelper.hxx" #include "ReferenceSizePropertyProvider.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 85d8e7e03848..cfee9372cf23 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -20,6 +20,7 @@ #include "WrappedNumberFormatProperty.hxx" #include "macros.hxx" #include <unonames.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 9574f36f7775..a5acbc5be764 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -20,6 +20,7 @@ #include "ItemConverter.hxx" #include "macros.hxx" #include <com/sun/star/lang/XComponent.hpp> +#include <osl/diagnose.h> #include <svl/itemprop.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 7230d94b2061..ae3ac82a59b7 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -25,6 +25,7 @@ #include "GraphicPropertyItemConverter.hxx" #include <com/sun/star/chart2/XRegressionCurve.hpp> +#include <osl/diagnose.h> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index a5984edea742..0fd2cf4448aa 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -29,6 +29,7 @@ #include <comphelper/documentconstants.hxx> #include <sot/storage.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index d7d27eeb2090..8571f94defad 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <basegfx/matrix/b3dhommatrix.hxx> #include <cstdarg> diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 0278fb72d283..b40243e373ff 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -20,6 +20,7 @@ #include "MeanValueRegressionCurveCalculator.hxx" #include "macros.hxx" +#include <osl/diagnose.h> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 1a65728e0316..13b7ed18716b 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -25,6 +25,7 @@ #include <tools/color.hxx> #include <i18nlangtag/mslangid.hxx> #include <com/sun/star/util/Date.hpp> +#include <osl/diagnose.h> namespace chart { diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 2ca570a2da7f..365e3a374c67 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -22,6 +22,7 @@ #include "macros.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <osl/diagnose.h> #include <vector> #include <algorithm> diff --git a/chart2/source/tools/RelativePositionHelper.cxx b/chart2/source/tools/RelativePositionHelper.cxx index f195c837a841..233bc986346e 100644 --- a/chart2/source/tools/RelativePositionHelper.cxx +++ b/chart2/source/tools/RelativePositionHelper.cxx @@ -19,6 +19,7 @@ #include "RelativePositionHelper.hxx" #include <rtl/math.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index b66a2c7c64e5..526499fada2e 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -20,6 +20,7 @@ #include "XMLRangeHelper.hxx" #include <unotools/charclass.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <algorithm> #include <functional> diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 9992f9defd04..ee814eb6a356 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -19,6 +19,7 @@ #include "Splines.hxx" #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <vector> #include <algorithm> diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index 85f876264745..d391c4f1fd99 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -21,6 +21,8 @@ #include "CommonConverters.hxx" #include "BaseGFXHelper.hxx" +#include <osl/diagnose.h> + #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index c27389910634..8d1334e128f5 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -21,6 +21,7 @@ #include "PlottingPositionHelper.hxx" #include "AbstractShapeFactory.hxx" #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <com/sun/star/chart2/DataPointLabel.hpp> namespace chart diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index 97b0fa08645d..aa1a1a03a0ca 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -18,6 +18,7 @@ */ #include <sal/alloca.h> +#include <osl/diagnose.h> #include "rtl/ustrbuf.hxx" #include "cli_base.h" #include "cli_bridge.h" diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 96f255dadb01..d40a2a078215 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <cppuhelper/typeprovider.hxx> +#include <osl/diagnose.h> #include <set> #include <string.h> diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 25a5e96dba95..4bda261e5611 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <osl/time.h> +#include <osl/diagnose.h> #include <rtl/digest.h> #include <rtl/random.h> #include <string.h> diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index d34015753e4f..4c4d56d443f3 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/resource/XResourceBundle.hpp> #include <com/sun/star/resource/XResourceBundleLoader.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index 249f47466a40..ee9b6e59ee33 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -22,6 +22,8 @@ #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/document/XTypeDetection.hpp> +#include <osl/diagnose.h> + #include <comphelper/fileformat.h> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 67d14c1be631..2b01808f55d1 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -35,7 +35,9 @@ #include <com/sun/star/xml/crypto/DigestID.hpp> #include <vector> + #include <rtl/digest.h> +#include <osl/diagnose.h> #include <ucbhelper/content.hxx> diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 1f29c4abd478..4c66d8c86ad3 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -21,6 +21,8 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <comphelper/solarmutex.hxx> +#include <osl/diagnose.h> + #include <boost/scoped_ptr.hpp> using namespace ::comphelper; diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 6cb5abfe24da..5ba477a43785 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -24,6 +24,8 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <comphelper/solarmutex.hxx> +#include <osl/diagnose.h> + #include <boost/scoped_ptr.hpp> diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index b85fe96ac4a7..9c522c721614 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -19,6 +19,8 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/propertysethelper.hxx> +#include <osl/diagnose.h> + #include <boost/scoped_array.hpp> using namespace ::comphelper; diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index ce42d4ada70e..3b107336a0ea 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -20,6 +20,8 @@ #include <comphelper/propertysetinfo.hxx> +#include <osl/diagnose.h> + using namespace ::comphelper; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 9f71eb2f3f3a..37016836d223 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase4.hxx> +#include <osl/diagnose.h> #include <string.h> #include <vector> diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index 5bc44a52e877..6e8f93b91f75 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -19,6 +19,8 @@ #include <comphelper/seqstream.hxx> +#include <osl/diagnose.h> + #include <memory.h> namespace comphelper diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx index 9157e3302680..ac573acfce80 100644 --- a/connectivity/source/commontools/AutoRetrievingBase.cxx +++ b/connectivity/source/commontools/AutoRetrievingBase.cxx @@ -19,6 +19,8 @@ #include "AutoRetrievingBase.hxx" +#include <osl/diagnose.h> + namespace connectivity { OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const OUString& _sInsertStatement) const diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 39e46dbb02c2..37c4e655991f 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -25,6 +25,7 @@ #include <comphelper/officeresourcebundle.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <string.h> diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 9976b55a64b1..8639743f3b55 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -30,6 +30,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <osl/diagnose.h> #include "diagnose_ex.h" using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 8416f41abaa2..d3cb62b889b0 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -26,6 +26,7 @@ #include "hsqldb/StorageNativeInputStream.h" #include "accesslog.hxx" #include "diagnose_ex.h" +#include <osl/diagnose.h> #include <string.h> diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 08e660d67b13..8e30cfe3697c 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include "diagnose_ex.h" +#include <osl/diagnose.h> #include <osl/thread.h> #include <o3tl/compat_functional.hxx> diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index a39f617e416f..d6ca0cf1b89e 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include "hsqldb/StorageFileAccess.h" #include "hsqldb/HStorageMap.hxx" - +#include <osl/diagnose.h> using namespace ::com::sun::star::container; diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index cfe2a60d5b31..a0ea03530a3a 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -33,6 +33,7 @@ #include <jvmaccess/virtualmachine.hxx> #include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <osl/diagnose.h> #include "accesslog.hxx" #include <limits> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 9b36e68f2fd0..c66a68f64226 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -19,6 +19,7 @@ #include "MNSINIParser.hxx" #include <rtl/byteseq.hxx> +#include <osl/diagnose.h> IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException ) { diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx index d98ffd2ac139..fa59576e68cf 100644 --- a/cppcanvas/source/wrapper/implcolor.cxx +++ b/cppcanvas/source/wrapper/implcolor.cxx @@ -20,6 +20,7 @@ #include <implcolor.hxx> #include <tools.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index f390ed6c0115..927377811c42 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -19,6 +19,7 @@ #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 24b81275c299..378544edf652 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -21,6 +21,7 @@ #include "osl/thread.hxx" #include "osl/conditn.hxx" #include "osl/mutex.hxx" +#include <osl/diagnose.h> #include "cppu/helper/purpenv/Environment.hxx" #include "cppu/helper/purpenv/Mapping.hxx" diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index a7d0de7688bc..3393580d5bad 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -21,6 +21,7 @@ #include "osl/mutex.hxx" #include "osl/thread.h" #include "osl/thread.hxx" +#include <osl/diagnose.h> #include "uno/dispatcher.h" #include "typelib/typedescription.hxx" #include "cppu/helper/purpenv/Environment.hxx" diff --git a/cppuhelper/source/implementationentry.cxx b/cppuhelper/source/implementationentry.cxx index 6b10eaca41f5..d810e5e58c27 100644 --- a/cppuhelper/source/implementationentry.cxx +++ b/cppuhelper/source/implementationentry.cxx @@ -19,6 +19,8 @@ #include <cppuhelper/implementationentry.hxx> +#include <osl/diagnose.h> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index cac802cbfe44..9a35a3bdb21c 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -19,6 +19,7 @@ #include "sdbcdriverenum.hxx" #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 1e43dad351bf..40c0d18ff07b 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> +#include <osl/diagnose.h> #include <comphelper/namedvaluecollection.hxx> #include <algorithm> diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 83df52ef2738..d5b98ffbaaee 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <functional> diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index 3d59a5ee4398..7fb7c99c3a27 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -23,6 +23,8 @@ #include <svl/stritem.hxx> #include <svl/eitem.hxx> +#include <osl/diagnose.h> + #include <cassert> #include <boost/scoped_ptr.hpp> diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 44ffd4dd8ee7..d27e3dadb494 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -18,6 +18,8 @@ */ #include "TableFieldDescription.hxx" + +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 0d6607b05957..f6bfa841c49a 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -18,6 +18,7 @@ */ #include "TableWindowData.hxx" +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 7ccb60924fcb..7ff3e911f2ed 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/uno/Reference.hxx> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <ucbhelper/content.hxx> diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 2c35355f5c98..0921d69df862 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -22,6 +22,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index a63d52747556..7f217f185cc3 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -24,6 +24,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include <rtl/bootstrap.hxx> +#include <osl/diagnose.h> #define PLATFORM_ALL "all" #define PLATFORM_WIN_X86 "windows_x86" diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index f8bde2e2b47c..3ce55eaf0252 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -24,6 +24,7 @@ #include "dp_identifier.hxx" #include "dp_descriptioninfoset.hxx" +#include <osl/diagnose.h> #include <rtl/bootstrap.hxx> using namespace ::com::sun::star; diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 888bb5ef875d..f8dd6ba274df 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -43,6 +43,7 @@ #include <stdio.h> #include <osl/thread.hxx> +#include <osl/diagnose.h> #define SERVICE_NAME "com.sun.star.migration.Java" #define IMPL_NAME "com.sun.star.comp.desktop.migration.Java" diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index 607c4116dafb..9d4813be1194 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -18,6 +18,8 @@ */ #include <drawinglayer/primitive3d/sdrextrudelathetools3d.hxx> + +#include <osl/diagnose.h> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index a88b32bc2534..6198d8d56e75 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -19,6 +19,7 @@ #include <sal/types.h> #include <rtl/process.h> +#include <osl/diagnose.h> #include "DOTransferable.hxx" #include "../misc/ImplHelper.hxx" diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index dec133314207..642489275c07 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -22,6 +22,7 @@ #include <editeng/editeng.hxx> #include <svl/itemset.hxx> +#include <osl/diagnose.h> SvxEditSourceHint::SvxEditSourceHint( sal_uLong _nId ) : diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx index ac5f6a0e1040..b20565cb224d 100644 --- a/editeng/source/uno/unoedsrc.cxx +++ b/editeng/source/uno/unoedsrc.cxx @@ -21,7 +21,7 @@ #include <editeng/unoedsrc.hxx> - +#include <osl/diagnose.h> void SvxEditSource::addRange( SvxUnoTextRangeBase* ) diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 499361a14c44..070000054569 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -27,6 +27,7 @@ #include <editeng/editids.hrc> #include <editeng/editeng.hxx> #include <svl/itempool.hxx> +#include <osl/diagnose.h> #include <algorithm> using namespace ::com::sun::star; diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index 1c0e583398ab..1cfe18a03b13 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/embed/XEmbeddedObjectCreator.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <osl/diagnose.h> #include <cppuhelper/implbase2.hxx> #include <comphelper/mimeconfighelper.hxx> diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index d6375454eff9..171b41f14b28 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/embed/XEmbeddedObjectCreator.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <osl/diagnose.h> #include <cppuhelper/implbase2.hxx> #include <comphelper/mimeconfighelper.hxx> diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx index 2076e5afaeab..e381aa8313f3 100644 --- a/embeddedobj/source/msole/closepreventer.cxx +++ b/embeddedobj/source/msole/closepreventer.cxx @@ -19,6 +19,8 @@ #include "closepreventer.hxx" +#include <osl/diagnose.h> + void SAL_CALL OClosePreventer::queryClosing( const ::com::sun::star::lang::EventObject&, sal_Bool ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 7b9fe7827865..df15f97499de 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -42,6 +42,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/classids.hxx> +#include <osl/diagnose.h> #include <osl/thread.hxx> #include <closepreventer.hxx> diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index eefaf2725f69..b4dac71a4bc4 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase2.hxx> +#include <osl/diagnose.h> class OleEmbeddedObjectFactory : public ::cppu::WeakImplHelper2< diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index a2db313a7778..d68e6825093d 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -25,6 +25,7 @@ #include "embeddoc.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/typeprovider.hxx> +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <osl/thread.h> diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 2acd02731973..39bd5b86f8ed 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -21,6 +21,8 @@ #include "ldapaccess.hxx" #include <boost/noncopyable.hpp> + +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx index a6ce9fdae1b0..1b647e84cdee 100644 --- a/extensions/source/dbpilots/dbptools.cxx +++ b/extensions/source/dbpilots/dbptools.cxx @@ -19,6 +19,7 @@ #include "dbptools.hxx" #include <tools/debug.hxx> +#include <osl/diagnose.h> namespace dbp diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index 3191c4f413db..dd6364b76633 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -19,6 +19,7 @@ #include "unotypewrapper.hxx" #include "rtl/ustring.hxx" +#include <osl/diagnose.h> bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx index 5b9d3169a586..51b2b9e7196a 100644 --- a/extensions/source/propctrlr/unourl.cxx +++ b/extensions/source/propctrlr/unourl.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> namespace pcr diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx index 18441620a042..8334af630701 100644 --- a/extensions/source/propctrlr/xsddatatypes.cxx +++ b/extensions/source/propctrlr/xsddatatypes.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/xsd/XDataType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/debug.hxx> +#include <osl/diagnose.h> namespace pcr diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index 8c0d6d6c4aa2..092f141ec861 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -30,6 +30,7 @@ # include <curl/curl.h> #endif +#include <osl/diagnose.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 6287c9c19e3f..b10a97f485e1 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -33,6 +33,7 @@ #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> +#include <osl/diagnose.h> #include <osl/process.h> #include <cppuhelper/implbase1.hxx> diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index fe41615e53a7..54285446cb29 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -51,6 +51,7 @@ #include <rtl/ref.hxx> #include <rtl/bootstrap.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <osl/process.h> #include <osl/conditn.hxx> diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index 65945afdc0d6..ef0b66fe686a 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -26,6 +26,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> +#include <osl/diagnose.h> + namespace filter{ namespace config{ diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index 2869f34bef3d..4dea850765a7 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "querytokenizer.hxx" +#include <osl/diagnose.h> + namespace filter{ namespace config{ diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 88af7e8db0a3..a2c859827cb3 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> #include <com/sun/star/form/XForm.hpp> +#include <osl/diagnose.h> #include <filter/msfilter/msocximex.hxx> using namespace ::com::sun::star; diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx index 847ba34ddf98..f833fb13e288 100644 --- a/filter/source/msfilter/rtfutil.cxx +++ b/filter/source/msfilter/rtfutil.cxx @@ -9,6 +9,7 @@ #include <filter/msfilter/rtfutil.hxx> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include <svtools/rtfkeywd.hxx> namespace msfilter diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index fe800ef9dcb0..64b6dd194b84 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -11,6 +11,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase3.hxx> +#include <osl/diagnose.h> #include <sax/tools/documenthandleradapter.hxx> diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index e4064cfb04b3..2d73c330dbf9 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include "exporter.hxx" diff --git a/filter/source/svg/parserfragments.cxx b/filter/source/svg/parserfragments.cxx index 812f808d5723..9310db89456c 100644 --- a/filter/source/svg/parserfragments.cxx +++ b/filter/source/svg/parserfragments.cxx @@ -13,6 +13,7 @@ #include <basegfx/tools/canvastools.hxx> #include <com/sun/star/geometry/AffineMatrix2D.hpp> +#include <osl/diagnose.h> #include <string.h> #include <limits.h> diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx index 9bbf917502e1..d0165b174898 100644 --- a/filter/source/svg/units.cxx +++ b/filter/source/svg/units.cxx @@ -11,6 +11,7 @@ #include <basegfx/range/b2drange.hxx> #include "gfxtypes.hxx" #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <boost/spirit/include/classic.hpp> namespace svgi diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 18904ea007bc..a341316574ba 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -19,6 +19,7 @@ #include "controlfeatureinterception.hxx" #include "urltransformer.hxx" +#include <osl/diagnose.h> namespace frm diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 1d647d74eb48..b3ad06581eef 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/form/runtime/FormFeature.hpp> #include <tools/debug.hxx> - +#include <osl/diagnose.h> namespace frm diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index 7d1b63bece01..9f70e3cddf2f 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Type.hxx> +#include <osl/diagnose.h> typedef cppu::WeakImplHelper1< com::sun::star::container::XNameContainer diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 4dd5e59c2014..d51e71f8bed9 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -35,6 +35,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/SearchAlgorithms.hpp> +#include <osl/diagnose.h> + #include <unotools/textsearch.hxx> #include <comphelper/processfactory.hxx> diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index ddaeafa8d8b1..4dee77454adc 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -26,6 +26,7 @@ #include <o3tl/compat_functional.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <tools/date.hxx> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx index 2ae94088ca52..50f9f3c972a8 100644 --- a/forms/source/xforms/enumeration.cxx +++ b/forms/source/xforms/enumeration.cxx @@ -20,6 +20,8 @@ #include "enumeration.hxx" +#include <osl/diagnose.h> + #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index b6641a0e6b4d..a0614572db5f 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -21,6 +21,7 @@ #include "resourcehelper.hxx" #include "frm_resource.hxx" +#include <osl/diagnose.h> #include <rtl/ustring.hxx> diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 2c2f670cdbce..0abdab0c8dcd 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -21,6 +21,7 @@ #include "submission.hxx" #include "serialization_app_xml.hxx" +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/string.hxx> diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 06cc8126bb51..92486dca19d4 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -24,6 +24,7 @@ #include <string.h> #include <limits.h> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include "formula/token.hxx" #include "formula/tokenarray.hxx" diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index d5b7df63d5ca..3774e8bcdc2b 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -29,6 +29,7 @@ #include <ucbhelper/commandenvironment.hxx> #include <tools/solar.h> #include <tools/debug.hxx> +#include <osl/diagnose.h> namespace svt diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/source/office/fpsofficeResMgr.hxx index 7fb6f05ca5b9..76b45385a5ec 100644 --- a/fpicker/source/office/fpsofficeResMgr.hxx +++ b/fpicker/source/office/fpsofficeResMgr.hxx @@ -10,6 +10,7 @@ #define INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX #include <rtl/instance.hxx> +#include <osl/getglobalmutex.hxx> #include <tools/resmgr.hxx> namespace diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 949ffafede4e..8994f9a2c027 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -37,6 +37,7 @@ #include <unotools/localfilehelper.hxx> #include "unotools/useroptions.hxx" #include "rtl/instance.hxx" +#include <osl/getglobalmutex.hxx> #include <svl/svl.hrc> using namespace ::com::sun::star::uno; diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx index 25225d587806..6800e677ee54 100644 --- a/fpicker/source/win32/filepicker/controlcommand.cxx +++ b/fpicker/source/win32/filepicker/controlcommand.cxx @@ -22,8 +22,7 @@ #include "controlcommandresult.hxx" #include "filepickerstate.hxx" - - +#include <osl/diagnose.h> CControlCommand::CControlCommand( sal_Int16 aControlId ) : diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx index 380750eb4d3b..1655fe2fb4cb 100644 --- a/fpicker/source/win32/filepicker/previewadapter.cxx +++ b/fpicker/source/win32/filepicker/previewadapter.cxx @@ -22,6 +22,7 @@ #include "previewadapter.hxx" #include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> +#include <osl/diagnose.h> #include "dibpreview.hxx" #include "../misc/WinImplHelper.hxx" diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx index 683c8e8209e7..4e2fb2c07835 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.hxx +++ b/fpicker/source/win32/folderpicker/MtaFop.hxx @@ -22,6 +22,7 @@ #include <sal/types.h> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <utility> diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 1eb828e82cef..c4a62bbf3d8b 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -19,6 +19,8 @@ #include <framework/preventduplicateinteraction.hxx> +#include <osl/diagnose.h> + #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index af7b2317259e..59aed8a61900 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -25,6 +25,7 @@ #include "hwpreader.hxx" #include <math.h> +#include <osl/diagnose.h> #include <comphelper/newarray.hxx> #include "fontmap.hxx" diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index e7b130912966..684ef2b7e5e2 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/text/HoriOrientation.hpp> +#include <osl/diagnose.h> #include <localedata.hxx> #include <nativenumbersupplier.hxx> #include <stdio.h> diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index f223026aa17f..85a16dcaaa10 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -22,6 +22,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <string.h> #include <stdio.h> #include "rtl/instance.hxx" diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index f83f901b17de..fc9d3b8a8cd8 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -25,6 +25,7 @@ #include <globals.hxx> #include <hash.hxx> #include <database.hxx> +#include <osl/diagnose.h> static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue ) diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 6af559ca757b..96bd62e91794 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -22,6 +22,7 @@ #include <stdio.h> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include <object.hxx> #include <globals.hxx> diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 023a92622118..f0853a7e86f1 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -21,6 +21,7 @@ #include <ctype.h> #include <stdio.h> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <slot.hxx> #include <globals.hxx> diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 465cbfcf7bd6..6e1972799f68 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -17,16 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <ctype.h> +#include <osl/diagnose.h> + #include <command.hxx> #include <globals.hxx> #include <database.hxx> -#include "sal/config.h" char const * SyntaxStrings[] = { "basic-type:", diff --git a/idlc/source/astdeclaration.cxx b/idlc/source/astdeclaration.cxx index f5adfeaa8e0b..c23894ed902a 100644 --- a/idlc/source/astdeclaration.cxx +++ b/idlc/source/astdeclaration.cxx @@ -20,6 +20,7 @@ #include <idlc/astdeclaration.hxx> #include <idlc/astscope.hxx> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> static OString sGlobal("::"); diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index c9a2c473f3fa..90b182c8de7d 100644 --- a/idlc/source/astdump.cxx +++ b/idlc/source/astdump.cxx @@ -29,6 +29,8 @@ #include <idlc/astsequence.hxx> #include "idlc/astoperation.hxx" +#include <osl/diagnose.h> + #include <registry/version.h> #include <registry/writer.hxx> diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 99d415dd8bd8..bb01c0a26a0c 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -23,6 +23,8 @@ #include <idlc/astscope.hxx> #include <idlc/errorhandler.hxx> +#include <osl/diagnose.h> + #include <limits.h> #include <float.h> #include <memory> diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx index 8bd8fb7cbfd9..f6b9eef824f1 100644 --- a/idlc/source/astinterface.cxx +++ b/idlc/source/astinterface.cxx @@ -25,6 +25,8 @@ #include <registry/version.h> #include <registry/writer.hxx> +#include <osl/diagnose.h> + AstInterface::AstInterface(const OString& name, AstInterface const * pInherits, AstScope* pScope) diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx index 172c2be57590..c57d14c65560 100644 --- a/idlc/source/astscope.cxx +++ b/idlc/source/astscope.cxx @@ -21,6 +21,7 @@ #include <idlc/astbasetype.hxx> #include <idlc/astinterface.hxx> #include <idlc/errorhandler.hxx> +#include <osl/diagnose.h> bool isGlobal(const OString& scopedName) diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 400778026c9c..af911c655d68 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -49,6 +49,7 @@ #include "attributeexceptions.hxx" #include "rtl/strbuf.hxx" +#include <osl/diagnose.h> #include <algorithm> #include <vector> diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 7a0ddb506b89..33287cee05dd 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -22,6 +22,9 @@ #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> + +#include <osl/diagnose.h> + #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include <vector> diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx index 162ef84a543b..92e7c03f4144 100644 --- a/include/basegfx/raster/rasterconvert3d.hxx +++ b/include/basegfx/raster/rasterconvert3d.hxx @@ -22,6 +22,9 @@ #include <sal/types.h> #include <vector> + +#include <osl/diagnose.h> + #include <basegfx/color/bcolor.hxx> #include <basegfx/vector/b3dvector.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 980ec6270ecc..389bd8865aca 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -29,6 +29,7 @@ #include <set> #include <boost/shared_ptr.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> // forward declarations namespace com diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 4b52c55e0682..2813af03c943 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -23,6 +23,8 @@ #include <functional> #include <vector> + +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <rtl/alloc.h> #include <com/sun/star/uno/Sequence.hxx> diff --git a/include/osl/file.hxx b/include/osl/file.hxx index 07773b826048..293f18d25aa6 100644 --- a/include/osl/file.hxx +++ b/include/osl/file.hxx @@ -30,6 +30,7 @@ #include <rtl/ustring.hxx> #include <osl/file.h> +#include <osl/diagnose.h> #include <rtl/byteseq.hxx> #include <stdio.h> diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx index e5331efc5291..0c095a2055d9 100644 --- a/include/osl/thread.hxx +++ b/include/osl/thread.hxx @@ -25,9 +25,6 @@ #include <cassert> #include <osl/time.h> - - -#include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/alloc.h> diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx index c54aa64018ae..c49e37125998 100644 --- a/include/rtl/byteseq.hxx +++ b/include/rtl/byteseq.hxx @@ -19,9 +19,7 @@ #ifndef INCLUDED_RTL_BYTESEQ_HXX #define INCLUDED_RTL_BYTESEQ_HXX -#include <osl/interlck.h> #include <rtl/byteseq.h> -#include <rtl/alloc.h> #include <new> diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx index f8b75a75c50f..25f51732fcd0 100644 --- a/include/rtl/instance.hxx +++ b/include/rtl/instance.hxx @@ -23,7 +23,9 @@ #include <sal/config.h> #include <osl/doublecheckedlocking.h> +#if ! HAVE_THREADSAFE_STATICS #include <osl/getglobalmutex.hxx> +#endif namespace { diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx index 77de66ab7348..942923ad6819 100644 --- a/include/rtl/ref.hxx +++ b/include/rtl/ref.hxx @@ -25,7 +25,6 @@ #include <cassert> #include <sal/types.h> -#include <osl/interlck.h> namespace rtl { diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx index 21cca1083914..0f65c430433a 100644 --- a/include/rtl/string.hxx +++ b/include/rtl/string.hxx @@ -27,7 +27,6 @@ #include <ostream> #include <string.h> -#include <osl/diagnose.h> #include <rtl/textenc.h> #include <rtl/string.h> #include <rtl/stringutils.hxx> diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index 8ed738158b3d..64c26cff3424 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -25,7 +25,6 @@ #include <cassert> #include <string.h> -#include <osl/diagnose.h> #include <rtl/ustrbuf.h> #include <rtl/ustring.hxx> #include <rtl/stringutils.hxx> diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 66b320f09636..72048b31eee3 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -27,7 +27,6 @@ #include <ostream> #include <string.h> -#include <osl/diagnose.h> #include <rtl/ustring.h> #include <rtl/string.hxx> #include <rtl/stringutils.hxx> diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 6b8b2c3f1673..d078ad1ae4fe 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -23,6 +23,8 @@ #include <svl/svldllapi.h> #include <tools/debug.hxx> #include <tools/stream.hxx> +#include <osl/diagnose.h> + #include <vector> #define SFX_REC_PRETAG_EXT sal_uInt8(0x00) // Pre-Tag for Extended-Records diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx index 2291bc2eef89..2ad5ae1708d7 100644 --- a/include/uno/mapping.hxx +++ b/include/uno/mapping.hxx @@ -22,6 +22,7 @@ #include <cppu/macros.hxx> #include <rtl/alloc.h> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <uno/mapping.h> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx index ff8bd91adf6b..f30cdcd062b0 100644 --- a/include/unotools/componentresmodule.hxx +++ b/include/unotools/componentresmodule.hxx @@ -24,6 +24,8 @@ #include <tools/resid.hxx> +#include <osl/getglobalmutex.hxx> + #include <memory> class ResMgr; diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx index f087b446590c..abab10b6851b 100644 --- a/io/source/acceptor/acc_pipe.cxx +++ b/io/source/acceptor/acc_pipe.cxx @@ -21,6 +21,7 @@ #include "acceptor.hxx" #include <com/sun/star/connection/ConnectionSetupException.hpp> +#include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> using namespace ::osl; diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx index 4ef6c70165f6..004842c7c9df 100644 --- a/io/source/stm/omark.cxx +++ b/io/source/stm/omark.cxx @@ -36,6 +36,7 @@ #include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <string.h> diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index 1a2173dd3c4c..a30513962888 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -26,6 +26,8 @@ #include "osl/security.hxx" #include "osl/file.hxx" #include "osl/module.hxx" +#include <osl/diagnose.h> +#include <osl/getglobalmutex.hxx> #include "rtl/byteseq.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/instance.hxx" diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index 8ed9df160237..14951bf3f91d 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -56,6 +56,7 @@ #include "first.hxx" #include "assert.h" #include <stdio.h> +#include <osl/diagnose.h> #include <sot/storinfo.hxx> namespace OpenStormBento { diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx index 04fa6f387ba6..580f5fd3f0bb 100644 --- a/lotuswordpro/source/filter/lwpfoundry.cxx +++ b/lotuswordpro/source/filter/lwpfoundry.cxx @@ -74,6 +74,9 @@ #include "lwpcharacterstyle.hxx" #include "lwpglobalmgr.hxx" +#include <osl/diagnose.h> + + LwpFoundry::LwpFoundry(LwpObjectStream *pStrm, LwpDocument* pDoc) : m_pDoc(pDoc) , m_bRegisteredAll(false) diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index ea90d087c097..aca528b75fbd 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -85,6 +85,9 @@ #include "lwpdocdata.hxx" #include "lwpglobalmgr.hxx" +#include <osl/diagnose.h> + + LwpFrib::LwpFrib(LwpPara* pPara) : m_pPara(pPara) , m_pNext(NULL) diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 2a2289e0d64d..25f367afcb85 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -23,6 +23,7 @@ #include <string.h> #include "oox/helper/attributelist.hxx" +#include <osl/diagnose.h> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/docpasswordhelper.hxx> diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index 1201aed900ce..5e6b739ddf9b 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -19,6 +19,7 @@ #include "oox/core/contexthandler2.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> namespace oox { namespace core { diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 5537f3e58077..48c5f2a09f9d 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -30,6 +30,7 @@ #include <cppuhelper/supportsservice.hxx> #include <unotools/mediadescriptor.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <rtl/instance.hxx> #include <rtl/uri.hxx> #include <set> diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 2e73390175b5..708632b237b9 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/xml/sax/XLocator.hpp> #include <cppuhelper/implbase1.hxx> +#include <osl/diagnose.h> #include "oox/core/fragmenthandler.hxx" namespace oox { diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index 4802b8f83e05..9bcd1e39e5b7 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -20,6 +20,7 @@ #include "oox/core/relationshandler.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" namespace oox { diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 18a443af0380..ccebf1829fd9 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -34,6 +34,7 @@ #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> +#include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> #include "oox/core/fastparser.hxx" #include "oox/core/fragmenthandler.hxx" diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 5182b99d1aca..54b3c50497f4 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <osl/time.h> +#include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> #include <vector> diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index 076789579f91..0090caeb46ca 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -37,6 +37,7 @@ #include "drawingml/chart/typegroupconverter.hxx" #include "oox/drawingml/lineproperties.hxx" #include "comphelper/processfactory.hxx" +#include <osl/diagnose.h> namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index 7304fbc2dc0a..b39ca7083f4a 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -26,6 +26,7 @@ #include "drawingml/chart/chartspacemodel.hxx" #include "oox/helper/containerhelper.hxx" #include "oox/core/xmlfilterbase.hxx" +#include <osl/diagnose.h> using ::oox::drawingml::chart::DataSequenceModel; using ::com::sun::star::uno::Any; diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx index d8f809227b49..5a7035b46bdf 100644 --- a/oox/source/drawingml/chart/chartdrawingfragment.cxx +++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx @@ -19,6 +19,8 @@ #include "drawingml/chart/chartdrawingfragment.hxx" +#include <osl/diagnose.h> + #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/graphicshapecontext.hxx" diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index 611d8d79bb87..022d8675499d 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <osl/diagnose.h> #include "basegfx/numeric/ftools.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/theme.hxx" diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index c157e741e63f..946b5bdb00d1 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -21,6 +21,8 @@ #include "oox/drawingml/chart/datasourcemodel.hxx" +#include <osl/diagnose.h> + namespace oox { namespace drawingml { namespace chart { diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index dd53dde4f410..c7d23688cf11 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <osl/thread.h> +#include <osl/diagnose.h> #include <rtl/strbuf.hxx> #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/fillproperties.hxx" diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index f15086df7e51..bc054ce8767f 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> +#include <osl/diagnose.h> #include "drawingml/chart/axisconverter.hxx" #include "drawingml/chart/plotareamodel.hxx" #include "drawingml/chart/typegroupconverter.hxx" diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index ab4f7df381b8..19253149be8a 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> +#include <osl/diagnose.h> #include <basegfx/numeric/ftools.hxx> #include "drawingml/chart/datasourceconverter.hxx" #include "drawingml/chart/seriesmodel.hxx" diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index e589335ed649..7c4a190becee 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -25,6 +25,8 @@ #include "drawingml/chart/titlemodel.hxx" #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> + namespace oox { namespace drawingml { diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 844aa0a62034..0aeba99d7ca0 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/chart2/XLegend.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XTitled.hpp> +#include <osl/diagnose.h> #include "drawingml/textbody.hxx" #include "drawingml/textparagraph.hxx" #include "drawingml/chart/datasourceconverter.hxx" diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 3a23d4431196..7a7b2a6bcd2c 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/drawing/LineStyle.hpp> +#include <osl/diagnose.h> #include "oox/drawingml/lineproperties.hxx" #include "drawingml/chart/seriesconverter.hxx" #include "drawingml/chart/typegroupmodel.hxx" diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index e6f3bf11de90..2d36cbf7fd6d 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -20,6 +20,7 @@ #include "oox/drawingml/color.hxx" #include <algorithm> #include <math.h> +#include <osl/diagnose.h> #include "oox/helper/containerhelper.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/drawingml/drawingmltypes.hxx" diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 6868e2c3d5d3..9d6db8f5852f 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -21,6 +21,7 @@ #include <drawingml/customshapeproperties.hxx> #include <com/sun/star/xml/sax/FastToken.hpp> +#include <osl/diagnose.h> #include <boost/unordered_map.hpp> #include "oox/helper/helper.hxx" #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 64fe53529e92..7a1b1714e99e 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> #include <basegfx/numeric/ftools.hxx> +#include <osl/diagnose.h> using namespace ::oox::core; using namespace ::com::sun::star; diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx index 04b14fb5c285..99d5614c2fc8 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.cxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx @@ -19,6 +19,7 @@ #include "constraintlistcontext.hxx" #include "oox/helper/attributelist.hxx" +#include <osl/diagnose.h> using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index b5b6dffa1f7a..209e71833313 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -22,6 +22,7 @@ #include "drawingml/fillpropertiesgroupcontext.hxx" #include "drawingml/shapepropertiescontext.hxx" #include "drawingml/textbodycontext.hxx" +#include <osl/diagnose.h> using namespace ::oox::core; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 8741353d2774..3961bebef28e 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <editeng/unoprnms.hxx> #include "drawingml/textbody.hxx" #include "drawingml/textparagraph.hxx" diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx index cd304b93d81c..7f43761d4643 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx @@ -20,6 +20,7 @@ #include "diagramdefinitioncontext.hxx" #include "layoutnodecontext.hxx" #include "datamodelcontext.hxx" +#include <osl/diagnose.h> using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index dc5f2db4755e..180a61310aa4 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -22,6 +22,7 @@ #include <functional> #include <boost/bind.hpp> +#include <osl/diagnose.h> #include <basegfx/numeric/ftools.hxx> #include "oox/helper/attributelist.hxx" diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index facfda417762..c92070648d73 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -25,6 +25,7 @@ #include "drawingml/customshapeproperties.hxx" #include "diagramdefinitioncontext.hxx" #include "constraintlistcontext.hxx" +#include <osl/diagnose.h> using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index c2fb438ba2e9..31529ed68be7 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/style/CaseMap.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> +#include <osl/diagnose.h> #include <sax/tools/converter.hxx> #include "oox/token/tokens.hxx" diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index fd45658d63e2..d25f8bfb10a0 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -40,6 +40,7 @@ #include "oox/drawingml/shapepropertymap.hxx" #include "oox/token/tokens.hxx" #include <rtl/math.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index aae50e80c45c..8dfb90c61e94 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/xml/sax/XFastContextHandler.hpp> +#include <osl/diagnose.h> #include "oox/helper/propertymap.hxx" #include "oox/core/relations.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index e8199815669b..efa1ab8f1088 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -20,6 +20,7 @@ #include "oox/drawingml/lineproperties.hxx" #include <vector> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/FlagSequence.hpp> diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index 2523156ade0d..21b47f1407b3 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -21,6 +21,7 @@ #include <list> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/string.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index a7b5f6bfba84..22bab141121b 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -29,6 +29,8 @@ #include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/text/PositionAndSpaceMode.hpp> +#include <osl/diagnose.h> + #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index f4b75dbe260c..ca744e8dfe4a 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -24,6 +24,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/XTextField.hpp> +#include <osl/diagnose.h> + #include "oox/helper/helper.hxx" #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index 5a4021589b37..ae7df6e64b9d 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -22,6 +22,7 @@ #include "ColorPropertySet.hxx" #include <cppuhelper/implbase1.hxx> +#include <osl/diagnose.h> #include <com/sun/star/drawing/FillStyle.hpp> using namespace ::com::sun::star; diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index 6c97222bdbe8..b514beb70fba 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -25,6 +25,7 @@ #include <vector> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "oox/helper/binaryoutputstream.hxx" namespace oox { diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index 805a9c52e94d..4a9d72317074 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include "oox/helper/helper.hxx" diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 180df3ca5e81..0638ffe6350b 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/util/MeasureUnit.hpp> +#include <osl/diagnose.h> #include <comphelper/seqstream.hxx> #include <vcl/wmf.hxx> #include "oox/helper/containerhelper.hxx" diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx index 4b6ef286ae36..d29755bd445e 100644 --- a/oox/source/helper/modelobjecthelper.cxx +++ b/oox/source/helper/modelobjecthelper.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "oox/helper/containerhelper.hxx" #include "oox/helper/helper.hxx" +#include <osl/diagnose.h> namespace oox { diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx index 307a78bf553b..36820d785a29 100644 --- a/oox/source/helper/progressbar.cxx +++ b/oox/source/helper/progressbar.cxx @@ -19,6 +19,7 @@ #include "oox/helper/progressbar.hxx" +#include <osl/diagnose.h> #include <com/sun/star/task/XStatusIndicator.hpp> #include "oox/helper/helper.hxx" diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 6404cf9bd56e..5dd70be2da0c 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -46,6 +46,7 @@ using ::com::sun::star::text::WritingMode; #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> #include <cppuhelper/implbase2.hxx> +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include "oox/token/propertynames.hxx" using ::com::sun::star::uno::Any; diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx index 1083d02a27fb..ff6e1f02562a 100644 --- a/oox/source/helper/storagebase.cxx +++ b/oox/source/helper/storagebase.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/io/XStream.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 82148c497bf0..d5e7894e49c5 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/TextInputStream.hpp> #include <cppuhelper/implbase1.hxx> +#include <osl/diagnose.h> #include <rtl/tencinfo.h> #include "oox/helper/binaryinputstream.hxx" diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index be8068c65836..d535ac63fe0a 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <osl/diagnose.h> #include <comphelper/storagehelper.hxx> #include "oox/helper/helper.hxx" diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx index 9df00e7672a2..cee80c4fa08a 100644 --- a/oox/source/ole/axbinaryreader.cxx +++ b/oox/source/ole/axbinaryreader.cxx @@ -21,6 +21,8 @@ #include "oox/ole/olehelper.hxx" +#include <osl/diagnose.h> + namespace oox { namespace ole { diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index d3d029773c79..4dca8af8d198 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <comphelper/string.hxx> #include <rtl/tencinfo.h> +#include <osl/diagnose.h> #include "oox/helper/attributelist.hxx" #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/containerhelper.hxx" diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx index 9f4d81267997..0f6604c3e0d1 100644 --- a/oox/source/ole/axcontrolfragment.cxx +++ b/oox/source/ole/axcontrolfragment.cxx @@ -26,6 +26,8 @@ #include "oox/ole/olehelper.hxx" #include "oox/ole/olestorage.hxx" +#include <osl/diagnose.h> + namespace oox { namespace ole { diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 88a80e81abbb..92aacef2d05d 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -20,6 +20,7 @@ #include "oox/ole/olehelper.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/token/tokens.hxx" diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index a2c008a917f5..f5d4df409748 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <osl/diagnose.h> #include "oox/helper/propertymap.hxx" namespace oox { diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 46533d0ae012..8d27eea44081 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> +#include <osl/diagnose.h> #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/helper/containerhelper.hxx" diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index c60007b5aeea..30d7e00eb9f0 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/io/XInputStreamProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <xmlscript/xmldlg_imexp.hxx> #include "oox/helper/attributelist.hxx" diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx index 18a1416d086f..d47726f88873 100644 --- a/oox/source/ole/vbahelper.cxx +++ b/oox/source/ole/vbahelper.cxx @@ -19,6 +19,7 @@ #include "oox/ole/vbahelper.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "oox/helper/binaryinputstream.hxx" namespace oox { diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 86689ebe6332..4c0bf9bd2b08 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/vba/XVBAModuleInfo.hpp> #include <com/sun/star/awt/KeyEvent.hpp> +#include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> #include <filter/msfilter/msvbahelper.hxx> #include "oox/helper/binaryinputstream.hxx" diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 6bffdd7a20ee..24d474d43501 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/configurationhelper.hxx> #include <comphelper/string.hxx> +#include <osl/diagnose.h> #include <rtl/tencinfo.h> #include <rtl/ustrbuf.h> #include "oox/helper/binaryinputstream.hxx" diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index c3d733a14b6b..1d6e7c627d6f 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <com/sun/star/uno/XComponentContext.hpp> +#include <osl/diagnose.h> #include "oox/ppt/pptimport.hxx" #include "oox/drawingml/chart/chartconverter.hxx" #include "oox/dump/pptxdumper.hxx" diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 811550ea561f..541e2a178cbb 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -19,6 +19,7 @@ #include "comphelper/anytostring.hxx" #include "cppuhelper/exc_hlp.hxx" +#include <osl/diagnose.h> #include <tools/multisel.hxx> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index 0edece08f800..95ea8393b22f 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <osl/diagnose.h> #include "oox/helper/propertyset.hxx" #include "oox/core/xmlfilterbase.hxx" diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index 54b28e6ad96a..82d0f9fe69ca 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -29,6 +29,8 @@ #include "drawingml/textliststyle.hxx" #include "drawingml/textparagraphproperties.hxx" +#include <osl/diagnose.h> + #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNamed.hpp> diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 45b007604ea5..45e7cce8353e 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/animations/TransitionType.hpp> #include <com/sun/star/animations/TransitionSubType.hpp> +#include <osl/diagnose.h> + #include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/token/namespaces.hxx" diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 97634ef86019..c808c7f4c316 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include "oox/core/xmlfilterbase.hxx" #include "oox/helper/containerhelper.hxx" diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 83f4c2955952..40569703c1e5 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/text/XTextRange.hpp> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include "oox/drawingml/color.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/fillproperties.hxx" diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 28ef7bb2cf6f..9fab15574663 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -23,6 +23,7 @@ #include <map> #include <string.h> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include "oox/helper/helper.hxx" #include "oox/helper/textinputstream.hxx" diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index 76daf625eeac..3b40e56c4d2e 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -22,6 +22,8 @@ #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmlshape.hxx" +#include <osl/diagnose.h> + namespace oox { namespace vml { diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index f3ed601f8eed..71905bad08df 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -25,6 +25,8 @@ #include "oox/vml/vmlshapecontainer.hxx" #include "oox/vml/vmltextboxcontext.hxx" +#include <osl/diagnose.h> + namespace oox { namespace vml { diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index c882021088b7..8a1d5fb3077c 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -21,6 +21,7 @@ #include "oox/vml/vmltextboxcontext.hxx" #include "oox/vml/vmlshape.hxx" #include <com/sun/star/drawing/XShape.hpp> +#include <osl/diagnose.h> namespace oox { namespace vml { diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 1ced0a6effed..b7a6acb9864a 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -29,6 +29,7 @@ #include <ManifestExport.hxx> #include <sax/tools/converter.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <comphelper/documentconstants.hxx> #include <comphelper/attributelist.hxx> diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 6c2511534686..02854f7216a0 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -20,6 +20,7 @@ #include <ManifestImport.hxx> #include <ManifestDefines.hxx> #include <sax/tools/converter.hxx> +#include <osl/diagnose.h> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> diff --git a/package/source/xstor/register.cxx b/package/source/xstor/register.cxx index bf57fc7c68a9..3020ddd59d0f 100644 --- a/package/source/xstor/register.cxx +++ b/package/source/xstor/register.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/InvalidRegistryException.hpp> #include <cppuhelper/factory.hxx> +#include <osl/diagnose.h> #include "xfactory.hxx" diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index ffc3f2216c58..54905ab305dc 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -27,6 +27,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/storagehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include "xfactory.hxx" #include "xstorage.hxx" diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 42628d72195b..70fe26dde107 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -20,6 +20,7 @@ #include <package/Deflater.hxx> #include <zlib.h> #include <com/sun/star/packages/zip/ZipConstants.hpp> +#include <osl/diagnose.h> #include <string.h> using namespace com::sun::star::packages::zip::ZipConstants; diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 329e45f17cff..c4fbcfa00c5f 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -29,6 +29,7 @@ #include <algorithm> #include <string.h> +#include <osl/diagnose.h> #include <osl/mutex.hxx> using namespace ::com::sun::star; diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 1fd536ff6046..cd4ed2e7491f 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -31,6 +31,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/processfactory.hxx> #include <rtl/digest.h> +#include <osl/diagnose.h> #include <vector> diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index 54600d5964e6..adbbf2573e5e 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -23,6 +23,7 @@ #include <comphelper/storagehelper.hxx> #include <osl/time.h> +#include <osl/diagnose.h> #include <PackageConstants.hxx> #include <ZipEntry.hxx> diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 902816ebe711..9c1252746f82 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/packages/zip/ZipConstants.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <comphelper/storagehelper.hxx> +#include <osl/diagnose.h> #include <osl/time.h> diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 2e64af8d92b1..8da7c1ff00af 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -65,6 +65,7 @@ #include <rtl/random.h> #include <rtl/instance.hxx> #include <osl/time.h> +#include <osl/diagnose.h> #include "com/sun/star/io/XAsyncOutputMonitor.hpp" #include <cstring> diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index 22b8cd1fd6ca..5b1d62feb8e2 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -18,6 +18,7 @@ */ #include "pyuno_impl.hxx" +#include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/ustrbuf.hxx> diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 8f4c7545845e..3825f2af9ab6 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -22,6 +22,7 @@ #include "pyuno_impl.hxx" +#include <osl/diagnose.h> #include <osl/thread.h> #include <osl/module.h> #include <osl/process.h> diff --git a/registry/source/keyimpl.cxx b/registry/source/keyimpl.cxx index ad335c72a449..3913c8289250 100644 --- a/registry/source/keyimpl.cxx +++ b/registry/source/keyimpl.cxx @@ -25,6 +25,7 @@ #include "reflcnst.hxx" #include "rtl/alloc.h" #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> using namespace store; diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index f8a5e8f4868a..76cd4cfaceaf 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -24,6 +24,7 @@ #include <string.h> #include <sal/types.h> #include <osl/endian.h> +#include <osl/diagnose.h> #include <registry/reflread.hxx> #include "registry/reader.h" diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx index 21698c165ceb..2512dfd253d8 100644 --- a/registry/source/regkey.cxx +++ b/registry/source/regkey.cxx @@ -22,6 +22,7 @@ #include <registry/registry.hxx> #include <rtl/alloc.h> +#include <osl/diagnose.h> #include "regimpl.hxx" #include "keyimpl.hxx" diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index 2c4f160f426c..28906d82f19b 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -16,7 +16,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #include "ReportVisitor.hxx" + +#include <osl/diagnose.h> + namespace reportdesign { using namespace com::sun::star; diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 85c4864bdf73..c83872fed3de 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -16,8 +16,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #include "conditionalexpression.hxx" +#include <osl/diagnose.h> + namespace rptui { diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index a4adffc10b40..3f7d430090a8 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "FunctionHelper.hxx" +#include <osl/diagnose.h> + namespace rptui { diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index 5d95b0dbea35..3099489752f0 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -18,6 +18,7 @@ */ #include "dlgedclip.hxx" #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> #include <com/sun/star/datatransfer/XMimeContentType.hpp> #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx index ce6c5d9d6d1c..e35a50dfbec5 100644 --- a/sal/osl/unx/file_stat.cxx +++ b/sal/osl/unx/file_stat.cxx @@ -26,6 +26,8 @@ #include <limits.h> #include <unistd.h> +#include <osl/diagnose.h> + #include "file_impl.hxx" #include "file_error_transl.h" #include "file_path_helper.hxx" diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index b6b7001c2524..93847d5513c9 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -36,6 +36,7 @@ #include "rtl/textenc.h" #include "sal/types.h" #include <sal/macros.h> +#include <osl/diagnose.h> namespace { diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx index 30f4efe39c7f..759d05ccba0c 100644 --- a/sal/rtl/ustrbuf.cxx +++ b/sal/rtl/ustrbuf.cxx @@ -20,6 +20,7 @@ #include <string.h> #include <osl/interlck.h> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <strimp.hxx> diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index 978a0092e970..b08970e7f075 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -38,6 +38,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index 063fea17735e..a83126908c48 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -31,6 +31,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> #include <osl/time.h> +#include <osl/diagnose.h> #include <algorithm> diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index bd6ea315a207..123ff9911861 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -51,6 +51,7 @@ #include <svl/sharedstringpool.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/fieldupdater.hxx> +#include <osl/diagnose.h> #include <cstring> #include <map> diff --git a/sc/source/core/data/columniterator.cxx b/sc/source/core/data/columniterator.cxx index 6b5c1a47176b..4e363f8f319e 100644 --- a/sc/source/core/data/columniterator.cxx +++ b/sc/source/core/data/columniterator.cxx @@ -12,6 +12,8 @@ #include "document.hxx" #include "table.hxx" +#include <osl/diagnose.h> + ScColumnTextWidthIterator::ScColumnTextWidthIterator(ScColumn& rCol, SCROW nStartRow, SCROW nEndRow) : mrCellTextAttrs(rCol.maCellTextAttrs), mnEnd(static_cast<size_t>(nEndRow)), diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 44efca627033..d3e51de75db1 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -28,6 +28,7 @@ #include "queryentry.hxx" #include "dpitemdata.hxx" +#include <osl/diagnose.h> #include <com/sun/star/i18n/LocaleDataItem.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index f59a4ba97d08..23d06a390b76 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -29,6 +29,7 @@ #include "dputil.hxx" #include "globalnames.hxx" +#include <osl/diagnose.h> #include <rtl/math.hxx> #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 2afe33f214fc..154cc13f85eb 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -27,6 +27,7 @@ #include "dputil.hxx" #include <sal/types.h> +#include <osl/diagnose.h> #include <comphelper/string.hxx> #include <com/sun/star/sheet/GeneralFunction.hpp> diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index c5f46df808dc..120175e329a2 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -30,6 +30,7 @@ #include "queryentry.hxx" #include <com/sun/star/sheet/DataPilotFieldFilter.hpp> +#include <osl/diagnose.h> #include <vector> #include <set> diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index 2fc2348697a7..3558c86777b1 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -27,6 +27,7 @@ #include <stdio.h> #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <tools/date.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index 4b4010765a30..362437f84a81 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -18,6 +18,7 @@ #include <unotools/calendarwrapper.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index 8dc24d421ba2..777583f1697c 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -19,6 +19,7 @@ #include "callform.hxx" #include "global.hxx" +#include <osl/diagnose.h> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <unotools/localfilehelper.hxx> diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 407fad527fa9..6a83437216fc 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -21,6 +21,8 @@ #include "global.hxx" #include "address.hxx" +#include <osl/diagnose.h> + // STATIC DATA ----------------------------------------------------------- ScMarkArray::ScMarkArray() : diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index 022a82002ca8..08b83497990b 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -23,6 +23,8 @@ #include <columnspanset.hxx> #include <fstalgorithm.hxx> +#include <osl/diagnose.h> + #include <mdds/flat_segment_tree.hpp> // STATIC DATA ----------------------------------------------------------- diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 6a9e8b96e4ad..55f86356a187 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -25,6 +25,8 @@ #include "address.hxx" #include "table.hxx" +#include <osl/diagnose.h> + ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) : nStart ( nNewStart ), nSize ( nNewSize ), diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 4bdb61f53e89..2a75d8a44d2f 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -19,6 +19,7 @@ #include "sheetevents.hxx" #include <com/sun/star/script/vba/VBAEventId.hpp> +#include <osl/diagnose.h> OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index 15e423f8ae29..e4e4dcc1f195 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -23,6 +23,8 @@ #include "queryparam.hxx" #include "subtotalparam.hxx" +#include <osl/diagnose.h> + ScSortParam::ScSortParam() { Clear(); diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx index 27bbeb361b24..95eba3f6c3ae 100644 --- a/sc/source/core/data/subtotalparam.cxx +++ b/sc/source/core/data/subtotalparam.cxx @@ -9,6 +9,8 @@ #include "subtotalparam.hxx" +#include <osl/diagnose.h> + ScSubTotalParam::ScSubTotalParam() { for ( sal_uInt16 i=0; i<MAXSUBTOTAL; i++ ) diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 835cbfed8062..c678680d5f40 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -22,6 +22,7 @@ #include <unotools/textsearch.hxx> #include <svl/srchitem.hxx> #include <editeng/editobj.hxx> +#include <osl/diagnose.h> #include "table.hxx" #include "formulacell.hxx" diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 9b00683450a7..6ee899d82a33 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -20,6 +20,7 @@ #include "tabprotection.hxx" #include <svl/PasswordHelper.hxx> #include <comphelper/docpasswordhelper.hxx> +#include <osl/diagnose.h> #include "document.hxx" #include <vector> diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index c8c8f185125b..6ed9449afcf7 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -25,6 +25,7 @@ #include "globstr.hrc" #include <sal/alloca.h> +#include <osl/diagnose.h> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index 512d3cd54d49..5bcb4f986988 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -24,6 +24,7 @@ #include "global.hxx" #include "document.hxx" #include "sc.hrc" +#include <osl/diagnose.h> #include <osl/thread.h> ScAddInAsyncs theAddInAsyncTbl; diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index b36b6e9e4685..8debf6b063e5 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -20,6 +20,8 @@ #include "chartpos.hxx" #include "document.hxx" #include "rechead.hxx" +#include <osl/diagnose.h> + #include <boost/scoped_array.hpp> namespace diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index 08215131094b..d2db66a9ca41 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -25,6 +25,7 @@ #include <formula/errorcodes.hxx> #include "formulacell.hxx" #include "tokenarray.hxx" +#include <osl/diagnose.h> #include <math.h> #include <string.h> diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index 0226832febc1..8ba6dc752cac 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -9,6 +9,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <osl/diagnose.h> #include "defaultsoptions.hxx" #include "miscuno.hxx" diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 5451eb1692a4..5de3489d0dd6 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -27,6 +27,7 @@ #include "scmatrix.hxx" #include <svl/sharedstringpool.hxx> +#include <osl/diagnose.h> #include <memory> #include <vector> diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index f87a68b15c9c..a4db66e4112d 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <osl/diagnose.h> #include "filtopt.hxx" #include "miscuno.hxx" diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 75af8ff355ae..c5ff895ca466 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -13,6 +13,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/LocaleDataItem.hpp> +#include <osl/diagnose.h> #include "formulaopt.hxx" #include "miscuno.hxx" diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx index dae7f109bd8e..dc90c8686c36 100644 --- a/sc/source/core/tool/jumpmatrix.cxx +++ b/sc/source/core/tool/jumpmatrix.cxx @@ -20,6 +20,8 @@ #include "jumpmatrix.hxx" #include "scmatrix.hxx" +#include <osl/diagnose.h> + namespace { // Don't bother with buffer overhead for less than y rows. const SCSIZE kBufferThreshhold = 128; diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index 00daafe9b7d6..2b60712c612f 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <osl/diagnose.h> #include "printopt.hxx" #include "miscuno.hxx" diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index d85e60b4c0e4..9b2ccfdc1ddf 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -21,6 +21,8 @@ #include "global.hxx" #include "address.hxx" +#include <osl/diagnose.h> + // STATIC DATA // Daten pro Tabelle diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index 5f8c769fe03b..00c7ba333880 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -22,6 +22,7 @@ #include "scmatrix.hxx" #include <svl/sharedstringpool.hxx> +#include <osl/diagnose.h> namespace { diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index ab5653f52cfc..7cf7bcd0ac07 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -20,6 +20,7 @@ #include <stdlib.h> #include <comphelper/string.hxx> #include <unotools/collatorwrapper.hxx> +#include <osl/diagnose.h> #include "rangelst.hxx" #include "document.hxx" diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 768fe7085837..16af01a8a699 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -22,6 +22,7 @@ #include <unotools/collatorwrapper.hxx> #include <unotools/transliterationwrapper.hxx> #include <com/sun/star/sheet/NamedRangeFlag.hpp> +#include <osl/diagnose.h> #include "token.hxx" #include "tokenarray.hxx" diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 4ebc2d6bfc7e..8c5818d13f51 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -19,6 +19,7 @@ #include <svl/zforlist.hxx> #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index b0b8c13ea7f0..32d3d96fe7b3 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -20,6 +20,8 @@ #include "rechead.hxx" #include "scerrors.hxx" +#include <osl/diagnose.h> + // STATIC DATA ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) : diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index b8c21d7e3609..cf00ee058146 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.cxx @@ -23,6 +23,8 @@ #include "bigrange.hxx" #include "chgtrack.hxx" +#include <osl/diagnose.h> + template< typename R, typename S, typename U > static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) { diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx index 8cfd6798504b..bf49fac15fe8 100644 --- a/sc/source/core/tool/stylehelper.cxx +++ b/sc/source/core/tool/stylehelper.cxx @@ -18,6 +18,7 @@ */ #include <rsc/rscsfx.hxx> +#include <osl/diagnose.h> #include "stylehelper.hxx" #include "global.hxx" diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index 6cc1c82a4916..79907ce39208 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -32,6 +32,7 @@ #include "ftools.hxx" #include "cellvalue.hxx" #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc, const ScAddress& rOutPos, const rtl_TextEncoding eNach, sal_uInt32 nDifOption ) diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 52ea17d77f20..59d8238ca9da 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -20,6 +20,7 @@ #include <math.h> #include <svl/zforlist.hxx> +#include <osl/diagnose.h> #include "attrib.hxx" #include "dif.hxx" #include "docpool.hxx" diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 45a62f135a42..22eef61d8023 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -20,6 +20,8 @@ #include "xerecord.hxx" #include "xeroot.hxx" +#include <osl/diagnose.h> + using namespace ::oox; // Base classes to export Excel records ======================================= diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 2e4cb8104ab8..2e716b09ce8d 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -19,6 +19,8 @@ #include <algorithm> #include <stdio.h> + +#include <osl/diagnose.h> #include "xlstyle.hxx" #include "xestyle.hxx" #include "xestream.hxx" diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 08b912bb55e7..7b42b8812d2a 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -20,6 +20,7 @@ #include <comphelper/docpasswordhelper.hxx> #include <comphelper/sequenceashashmap.hxx> #include <osl/thread.h> +#include <osl/diagnose.h> #include "xistream.hxx" #include "xlstring.hxx" #include "xiroot.hxx" diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index c73618bfcdbf..4e0fb7dbee4d 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -22,6 +22,8 @@ #include "xltracer.hxx" #include "xistream.hxx" +#include <osl/diagnose.h> + void XclAddress::Read( XclImpStream& rStrm, bool bCol16Bit ) { mnRow = rStrm.ReaduInt16(); diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 1112d62b7c36..38924a63a3bf 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -23,6 +23,7 @@ #include "xistream.hxx" #include "xestring.hxx" #include "xlpivot.hxx" +#include <osl/diagnose.h> #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> using ::com::sun::star::sheet::GeneralFunction; diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index a0a3230cc186..dca88f213692 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -19,6 +19,7 @@ #include "xlview.hxx" #include "ftools.hxx" +#include <osl/diagnose.h> // Structs ==================================================================== diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 1dfc9055a960..645323b9cf1c 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -20,6 +20,7 @@ #include "fprogressbar.hxx" #include "global.hxx" #include "progress.hxx" +#include <osl/diagnose.h> ScfProgressBar::ScfProgressSegment::ScfProgressSegment( sal_Size nSize ) : mnSize( nSize ), diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 6cd5236c62b7..21c43c45e089 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -18,6 +18,7 @@ */ #include "ftools.hxx" +#include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/strbuf.hxx> #include <tools/color.hxx> diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index fd2fd85d24ff..18b2988dd6fb 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <osl/diagnose.h> #include <tools/color.hxx> #include <comphelper/types.hxx> #include "ftools.hxx" diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 53ee81c24aec..332fef0b5c2a 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SC_SOURCE_FILTER_INC_NAMEBUFF_HXX #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include "compiler.hxx" #include "root.hxx" #include "xiroot.hxx" diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index 049c00de8898..e9abc4f56f86 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -22,6 +22,7 @@ #include "excelhandlers.hxx" #include "richstring.hxx" +#include <osl/diagnose.h> namespace oox { namespace xls { diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 8609d9302f29..9bf137d5a3f0 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -23,6 +23,7 @@ #include <string.h> #include "compiler.hxx" #include "tokenarray.hxx" +#include <osl/diagnose.h> #include <vector> diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 5515834ccc4c..98a6756473a8 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -22,6 +22,7 @@ #include <attrib.hxx> #include <document.hxx> +#include <osl/diagnose.h> // Defaultwerte const sal_uInt8 nDezStd = 0; // Dezimalstellen fuer Standard-Zellen diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index a508cb83406a..5576f51cf011 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SC_SOURCE_FILTER_INC_XLFORMULA_HXX #include <map> +#include <osl/diagnose.h> #include <formula/opcode.hxx> #include "address.hxx" #include "ftools.hxx" diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 37fee41ef548..dd14ad05df2e 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sheet/XSheetFilterDescriptor3.hpp> #include <com/sun/star/table/TableOrientation.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include <oox/helper/containerhelper.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 5a6258799e9b..ebbf63143004 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -21,6 +21,7 @@ #include <rtl/math.hxx> #include <rtl/tencinfo.h> +#include <osl/diagnose.h> #include "biffinputstream.hxx" #include "worksheethelper.hxx" #include <oox/helper/binaryoutputstream.hxx> diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index fd3f3853eba8..1e86645cfab4 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -21,6 +21,7 @@ #include <algorithm> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> namespace oox { namespace xls { diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 4aea74433b0b..bd5e1c3dbadf 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp> #include <com/sun/star/sheet/XSheetAnnotations.hpp> #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp> +#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include <oox/vml/vmlshape.hxx> #include "addressconverter.hxx" diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index dd8aac429d25..60e3e7c41b70 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <svl/intitem.hxx> #include <svl/sharedstringpool.hxx> #include <oox/helper/attributelist.hxx> diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index d8e164b5f14c..dd3d11430578 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -19,6 +19,7 @@ #include "connectionsbuffer.hxx" +#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 53f0d56350b1..85bc04e0b5b2 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sheet/SingleReference.hpp> #include <com/sun/star/sheet/XFormulaTokens.hpp> #include <com/sun/star/sheet/XPrintAreas.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 30e75e6cf464..1755d2d78b0e 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -20,6 +20,7 @@ #include "drawingbase.hxx" #include <com/sun/star/awt/Rectangle.hpp> +#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include <oox/helper/binaryinputstream.hxx> #include "unitconverter.hxx" diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 17f1b55eeb94..62e24483c572 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/drawing/PointSequenceSequence.hpp> #include <com/sun/star/drawing/PolygonKind.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include <osl/diagnose.h> #include <oox/core/filterbase.hxx> #include <oox/drawingml/fillproperties.hxx> #include <oox/drawingml/lineproperties.hxx> diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index 24fe4a286e60..c316cb7be381 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/data/XSheetDataProvider.hpp> +#include <osl/diagnose.h> #include <oox/core/filterbase.hxx> #include <oox/drawingml/chart/datasourcemodel.hxx> #include <oox/helper/containerhelper.hxx> diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 335c90e287bd..06ab0db88409 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -20,6 +20,7 @@ #include "excelfilter.hxx" #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <osl/diagnose.h> #include <oox/helper/binaryinputstream.hxx> #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index 9b034e2c8ab1..fa486d037190 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sheet/XDDELinkResults.hpp> #include <com/sun/star/sheet/XExternalDocLink.hpp> #include <com/sun/star/sheet/XExternalDocLinks.hpp> +#include <osl/diagnose.h> #include <rtl/strbuf.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 641e70e1cd89..5b07c1ed4e5e 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/sheet/XFormulaParser.hpp> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/containerhelper.hxx> diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index ba99aa6fe54a..54743dcf4217 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sheet/NameToken.hpp> #include <com/sun/star/sheet/ReferenceFlags.hpp> #include <com/sun/star/sheet/SingleReference.hpp> +#include <osl/diagnose.h> #include <oox/core/filterbase.hxx> #include <oox/token/properties.hxx> #include "addressconverter.hxx" diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 0464e55c01da..b34ddb901f4c 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -29,6 +29,7 @@ #include <officecfg/System.hxx> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> +#include <osl/diagnose.h> #include <osl/thread.h> #include <rtl/ustrbuf.hxx> #include <svl/intitem.hxx> diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index a95c05c2e7ac..2db4f534d55a 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -20,6 +20,7 @@ #include "ooxformulaparser.hxx" #include <com/sun/star/uno/XComponentContext.hpp> +#include <osl/diagnose.h> #include <cppuhelper/supportsservice.hxx> #include "formulaparser.hxx" diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index cab987616a80..48e7b591bd12 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> #include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp> #include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 452fa14b298c..d6ee51d1c70a 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -19,6 +19,7 @@ #include "pivotcachefragment.hxx" +#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include "addressconverter.hxx" #include "biffinputstream.hxx" diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 57c7c1894ba9..b2e7cb915657 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/sheet/XAreaLink.hpp> #include <com/sun/star/sheet/XAreaLinks.hpp> +#include <osl/diagnose.h> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> #include <oox/token/properties.hxx> diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 4e59dbf53525..733b70dff4de 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/sheet/XDatabaseRange.hpp> #include <com/sun/star/sheet/XDatabaseRanges.hpp> +#include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index a776cbb0eeb7..84a1f2617315 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/awt/XFont.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <osl/diagnose.h> #include <rtl/math.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 8ff5c55b7ca6..75fa731dde58 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/document/NamedPropertyValues.hpp> +#include <osl/diagnose.h> #include <unotools/mediadescriptor.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index cc8147ecd502..85385aaf35f2 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/sheet/XExternalSheetName.hpp> #include <com/sun/star/sheet/XSheetLinkable.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/attributelist.hxx> diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 6f85adc4112b..aaa45a9b79ba 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/text/XText.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <oox/core/filterbase.hxx> #include <oox/helper/propertyset.hxx> diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index e4fe55c0cd1a..c6974192467d 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -24,6 +24,7 @@ #include "chgviset.hxx" #include "rangeutl.hxx" #include <tools/datetime.hxx> +#include <osl/diagnose.h> #include <svl/zforlist.hxx> #include <sax/tools/converter.hxx> diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 8dba4945fccb..0f964f94b2a3 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -26,6 +26,7 @@ #include <xmloff/nmspmap.hxx> #include <sax/tools/converter.hxx> #include <svl/sharedstringpool.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index 93f478c00ef0..5f2b06f2244a 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.cxx @@ -19,6 +19,7 @@ #include "XMLExportSharedData.hxx" #include "XMLExportIterator.hxx" +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 99019dd00bcd..fa5c289b4820 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -20,6 +20,7 @@ #include "XMLStylesImportHelper.hxx" #include "xmlimprt.hxx" #include <com/sun/star/util/NumberFormat.hpp> +#include <osl/diagnose.h> using namespace com::sun::star; using ::std::list; diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index dc9ba8556e9c..7a839e9356ae 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -27,6 +27,8 @@ #include "compiler.hxx" #include "reftokenhelper.hxx" +#include <osl/diagnose.h> + #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 4d78337b996a..dd820f9454ed 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -18,6 +18,7 @@ */ #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <xmloff/families.hxx> #include <xmloff/xmlaustp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 0ab024faf045..f63756122a3b 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -23,6 +23,7 @@ #include "dpsave.hxx" #include "queryparam.hxx" +#include <osl/diagnose.h> #include <editeng/editobj.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index c17c0b7563f9..a5e5b9fbd796 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -22,6 +22,7 @@ #include <basic/basmgr.hxx> #include <cppuhelper/implbase1.hxx> +#include <osl/diagnose.h> #include <sfx2/objsh.hxx> #include "formulacell.hxx" #include <com/sun/star/container/XContainer.hpp> diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index b0c6110490db..883bd09d1357 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -21,6 +21,8 @@ #include "pagedata.hxx" +#include <osl/diagnose.h> + ScPrintRangeData::ScPrintRangeData() { nPagesX = nPagesY = 0; diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 1f18e178897f..d62e63ed6f00 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/sheet/XSolver.hpp> #include <com/sun/star/sheet/XSolverDescription.hpp> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> using namespace com::sun::star; diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx index b488e4ff4efa..b1d98412a183 100644 --- a/sc/source/ui/unoobj/listenercalls.cxx +++ b/sc/source/ui/unoobj/listenercalls.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/util/XModifyListener.hpp> +#include <osl/diagnose.h> #include "listenercalls.hxx" diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index 1dad56395ffc..47be2d29991a 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -19,6 +19,8 @@ #include "scextopt.hxx" +#include <osl/diagnose.h> + #include <vector> #include <map> #include <boost/shared_ptr.hpp> diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index c8eeca64e87d..80d8d6860cd0 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SCRIPTING_SOURCE_INC_UTIL_MISCUTILS_HXX #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index 1464e6ad3557..8c67606e9914 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "URIHelper.hxx" namespace func_provider diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index ae9f27bb0ff3..f599dc0148f7 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -18,6 +18,7 @@ */ #include "cppuhelper/implementationentry.hxx" +#include <osl/diagnose.h> #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/registry/XRegistryKey.hpp" diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index a8cb6dda470b..69034aadc7c2 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -20,6 +20,7 @@ #include <propread.hxx> #include "rtl/tencinfo.h" #include "rtl/textenc.h" +#include <osl/diagnose.h> PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize, sal_uInt16 nTextEnc ) : mnId ( nId ), diff --git a/sd/source/ui/animations/STLPropertySet.cxx b/sd/source/ui/animations/STLPropertySet.cxx index 07330828526f..9044c0204226 100644 --- a/sd/source/ui/animations/STLPropertySet.cxx +++ b/sd/source/ui/animations/STLPropertySet.cxx @@ -19,6 +19,8 @@ #include "STLPropertySet.hxx" +#include <osl/diagnose.h> + using namespace com::sun::star::beans; using com::sun::star::uno::Any; diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index dae5dffdc231..6ce87fb0019a 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -53,6 +53,7 @@ #include "tools/TimerBasedTaskExecution.hxx" #include "pres.hxx" #include <osl/mutex.hxx> +#include <osl/getglobalmutex.hxx> #include <boost/scoped_ptr.hpp> #include <boost/weak_ptr.hpp> diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 90bf000283a4..120d428085eb 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -22,6 +22,7 @@ #include "controller/SlideSorterController.hxx" #include <sfx2/app.hxx> +#include <osl/getglobalmutex.hxx> #include <com/sun/star/uno/RuntimeException.hpp> using namespace ::sd::slidesorter; diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index d95bc522219f..3a11645d8439 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <sal/macros.h> +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index e0c27aa37cad..896f5b678bc4 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -34,6 +34,7 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <rtl/ref.hxx> #include <tools/errcode.hxx> diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index 80a31fa7c0de..f99a50fd9c80 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -21,6 +21,7 @@ #include "odfemitter.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index 0a856ea29de1..bae84b6bf83a 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -23,6 +23,7 @@ #include "saxattrlist.hxx" #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 80c3e0f543e5..2194ad726972 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -29,6 +29,7 @@ #include "basegfx/polygon/b2dpolypolygontools.hxx" #include "basegfx/range/b2drange.hxx" +#include <osl/diagnose.h> #include "com/sun/star/i18n/BreakIterator.hpp" #include "com/sun/star/i18n/CharacterClassification.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 71619da32447..847d7e995edb 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -23,6 +23,7 @@ #include "xmlemitter.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <osl/file.h> #include <rtl/crc.h> diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 47120c719442..7b448b156c8f 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -28,6 +28,7 @@ #include "basegfx/polygon/b2dpolypolygontools.hxx" #include "basegfx/range/b2drange.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index a2365592f6f7..afc5d24f5f4f 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> +#include <osl/diagnose.h> #include <boost/bind.hpp> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 3a36cb332623..641fa4d20f45 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/util/XChangesBatch.hpp> +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index fc59c18ec30b..b71bec671d47 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/rendering/PanoseWeight.hpp> #include <com/sun/star/rendering/XBitmap.hpp> #include <com/sun/star/util/Color.hpp> +#include <osl/diagnose.h> #include <boost/bind.hpp> #include <map> diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index ad2c437ad303..e611c6103cba 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -94,7 +94,6 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2) void MetadatableTest::test() { - OSL_TRACE("SwMetadatable test(): start"); boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pReg( ::sfx2::createXmlIdRegistry(false) ); boost::scoped_ptr< ::sfx2::IXmlIdRegistry > const pRegClip( @@ -260,8 +259,6 @@ void MetadatableTest::test() m5.SetMetadataReference(id4e); CPPUNIT_ASSERT_MESSAGE("auto-detect (styles)", m5.GetMetadataReference() == id4); - - OSL_TRACE("sfx2::Metadatable test(): finished"); } diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 4fc4cbf18e93..2326a2747ae2 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -20,7 +20,7 @@ #include <svl/itempool.hxx> #include <svl/eitem.hxx> #include <sfx2/msg.hxx> - +#include <osl/diagnose.h> SfxSlotKind SfxSlot::GetKind() const diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 0782951986a3..8e084c15fc96 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -20,6 +20,8 @@ #include <sfx2/sfxsids.hrc> #include "sorgitm.hxx" +#include <osl/diagnose.h> + // STATIC DATA ----------------------------------------------------------- TYPEINIT1_AUTOFACTORY(SfxScriptOrganizerItem, SfxStringItem); diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 15c8e732a8d3..0fb5ed8a8af6 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -27,6 +27,8 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> + #include <algorithm> #include <functional> diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index c776698c00c8..0b9d11cfedaa 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -23,6 +23,7 @@ #include <sfx2/zoomitem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <osl/diagnose.h> #include <sfx2/sfx.hrc> diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx index 9cc4c3154977..a45a8038b779 100644 --- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx +++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/ui/ContextChangeEventObject.hpp> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> #include <com/sun/star/frame/ModuleManager.hpp> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index 94e62d87a5c8..139121cdc33a 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -18,6 +18,8 @@ */ #include <sfx2/sidebar/EnumContext.hxx> +#include <osl/diagnose.h> + #include <map> namespace sfx2 { namespace sidebar { diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index 578295b580e9..fb0af6a9bb9e 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -31,6 +31,7 @@ #include "com/sun/star/beans/Optional.hpp" #include <cppuhelper/supportsservice.hxx> #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> #include "osl/file.h" #define SPACE ' ' diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index a2f7f0c81a3f..84f2eb7c28d0 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -26,6 +26,7 @@ #include "rtl/strbuf.hxx" #include "osl/thread.h" +#include <osl/diagnose.h> #include "recently_used_file.hxx" #include "internal/xml_parser.hxx" diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 7a3c215a4738..3cca2ef46929 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -24,6 +24,7 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <osl/diagnose.h> #include "slideshowexceptions.hxx" #include "activity.hxx" diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx index 0f6fec48d822..ddb8b597c307 100644 --- a/slideshow/source/engine/screenupdater.cxx +++ b/slideshow/source/engine/screenupdater.cxx @@ -20,6 +20,8 @@ #include "screenupdater.hxx" #include "listenercontainer.hxx" +#include <osl/diagnose.h> + #include <boost/shared_ptr.hpp> #include <boost/mem_fn.hpp> #include <vector> diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx index 4352410df311..0fe917f65afe 100644 --- a/slideshow/source/engine/transitions/snakewipe.cxx +++ b/slideshow/source/engine/transitions/snakewipe.cxx @@ -18,6 +18,7 @@ */ +#include <osl/diagnose.h> #include <canvas/debug.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx index 0f27c8f60af0..2be436cd848c 100644 --- a/slideshow/source/engine/unoviewcontainer.cxx +++ b/slideshow/source/engine/unoviewcontainer.cxx @@ -18,9 +18,11 @@ */ -#include <canvas/debug.hxx> #include <unoviewcontainer.hxx> +#include <canvas/debug.hxx> +#include <osl/diagnose.h> + #include <boost/bind.hpp> #include <algorithm> diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 349c2f07c9ae..5cc444ff1aa3 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -22,6 +22,7 @@ #include <sot/object.hxx> #include <sot/sotdata.hxx> #include <comphelper/classids.hxx> +#include <osl/diagnose.h> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 750658c56122..66a766fd9c96 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -22,6 +22,7 @@ #include <tools/rtti.hxx> #include <sot/exchange.hxx> #include <sot/filelist.hxx> +#include <osl/diagnose.h> #include <osl/thread.h> TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream ); diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index cbed63a6d27f..5176e0a4a75e 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -19,6 +19,7 @@ #include <string.h> #include <osl/endian.h> +#include <osl/diagnose.h> #include <tools/solar.h> #include "sot/stg.hxx" diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx index 3aeb6919f468..df59391314c1 100644 --- a/sot/source/sdstor/stgdir.cxx +++ b/sot/source/sdstor/stgdir.cxx @@ -26,6 +26,9 @@ #include "stgstrms.hxx" #include "stgdir.hxx" #include "stgio.hxx" + +#include <osl/diagnose.h> + #include <boost/scoped_array.hpp> //////////////////////////// class StgDirEntry diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 6a3dcbb54263..b64112535ca3 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -46,6 +46,7 @@ #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> #include <rtl/digest.h> +#include <osl/diagnose.h> #include <tools/ref.hxx> #include <tools/debug.hxx> #include <unotools/streamhelper.hxx> diff --git a/stoc/source/implementationregistration/mergekeys.cxx b/stoc/source/implementationregistration/mergekeys.cxx index e8a92fcbb433..2d6c1b2f81a5 100644 --- a/stoc/source/implementationregistration/mergekeys.cxx +++ b/stoc/source/implementationregistration/mergekeys.cxx @@ -20,6 +20,8 @@ #include <vector> +#include <osl/diagnose.h> + #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/MergeConflictException.hpp> diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index f613d356ddc0..28b207abc093 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -26,6 +26,7 @@ #include <rtl/string.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/security/RuntimePermission.hpp> #include <com/sun/star/security/AllPermission.hpp> diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx index a0a7600d5dc3..e31509501e39 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx @@ -39,6 +39,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> +#include <osl/diagnose.h> #include <rtl/textenc.h> #include <rtl/uri.h> #include <rtl/uri.hxx> diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx index d6391d46290e..272c4a8377ee 100644 --- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx +++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx @@ -41,6 +41,7 @@ #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <sal/types.h> namespace { diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index a75ba608b124..857d3e21e82b 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <svl/smplhint.hxx> #include <rtl/instance.hxx> #include <unotools/syslocale.hxx> diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index c11b38966136..5e46847dc7b5 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -20,6 +20,7 @@ #include "itemholder2.hxx" +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index a53a26058cd9..6196e840f22a 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase2.hxx> +#include <osl/diagnose.h> class FSStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory, ::com::sun::star::lang::XServiceInfo > diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 536d2d717220..8e5bfe40d516 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/cenumitm.hxx> #include <svl/eitem.hxx> diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 1b08883275cb..7399633c6b87 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/cintitem.hxx> diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index d0f62021a6cc..6a9428893f0d 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -18,6 +18,7 @@ */ +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/vcompat.hxx> diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index c713ad00e4cb..4e79d882780e 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> #include <unotools/intlwrapper.hxx> #include <tools/stream.hxx> #include <svl/ctypeitm.hxx> diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index e03504175ff3..2adf2c7d6dcc 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> #include <unotools/intlwrapper.hxx> #include <tools/stream.hxx> #include <svl/custritm.hxx> diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 7b7dba99e96d..9a424bf77e79 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -23,6 +23,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <osl/diagnose.h> + #include <comphelper/processfactory.hxx> #include <svl/globalnameitem.hxx> diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 681a32373a0b..f71c72e4bf9b 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -20,6 +20,7 @@ #include <svl/intitem.hxx> #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> #include <tools/bigint.hxx> #include <tools/stream.hxx> #include <svl/metitem.hxx> diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 129622be7d26..5a56912f8c20 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -22,6 +22,7 @@ #include <stdio.h> #include <svl/itempool.hxx> +#include <osl/diagnose.h> #include "whassert.hxx" #include <svl/SfxBroadcaster.hxx> #include <svl/smplhint.hxx> diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index a203fdbbf7a9..bb7bb89a9fa4 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -19,6 +19,7 @@ #include <svl/lckbitem.hxx> #include <svl/poolitem.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index 47ccd03636c6..35b2e482a0bb 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.cxx @@ -22,6 +22,8 @@ // compiled via include from itemset.cxx only! #include <boost/scoped_array.hpp> +#include <osl/diagnose.h> + #ifdef DBG_UTIL #define DBG_CHECK_RANGES(sal_uInt16, pArr) \ diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index c73f583f8f71..e45510723d30 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -20,6 +20,7 @@ #include <svl/poolitem.hxx> #include <tools/stream.hxx> +#include <osl/diagnose.h> TYPEINIT0(SfxPoolItem); TYPEINIT1(SfxVoidItem, SfxPoolItem); diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 11d10aaf6b16..56dfd45fd67f 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -21,6 +21,7 @@ #include <svl/ptitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/Point.hpp> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <tools/mapunit.hxx> diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index b44cc94df511..bd8e57c66b80 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -21,6 +21,7 @@ #include <svl/rectitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/Rectangle.hpp> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/poolitem.hxx> diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index ef5e6aefedb7..1b0f35cad942 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -22,6 +22,7 @@ #include <svl/poolitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <stringio.hxx> diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 18e88ee041e3..db0244ff43b4 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -19,6 +19,7 @@ #include <svl/srchitem.hxx> #include <sal/macros.h> +#include <osl/diagnose.h> #include <unotools/searchopt.hxx> #include <com/sun/star/util/XReplaceable.hpp> diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index c4d77698cde4..0f460c587823 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <tools/tenccvt.hxx> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <unotools/intlwrapper.hxx> #include <svl/smplhint.hxx> diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 3f0e3b3ddb1d..46cff2d7a2ad 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -21,6 +21,7 @@ #include <svl/szitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/Size.hpp> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/poolitem.hxx> diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 322c178ffa83..a8a92cd80487 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -19,6 +19,7 @@ #include <svl/visitem.hxx> #include <com/sun/star/uno/Any.hxx> +#include <osl/diagnose.h> #include <tools/stream.hxx> TYPEINIT1_AUTOFACTORY(SfxVisibilityItem, SfxPoolItem); diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index fa96e4b693d0..c7e70569e8fe 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -25,6 +25,8 @@ #include <boost/noncopyable.hpp> #include <rtl/instance.hxx> #include <rtl/crc.h> +#include <osl/diagnose.h> +#include <osl/getglobalmutex.hxx> #include <tools/solar.h> #include <tools/debug.hxx> #include <tools/urlobj.hxx> diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index b87cbf9f499f..d332d9a55238 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -25,6 +25,7 @@ #include <tools/wldcrd.hxx> #include <tools/inetmime.hxx> #include <rtl/instance.hxx> +#include <osl/diagnose.h> #include <svl/inettype.hxx> #include <svl/svl.hrc> diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 207e52137668..eb4568bb06a1 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -25,6 +25,7 @@ #include <set> #include <string.h> +#include <osl/diagnose.h> #include <rtl/alloc.h> #include <svl/instrm.hxx> #include <svl/outstrm.hxx> diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index a773860f17e0..9cfde4162113 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -20,6 +20,7 @@ #include <tools/color.hxx> #include <i18nlangtag/mslangid.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <com/sun/star/util/Date.hpp> diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index e6995ab16693..34f9b440e6ad 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -24,6 +24,7 @@ #include <i18nlangtag/mslangid.hxx> #include <tools/debug.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <tools/stream.hxx> #include <svl/strmadpt.hxx> #include <svl/instrm.hxx> diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index b5ad28a9d2b1..01573f8ee6fb 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/task/MasterPasswordRequest.hpp> #include <com/sun/star/task/NoMasterException.hpp> +#include <osl/diagnose.h> #include <rtl/cipher.h> #include <rtl/digest.h> #include <rtl/byteseq.hxx> diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index b402a35e2cdc..bcfacb07c6a6 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -19,6 +19,7 @@ #include "syscreds.hxx" #include <com/sun/star/beans/PropertyValue.hpp> +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 9c0def304543..ea3b6c866c53 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -20,6 +20,7 @@ #include "itemholder2.hxx" +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx index 01d2e1d48d42..74586f399a1e 100644 --- a/svtools/source/config/slidesorterbaropt.cxx +++ b/svtools/source/config/slidesorterbaropt.cxx @@ -21,6 +21,7 @@ #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index ef208b2e82fa..30d96fdd4b2e 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/io/XStream.hpp> +#include <osl/diagnose.h> #include <unotools/ucbstreamhelper.hxx> #include <tools/stream.hxx> #include <unotools/streamwrap.hxx> diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index a44cc4eb6d6c..8d2c992a5bbf 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/theOfficeInstallationDirectories.hpp> #include <ucbhelper/content.hxx> +#include <osl/diagnose.h> #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> #include <tools/time.hxx> diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index a448ff70a52a..40cda94f3538 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <tools/rtti.hxx> #include <svtools/unoevent.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 4f546e1b1c0c..7804b6666b48 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -19,6 +19,7 @@ #include "svx/EnhancedCustomShape2d.hxx" #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <tools/fract.hxx> // Makes parser a static resource, diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 949dfbf86894..11efac125d22 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -20,6 +20,7 @@ #include <svx/dialogs.hrc> #include "svx/rulritem.hxx" #include <tools/mapunit.hxx> +#include <osl/diagnose.h> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/frame/status/LeftRightMargin.hpp> #include <com/sun/star/frame/status/UpperLowerMargin.hpp> diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 25c5ee44bf7c..c1752360dab1 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XListBox.hpp> #include <tools/debug.hxx> +#include <osl/diagnose.h> namespace svxform diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index d17ce0dad407..baef84a20942 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -18,6 +18,8 @@ */ #include "svx/fmsrccfg.hxx" + +#include <osl/diagnose.h> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index a89e222887a2..d88f567843db 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -19,6 +19,7 @@ #include "fmtextcontrolfeature.hxx" +#include <osl/diagnose.h> namespace svx { diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 784e2ec1f296..898b522cbcd4 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -20,6 +20,7 @@ #include "formtoolbars.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <osl/diagnose.h> #include <svx/svxids.hrc> diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 059bdff530b2..928b6908fc88 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -18,6 +18,7 @@ */ #include <tools/stream.hxx> +#include <osl/diagnose.h> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/CellVertJustify2.hpp> #include <com/sun/star/table/ShadowLocation.hpp> diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 4d93c6b3c0dd..c8e2f0502637 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <osl/diagnose.h> TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index f1e04af71c29..285a4644410a 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -19,6 +19,8 @@ #include <tools/stream.hxx> +#include <osl/diagnose.h> + #include <svx/zoomslideritem.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 946a4bbfa916..fa40f76090d3 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -21,6 +21,7 @@ #include <txatbase.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <boost/shared_ptr.hpp> diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index ec44bb2cbbea..067cd57bd53e 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -19,6 +19,7 @@ #include <fmtwrapinfluenceonobjpos.hxx> #include <unomid.h> +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index eec3b792a1f7..bf468b9604ad 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -29,6 +29,7 @@ #include <unicode/uchar.h> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 7c1c3e1253ce..176f4c4c75f5 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -17,8 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <rtl/strbuf.hxx> #include <swcache.hxx> + +#include <rtl/strbuf.hxx> +#include <osl/diagnose.h> + #include <limits.h> #ifdef DBG_UTIL diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index efbeb7d873f8..b055c15d4939 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -19,6 +19,7 @@ #include <finalthreadmanager.hxx> +#include <osl/diagnose.h> #include <osl/thread.hxx> #include <pausethreadstarting.hxx> #include <swthreadjoiner.hxx> diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index 2f43f77ae703..f9cf4f02a808 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -18,6 +18,8 @@ */ #include <threadmanager.hxx> +#include <osl/diagnose.h> + #include <algorithm> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 013ad4af5762..95d8c4046f62 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -20,6 +20,8 @@ #include <flddropdown.hxx> #include <algorithm> + +#include <osl/diagnose.h> #include <svl/poolitem.hxx> #include <unofldmid.h> diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 0e300929aa05..948a62062211 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -22,6 +22,7 @@ #include <tools/solar.h> #include <tools/debug.hxx> +#include <osl/diagnose.h> class SwTxtFrm; class OutputDevice; diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx index eb7b6a674484..86ac8ec3c964 100644 --- a/sw/source/core/inc/scriptinfo.hxx +++ b/sw/source/core/inc/scriptinfo.hxx @@ -24,6 +24,7 @@ #include <deque> #include "swscanner.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> class SwTxtNode; class Point; diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx index 145f1a576920..031a5e56e465 100644 --- a/sw/source/core/text/wrong.cxx +++ b/sw/source/core/text/wrong.cxx @@ -20,6 +20,7 @@ #include "swtypes.hxx" #include "SwGrammarMarkUp.hxx" +#include <osl/diagnose.h> SwWrongArea::SwWrongArea( const rtl::OUString& rType, WrongListType listType, com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag, diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index ad50e95d9ffb..79e8a6a1548b 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -20,6 +20,7 @@ #include "XMLRangeHelper.hxx" #include <unotools/charclass.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <algorithm> #include <functional> diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index 40e0761e192c..8a1bd2a618b7 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -32,6 +32,7 @@ #include <tools/urlobj.hxx> #include <tools/datetime.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/content.hxx> #include <swunohelper.hxx> diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 96e039b6034b..cb7cdf03f672 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -77,6 +77,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> +#include <osl/diagnose.h> #include <swtypes.hxx> #include <unomap.hxx> #include <unoprnms.hxx> diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx index a0a1f19969e3..a837f0350cfd 100644 --- a/sw/source/filter/ww8/styles.cxx +++ b/sw/source/filter/ww8/styles.cxx @@ -22,6 +22,7 @@ #include <functional> #include <algorithm> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include "staticassert.hxx" namespace diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx index d7e84d67ec47..33f875bbbb5b 100644 --- a/sw/source/ui/vba/service.cxx +++ b/sw/source/ui/vba/service.cxx @@ -19,6 +19,7 @@ #include <cppuhelper/implementationentry.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <osl/diagnose.h> #include <comphelper/servicedecl.hxx> // component exports diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx index dc247990718d..f37048836e8b 100644 --- a/tools/source/generic/b3dtrans.cxx +++ b/tools/source/generic/b3dtrans.cxx @@ -19,6 +19,8 @@ #include <tools/b3dtrans.hxx> +#include <osl/diagnose.h> + // B3dTransformationSet -------------------------------------------------------- // Transformations for all 3D output diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index 260e4415bd70..780459707a8b 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -21,6 +21,7 @@ #include <math.h> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <tools/bigint.hxx> diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index 4d89b97f2b81..020d894423ba 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -22,6 +22,7 @@ #include <limits.h> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <tools/fract.hxx> #include <tools/lineend.hxx> diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index dc3f70e59b1e..5d8f88a0afc2 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -18,6 +18,7 @@ */ #include <osl/endian.h> +#include <osl/diagnose.h> #include <tools/bigint.hxx> #include <tools/debug.hxx> #include <tools/helpers.hxx> diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index f15759e8b481..693c2eca6f2e 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -23,6 +23,7 @@ #define POLY_CLIP_XOR 3 #include <rtl/math.hxx> +#include <osl/diagnose.h> #include <poly.h> #include <tools/poly.hxx> #include <tools/debug.hxx> diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 40c78865fde1..1772e0f7c317 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -20,6 +20,7 @@ #include <cstddef> #include <limits> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <rtl/strbuf.hxx> #include <rtl/tencinfo.h> diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index e61253d2e221..f291a330ea67 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -22,6 +22,7 @@ #include <tools/debug.hxx> #include <tools/errinf.hxx> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> class ErrorHandler; diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index f6589f540669..c6d76f1de77a 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -20,6 +20,7 @@ #include <tools/debug.hxx> #include <tools/pstm.hxx> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #define STOR_NO_OPTIMIZE diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 327dda5fd201..864876fc52e3 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -29,6 +29,7 @@ #include <boost/static_assert.hpp> #include <osl/endian.h> +#include <osl/diagnose.h> #include <comphelper/string.hxx> diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index f3a00c3fbf6c..e4ae2068d94c 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -61,6 +61,7 @@ #include <com/sun/star/ucb/CommandInfo.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> +#include <osl/diagnose.h> #include <sal/macros.h> #include <tdoc_content.hxx> diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index df3ea9c93895..a21939ec81b9 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -25,6 +25,7 @@ *************************************************************************/ #include "rtl/ustrbuf.hxx" +#include <osl/diagnose.h> #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/embed/XStorage.hpp" diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index 55c505d3cd26..91dd5714e44a 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -26,6 +26,8 @@ *************************************************************************/ +#include <osl/diagnose.h> + #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/reflection/ProxyFactory.hpp" diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index a1a26890b412..31168a08d504 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -22,6 +22,7 @@ #include "com/sun/star/beans/XPropertySet.hpp" #include "com/sun/star/embed/ElementModes.hpp" #include "com/sun/star/embed/StorageFactory.hpp" +#include <osl/diagnose.h> #include "comphelper/processfactory.hxx" #include "tdoc_uri.hxx" diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index 0c650abbdccd..db1ee134df0f 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -29,6 +29,7 @@ #include "DAVSessionFactory.hxx" #include "NeonSession.hxx" #include "NeonUri.hxx" +#include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace webdav_ucp; diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx index 56309651298a..d5ce74e16046 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx @@ -29,6 +29,7 @@ #include <config_lgpl.h> #include <string.h> #include <ne_xml.h> +#include <osl/diagnose.h> #include "LockSequence.hxx" using namespace webdav_ucp; diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 30f22d1025ff..5d7d35f904f6 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -31,6 +31,7 @@ #include "rtl/ustring.hxx" #include "osl/time.h" #include "osl/thread.hxx" +#include <osl/diagnose.h> #include "salhelper/thread.hxx" #include "NeonSession.hxx" #include "NeonLockStore.hxx" diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index f9d6dab72df4..284751f378bf 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -19,6 +19,7 @@ #include <ucbhelper/interceptedinteraction.hxx> +#include <osl/diagnose.h> namespace ucbhelper{ diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index d307a5084263..5f2bf5ce057d 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -20,6 +20,8 @@ #include <utility> #include <vector> #include <list> + +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <rtl/ref.hxx> #include <osl/socket.hxx> diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index 2c40d03ad9f8..af2abda11273 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -20,6 +20,7 @@ #include "ucbhelper/fd_inputstream.hxx" #include <rtl/alloc.h> +#include <osl/diagnose.h> #include <algorithm> using namespace com::sun::star::uno; diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 18f15e100e3f..21f2d179f0da 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -23,9 +23,11 @@ ************************************************************************** *************************************************************************/ +#include <ucbhelper/interactionrequest.hxx> + #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <ucbhelper/interactionrequest.hxx> using namespace com::sun::star; using namespace ucbhelper; diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx index 01a541726fa6..ea4d7ef5bb5f 100644 --- a/ucbhelper/source/provider/simpleinteractionrequest.cxx +++ b/ucbhelper/source/provider/simpleinteractionrequest.cxx @@ -19,6 +19,8 @@ #include <ucbhelper/simpleinteractionrequest.hxx> +#include <osl/diagnose.h> + using namespace com::sun::star; using namespace ucbhelper; diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 064e2f245cf4..76527d86def5 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/weakref.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> +#include <osl/diagnose.h> #include "itemholder1.hxx" diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 5f52f32e28ac..b93dd9e9e1ce 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -27,6 +27,7 @@ #include <boost/unordered_map.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "itemholder1.hxx" diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index c1da0fce5584..75e511bc8caa 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <unotools/pathoptions.hxx> diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 94667443c0df..96b75f45c5a5 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -22,6 +22,7 @@ #include <unotools/fltrcfg.hxx> #include <tools/debug.hxx> #include <tools/solar.h> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 798b777e8deb..f84591970b3a 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -29,6 +29,7 @@ #include <unotools/syslocale.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> +#include <osl/diagnose.h> #include <sal/macros.h> #if OSL_DEBUG_LEVEL > 1 diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 5f0b5c6be1a9..f1427cf04f80 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 76490942f505..c4b0578963ab 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.h> #include <sal/macros.h> +#include <osl/diagnose.h> using namespace utl; using namespace com::sun::star::uno; diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index ff45cfb77cc6..fd6189989d99 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <unotools/configpaths.hxx> #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 09a9994ac210..fcfd2c3c96c0 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -38,6 +38,7 @@ #include <comphelper/processfactory.hxx> #include <rtl/instance.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <sal/macros.h> static const int nDateFormatInvalid = -1; diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index fa49c787e36c..6caa86b81934 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -23,6 +23,7 @@ #include <tools/datetime.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> +#include <osl/diagnose.h> namespace { diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx index 90f9b459855b..b6785ac4ed63 100644 --- a/unotools/source/misc/desktopterminationobserver.cxx +++ b/unotools/source/misc/desktopterminationobserver.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <cppuhelper/implbase1.hxx> #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> #include <list> diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index dd15c7c03730..c6aa46ef6f57 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -46,6 +46,7 @@ #include <ucbhelper/commandenvironment.hxx> #include <ucbhelper/activedatasink.hxx> #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> namespace utl { diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx index 6c4595c3aa39..393b0c3feaa3 100644 --- a/unotools/source/misc/sharedunocomponent.cxx +++ b/unotools/source/misc/sharedunocomponent.cxx @@ -18,6 +18,7 @@ */ #include <sal/config.h> +#include <osl/diagnose.h> #include <boost/noncopyable.hpp> #include <unotools/sharedunocomponent.hxx> diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index f8a1ff90fbde..b7c9bef518bd 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -22,6 +22,7 @@ #include <comphelper/processfactory.hxx> #include <salhelper/condition.hxx> #include <osl/thread.hxx> +#include <osl/diagnose.h> #include <tools/urlobj.hxx> #include <ucbhelper/interactionrequest.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 68c5c82a4e6b..c3fdfac00ecc 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -23,6 +23,8 @@ #include <boost/shared_ptr.hpp> +#include <osl/diagnose.h> + #include <com/sun/star/xml/dom/DOMException.hpp> #include <com/sun/star/xml/dom/events/XMutationEvent.hpp> diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index 1033a7c9aabf..5689cfc1f2a7 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -23,6 +23,8 @@ #include <boost/shared_ptr.hpp> +#include <osl/diagnose.h> + #include <com/sun/star/xml/dom/events/XDocumentEvent.hpp> #include "../events/mutationevent.hxx" diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index d7af99d16c09..fc7b55913446 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -42,6 +42,8 @@ #include <string.h> +#include <osl/diagnose.h> + #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index 248cf4375f58..f7db8da8f51e 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -30,6 +30,7 @@ #include <rtl/alloc.h> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx index aa71ebc7e64a..2aa218acbaa4 100644 --- a/unoxml/source/dom/documenttype.cxx +++ b/unoxml/source/dom/documenttype.cxx @@ -21,6 +21,8 @@ #include <string.h> +#include <osl/diagnose.h> + #include <entitiesmap.hxx> #include <notationsmap.hxx> diff --git a/unoxml/source/dom/domimplementation.cxx b/unoxml/source/dom/domimplementation.cxx index 71f9b6c19ef5..01a573c3b0df 100644 --- a/unoxml/source/dom/domimplementation.cxx +++ b/unoxml/source/dom/domimplementation.cxx @@ -20,6 +20,7 @@ #include <domimplementation.hxx> #include <rtl/instance.hxx> +#include <osl/diagnose.h> using namespace css::uno; using namespace css::xml::dom; diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 0ed516dd10ef..f1f10506501f 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -23,6 +23,7 @@ #include <boost/shared_ptr.hpp> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <com/sun/star/xml/sax/FastToken.hpp> diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 9230917a2266..c429cac6c783 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -21,6 +21,8 @@ #include <string.h> +#include <osl/diagnose.h> + #include <element.hxx> #include <document.hxx> diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx index ca929d3bdb2f..08dfb35fef2b 100644 --- a/unoxml/source/dom/entitiesmap.cxx +++ b/unoxml/source/dom/entitiesmap.cxx @@ -19,6 +19,8 @@ #include <entitiesmap.hxx> +#include <osl/diagnose.h> + #include <documenttype.hxx> using namespace css::uno; diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx index 45c8d1682341..cae0b81a9847 100644 --- a/unoxml/source/dom/entity.cxx +++ b/unoxml/source/dom/entity.cxx @@ -19,6 +19,8 @@ #include <entity.hxx> +#include <osl/diagnose.h> + #include <string.h> using namespace css::uno; diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index aab0ffe9430b..40fae80affdf 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -31,6 +31,7 @@ #include <rtl/uuid.h> #include <rtl/instance.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <com/sun/star/xml/sax/FastToken.hpp> diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx index 66b9657b6e73..44a8a24a935b 100644 --- a/unoxml/source/dom/notation.cxx +++ b/unoxml/source/dom/notation.cxx @@ -21,6 +21,8 @@ #include <string.h> +#include <osl/diagnose.h> + using namespace css::uno; using namespace css::xml::dom; diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx index 0f12247309df..6e84d07982f0 100644 --- a/unoxml/source/dom/notationsmap.cxx +++ b/unoxml/source/dom/notationsmap.cxx @@ -19,6 +19,8 @@ #include <notationsmap.hxx> +#include <osl/diagnose.h> + #include <documenttype.hxx> using namespace css::uno; diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx index 229fdd80e8d1..cb0d5aaf6e20 100644 --- a/unoxml/source/dom/text.cxx +++ b/unoxml/source/dom/text.cxx @@ -19,6 +19,8 @@ #include <text.hxx> +#include <osl/diagnose.h> + using namespace css::uno; using namespace css::xml::dom; using namespace css::xml::sax; diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 1bec82992295..fdd5d8a29782 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -52,6 +52,7 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 4315cff1fb39..12d95cc7dd60 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -20,6 +20,7 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/task/NoMasterException.hpp> diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index aee4863c4836..239476dd7eea 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -20,6 +20,7 @@ #include "HtmlFmtFlt.hxx" #include <rtl/string.h> +#include <osl/diagnose.h> #include <string> #include <sstream> diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 289f548fb2dc..4b235dea3b9e 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -18,6 +18,7 @@ */ #include <sal/types.h> +#include <osl/diagnose.h> #include "OSXTransferable.hxx" diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index ee1e1f49d5c8..9009511a63a5 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -20,11 +20,11 @@ #include "documentfocuslistener.hxx" #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> - #include <com/sun/star/accessibility/AccessibleEventId.hpp> - #include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <osl/diagnose.h> + using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 01a06f22e7a0..560284ccb1d6 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -20,6 +20,7 @@ #include <textdoc.hxx> #include <stdlib.h> #include <boost/mem_fn.hpp> +#include <osl/diagnose.h> // compare function called by QuickSort static bool CompareStart( const TextCharAttrib& pFirst, const TextCharAttrib& pSecond ) diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 6c0ebd07ea5c..0c24c1b2f0ab 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -22,6 +22,7 @@ #include <unotools/configmgr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx index dea870bf8218..6402d92f9b64 100644 --- a/vcl/source/fontsubset/fontsubset.cxx +++ b/vcl/source/fontsubset/fontsubset.cxx @@ -19,6 +19,8 @@ #include <tools/debug.hxx> +#include <osl/diagnose.h> + #include <fontsubset.hxx> #include <sft.hxx> diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index ced810a4667b..32ca3cc4412d 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -18,6 +18,7 @@ */ #include <stdlib.h> +#include <osl/diagnose.h> #include <vcl/bmpacc.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 134764b242f1..0b6a48b2406e 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -23,6 +23,8 @@ #include <impbmp.hxx> +#include <osl/diagnose.h> + #include <string.h> BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, bool bModify ) : diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 6fb78b08b145..9b8e2a996a67 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -21,6 +21,7 @@ #include <tools/vcompat.hxx> #include <tools/stream.hxx> #include <tools/helpers.hxx> +#include <osl/diagnose.h> #include <vcl/region.hxx> #include <regionband.hxx> diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index a7d109f72dd7..4e37854e5f08 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -20,6 +20,7 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <regionband.hxx> +#include <osl/diagnose.h> RegionBand::RegionBand() : mpFirstBand(0), diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 3fc4c3cb5c15..9e5c2aba4258 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -20,6 +20,7 @@ #include <vcl/bmpacc.hxx> #include <vcl/salbtype.hxx> #include <bmpfast.hxx> +#include <osl/diagnose.h> #include <boost/scoped_array.hpp> #define IMPL_CASE_GET_FORMAT( Format ) \ diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index c3003e038018..35187ba820c5 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -21,6 +21,8 @@ #include "atktextattributes.hxx" #include <algorithm> +#include <osl/diagnose.h> + #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/accessibility/TextSegment.hpp> #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp> diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index a30bf1618a9c..c3b784bfbfa4 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -54,6 +54,7 @@ #include <com/sun/star/beans/Property.hpp> #include <rtl/ref.hxx> +#include <osl/diagnose.h> #include <cppuhelper/factory.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx index 7cba3e15c657..32a745a26289 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.cxx +++ b/writerfilter/source/dmapper/CellMarginHandler.cxx @@ -21,6 +21,7 @@ #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> #include "dmapperLoggers.hxx" +#include <osl/diagnose.h> namespace writerfilter { namespace dmapper { diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 68efba72e9b1..c1487b455fb9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -35,6 +35,7 @@ #include <dmapperLoggers.hxx> #include <TablePositionHandler.hxx> #include <ConversionHelper.hxx> +#include <osl/diagnose.h> #ifdef DEBUG_WRITERFILTER #include <PropertyMapHelper.hxx> diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx index 52a1ecdc3e61..e17dcf9f31fd 100644 --- a/writerfilter/source/dmapper/MeasureHandler.cxx +++ b/writerfilter/source/dmapper/MeasureHandler.cxx @@ -20,6 +20,7 @@ #include <PropertyMap.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> +#include <osl/diagnose.h> #include <com/sun/star/text/SizeType.hpp> #include "dmapperLoggers.hxx" diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 8892b693c962..586b9a1fdc40 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/text/PositionAndSpaceMode.hpp> #include <com/sun/star/text/XChapterNumberingSupplier.hpp> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include "dmapperLoggers.hxx" diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 55857b949e19..e2c94be2ca6c 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -24,6 +24,7 @@ #include <editeng/unoprnms.hxx> #include <ooxml/resourceids.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <unotools/mediadescriptor.hxx> #include <officecfg/Office/Common.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index b584abf123d4..f1f3a65c9ac6 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -21,6 +21,7 @@ #include <DomainMapper_Impl.hxx> #include <ConversionHelper.hxx> #include <i18nutil/paper.hxx> +#include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx index ddb5b0b9a1d9..dbc5ac9b1dec 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.cxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx @@ -20,6 +20,7 @@ #include <PropertyMap.hxx> #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> +#include <osl/diagnose.h> #include "dmapperLoggers.hxx" diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index d1fe9e54576f..f9997126edb2 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -40,6 +40,7 @@ #include <map> #include <set> #include <stdio.h> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <comphelper/string.hxx> #include <comphelper/sequenceasvector.hxx> diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/writerfilter/source/dmapper/TrackChangesHandler.cxx index 3801c28f8a81..6f52e45fc26f 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.cxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx @@ -11,6 +11,7 @@ #include <ConversionHelper.hxx> #include <ooxml/resourceids.hxx> #include <oox/token/tokens.hxx> +#include <osl/diagnose.h> #include "dmapperLoggers.hxx" namespace writerfilter { diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index 91722703b94e..62438180085e 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/text/XTextRange.hpp> +#include <osl/diagnose.h> #include <unotools/localfilehelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 727c57660974..da8bd4aa2cdf 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -22,6 +22,7 @@ #include <WriterFilterDetection.hxx> #include <comphelper/storagehelper.hxx> #include <com/sun/star/io/XInputStream.hpp> +#include <osl/diagnose.h> #include <sot/storage.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/writerperfect/inc/writerperfect/ImportFilter.hxx b/writerperfect/inc/writerperfect/ImportFilter.hxx index ec59c09c0b8b..214f02e675e8 100644 --- a/writerperfect/inc/writerperfect/ImportFilter.hxx +++ b/writerperfect/inc/writerperfect/ImportFilter.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#include <osl/diagnose.h> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase4.hxx> diff --git a/writerperfect/source/impress/ImportFilterBase.cxx b/writerperfect/source/impress/ImportFilterBase.cxx index f16c201377cd..f21254f57e06 100644 --- a/writerperfect/source/impress/ImportFilterBase.cxx +++ b/writerperfect/source/impress/ImportFilterBase.cxx @@ -20,6 +20,8 @@ #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/XParser.hpp> +#include <osl/diagnose.h> + #include <writerperfect/DirectoryStream.hxx> #include <writerperfect/DocumentHandler.hxx> #include <writerperfect/WPXSvInputStream.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 5b363cfe1596..101a52c310d9 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess3.hpp> #include <boost/unordered_map.hpp> +#include <osl/diagnose.h> #include <rtl/string.hxx> namespace helpdatafileproxy { diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index 23a3a4a891fa..695351d1ac22 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -21,6 +21,8 @@ #include <cppuhelper/implbase1.hxx> +#include <osl/diagnose.h> + using namespace ::com::sun::star; using namespace ::com::sun::star::beans; diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 3c488a6bf467..78200f017e84 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -25,6 +25,7 @@ #include "SchXMLTableContext.hxx" #include "SchXMLSeries2Context.hxx" #include "SchXMLTools.hxx" +#include <osl/diagnose.h> #include <unotools/mediadescriptor.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlement.hxx> diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 8d1258bbeb71..4e60385ff4b1 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/document/NamedPropertyValues.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <xmlenums.hxx> using namespace com::sun::star; diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index fcf2df5dd5a4..f8a44452939d 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -20,6 +20,8 @@ #include <xmloff/ProgressBarHelper.hxx> #include <xmloff/xmltoken.hxx> +#include <osl/diagnose.h> + using namespace ::com::sun::star; static const sal_Int32 nDefaultProgressBarRange = 1000000; diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx index e5220ae875a4..8f1ad5c862ae 100644 --- a/xmloff/source/core/SvXMLAttrCollection.cxx +++ b/xmloff/source/core/SvXMLAttrCollection.cxx @@ -9,6 +9,7 @@ #include "SvXMLAttrCollection.hxx" #include <limits.h> +#include <osl/diagnose.h> bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const { diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index ace876a1112a..a7513706e8fe 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -21,6 +21,7 @@ #include <string.h> #include <vector> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <xmloff/xmltoken.hxx> #include <comphelper/servicehelper.hxx> diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 5bd746d38d70..feb4ac0bdfe7 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -19,6 +19,7 @@ #include <xmloff/xmlerror.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <com/sun/star/xml/sax/XLocator.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 7bea9cabc429..fa31e599a45a 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/util/Date.hpp> #include <tools/debug.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlement.hxx> #include <xmloff/xmltoken.hxx> #include <rtl/math.hxx> diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index fb55d36fbd06..80e075b04dc8 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/XOutputStream.hpp> +#include <osl/diagnose.h> #include <xmloff/xmlimp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 8392356fb996..0cbbd29432f6 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -60,6 +60,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> #include <osl/mutex.hxx> +#include <osl/diagnose.h> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlprhdl.hxx> #include "anim.hxx" diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index d3c7e2b86c1c..4de1c88cb685 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <sax/tools/converter.hxx> +#include <osl/diagnose.h> #include <list> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 7488da10cd20..c858528a5399 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <tools/urlobj.hxx> +#include <osl/diagnose.h> #include <sax/tools/converter.hxx> diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index a9d6a4ca1cd3..bc50cc37aaf6 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -19,6 +19,7 @@ #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <com/sun/star/drawing/XLayerManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 2d311d5c9bb9..2a670787c57b 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/chart/XChartDocument.hpp> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> +#include <osl/diagnose.h> #include <list> diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index ef4002e1cfe4..97952fddb9b2 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -31,6 +31,7 @@ #include <xmloff/xmltoken.hxx> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> +#include <osl/diagnose.h> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b3dpolypolygontools.hxx> diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index a3e2bb92f510..4e8f660ba1aa 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -34,6 +34,7 @@ #include "ximpstyl.hxx" #include <xmloff/prstylei.hxx> #include "PropertySetMerger.hxx" +#include <osl/diagnose.h> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index d247895727fb..62ff05dd783b 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -20,6 +20,7 @@ #include <cassert> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/presentation/ClickAction.hpp> diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index ecaf3962b0bc..10b60335737e 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -24,6 +24,7 @@ #include <xmloff/xmluconv.hxx> #include "ximpnote.hxx" #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index a2f7b12768a4..275c6232d59d 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -19,6 +19,8 @@ #include "attriblistmerge.hxx" +#include <osl/diagnose.h> + namespace xmloff { diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index 2ca20f76ddec..a9cfc99aa9c2 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -23,6 +23,8 @@ #error "do not include this file directly!" #endif +#include <osl/diagnose.h> + // no namespace. Same as above: this file is included from elementimport.hxx only, // and this is done inside the namespace diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx index 2cedb83f0c7a..d3e83a1d5252 100644 --- a/xmloff/source/forms/eventimport.cxx +++ b/xmloff/source/forms/eventimport.cxx @@ -20,6 +20,7 @@ #include "eventimport.hxx" #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <osl/diagnose.h> #include "strings.hxx" namespace xmloff diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 9c61fd906b08..0ccb33973a18 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -24,6 +24,9 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> + + namespace xmloff { diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx index 7b944f7c986d..4da6571e32ac 100644 --- a/xmloff/source/forms/handler/form_handler_factory.cxx +++ b/xmloff/source/forms/handler/form_handler_factory.cxx @@ -20,6 +20,7 @@ #include "forms/form_handler_factory.hxx" #include "vcl_date_handler.hxx" #include "vcl_time_handler.hxx" +#include <osl/diagnose.h> namespace xmloff { diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index 984f0709e501..e48e1f575887 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -25,6 +25,7 @@ #include <xmloff/xmlnmspe.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <boost/unordered_map.hpp> diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index 675dbd5adfb5..fcfe449f5758 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -22,6 +22,7 @@ #include <comphelper/extract.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> using namespace ::com::sun::star::uno; diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 42c40e741d84..eea9debfefce 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -27,6 +27,7 @@ #include "PageMasterImportPropMapper.hxx" #include <xmloff/PageMasterStyleMap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <osl/diagnose.h> //UUUU #include <xmlsdtypes.hxx> diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index a90132e1e639..52c506fcfd65 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -30,6 +30,7 @@ //UUUU #include <xmloff/EnumPropertyHdl.hxx> +#include <osl/diagnose.h> #include <com/sun/star/drawing/FillStyle.hpp> #include "XMLFillBitmapSizePropertyHandler.hxx" #include "XMLBitmapLogicalSizePropertyHandler.hxx" diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index d18a73627655..9a38098d5095 100644 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx @@ -19,6 +19,7 @@ #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <xmloff/XMLConstantsPropertyHandler.hxx> diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 22dfb06ee2f0..08b3ed8949b6 100644 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include "XMLIsPercentagePropertyHandler.hxx" using namespace ::com::sun::star; diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index 9b4dd7dbdec2..c2443007d613 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -21,6 +21,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 8ac833da93e7..bda107563879 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <set> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index a2d8da6aed43..7881497f9cc3 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -21,6 +21,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/FontUnderline.hpp> diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index d0a12ea58324..6bfe40cf98da 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/PropertyVetoException.hpp> #include <com/sun/star/beans/TolerantPropertySetResultType.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlprmap.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlimppr.hxx> diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 6c9b3f0ac8ac..6c84c5ab4ad8 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -28,6 +28,7 @@ #include <i18nlangtag/languagetag.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <sax/tools/converter.hxx> diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 57f4c49d63eb..f8994f2bc304 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <tools/fontenum.hxx> diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 3b376181458f..dc47fde7db86 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -39,6 +39,8 @@ #include <xmloff/xmlnmspe.hxx> #include "table.hxx" +#include <osl/diagnose.h> + #include <boost/shared_ptr.hpp> using namespace ::xmloff::token; diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index a25b23f4ef89..341765d8e187 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -44,6 +44,7 @@ #include <xmloff/xmlerror.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 91717d8717ca..bf54f43a2878 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 969be43bd4de..63bb7e237bf3 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <tools/debug.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 83fd57d82342..36ea03503e72 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> +#include <osl/diagnose.h> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLTextNumRuleInfo.cxx b/xmloff/source/text/XMLTextNumRuleInfo.cxx index 7bfdbe318137..02fde000dc22 100644 --- a/xmloff/source/text/XMLTextNumRuleInfo.cxx +++ b/xmloff/source/text/XMLTextNumRuleInfo.cxx @@ -19,6 +19,7 @@ #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XIndexReplace.hpp> diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 93e1d81513ed..6b7c9ad541a8 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -64,6 +64,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index a5d715a16e2d..2cfe53a74c2d 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -34,6 +34,7 @@ #include <xmloff/txtstyli.hxx> #include <xmloff/xmlnumi.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <xmloff/maptype.hxx> #include "txtparai.hxx" diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 395759a3b17c..11b00e4e2f15 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <osl/thread.h> #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontPitch.hpp> diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index ccfc6853a5c6..27a9a1c3f353 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -21,6 +21,7 @@ #include <txtlists.hxx> #include <comphelper/random.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <tools/date.hxx> #include <tools/time.hxx> diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index cd2db541c39b..78d8215351b5 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <tools/fontenum.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index 7c043da983a2..5b596cd1b82c 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -19,6 +19,7 @@ #include <xmloff/txtprmap.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/maptype.hxx> diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index de425ff9a7ae..6792facbf6a9 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -44,6 +44,7 @@ #include <sax/tools/converter.hxx> #include <rtl/ustring.hxx> +#include <osl/diagnose.h> #include <tools/debug.hxx> diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index d451334abeae..fc319f73d377 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -24,6 +24,7 @@ #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index d35328ae6a38..d50c778bbf59 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -24,6 +24,7 @@ #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index 375ad745335c..25b26f9c0cc7 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -25,6 +25,7 @@ #include "DeepTContext.hxx" #include "ActionMapTypesOASIS.hxx" #include "MutableAttrList.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index df3dc75e3bdf..bf0b25649ca5 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -25,6 +25,7 @@ #include "DeepTContext.hxx" #include "ActionMapTypesOOo.hxx" #include "MutableAttrList.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index 52abc9e4c8d1..bc50e22f8d82 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -25,6 +25,7 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" #include "ControlOASISTContext.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index e999997bcc6f..8e0a32f3255b 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -25,6 +25,7 @@ #include "FlatTContext.hxx" #include "AttrTransformerAction.hxx" #include <xmloff/nmspmap.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx index 7c4858534bc1..4137c5924e7c 100644 --- a/xmloff/source/transform/DeepTContext.cxx +++ b/xmloff/source/transform/DeepTContext.cxx @@ -24,6 +24,7 @@ #include "ElemTransformerAction.hxx" #include "PersMixedContentTContext.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 6bf2a171dd2a..6a8424c42f19 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -24,6 +24,7 @@ #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index 784a28c17c26..a6bea92f8dee 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -25,6 +25,7 @@ #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> // Used to parse Scripting Framework URLs #include <com/sun/star/uri/UriReferenceFactory.hpp> diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index a1eb86abc8bb..47a3c3611437 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -26,6 +26,7 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <boost/unordered_map.hpp> diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index d4d4021b5833..8807ee564e8d 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -25,6 +25,7 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" #include "FormPropOASISTContext.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 47b2df1268da..fc7a7dc7159b 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -26,6 +26,7 @@ #include "TransformerActions.hxx" #include "TransformerBase.hxx" #include "FormPropOOoTContext.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index 10755f980020..ecb4f33d209d 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -25,6 +25,7 @@ #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index b7f8f82f9b0f..daca17493fca 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -27,6 +27,7 @@ #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" #include "TransformerBase.hxx" +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index da066a705560..135eb3f40c17 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -25,6 +25,7 @@ #include "ElemTransformerAction.hxx" #include "IgnoreTContext.hxx" #include <xmloff/xmlnmspe.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index 85bdddeeae70..437f8343f275 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> +#include <osl/diagnose.h> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index ddb55ddcdbcb..b944dccecf21 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -18,6 +18,7 @@ */ #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <sax/tools/converter.hxx> diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index fbde8c279dd4..fe152fe0f0d6 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -20,6 +20,8 @@ #include "TransformerBase.hxx" #include "PersMixedContentTContext.hxx" +#include <osl/diagnose.h> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 7e3415efa1c9..26200f625962 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <sax/tools/converter.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 6eb17d4de451..a53aa743c3fa 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -41,6 +41,7 @@ #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> +#include <osl/diagnose.h> using namespace ::xmloff::token; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/TransformerActions.cxx b/xmloff/source/transform/TransformerActions.cxx index a89424af8695..a39f27f25034 100644 --- a/xmloff/source/transform/TransformerActions.cxx +++ b/xmloff/source/transform/TransformerActions.cxx @@ -19,6 +19,7 @@ #include "TransformerActions.hxx" +#include <osl/diagnose.h> using namespace ::osl; diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index ba7e37cd5287..4a6ba52dd58c 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -19,6 +19,7 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <com/sun/star/i18n/CharacterClassification.hpp> #include <com/sun/star/i18n/UnicodeType.hpp> #include <com/sun/star/util/MeasureUnit.hpp> diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index 5d07cae6a237..c1d11d71998b 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> +#include <osl/diagnose.h> #include <xmloff/nmspmap.hxx> #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 5d3c7a80b4be..1d273ecd2234 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -20,6 +20,7 @@ #include <string.h> #include <com/sun/star/registry/XRegistryKey.hpp> #include <cppuhelper/factory.hxx> +#include <osl/diagnose.h> #include <XMLFilterRegistration.hxx> diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 78aecb4c128e..f9622aaa8bc0 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> #include <tools/debug.hxx> +#include <osl/diagnose.h> using com::sun::star::uno::Reference; diff --git a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx index 3e0a93db25d5..d0e1a8db4eed 100644 --- a/xmloff/source/xforms/SchemaSimpleTypeContext.cxx +++ b/xmloff/source/xforms/SchemaSimpleTypeContext.cxx @@ -27,6 +27,8 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> +#include <osl/diagnose.h> + #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xsd/WhiteSpaceTreatment.hpp> diff --git a/xmloff/source/xforms/XFormsBindContext.cxx b/xmloff/source/xforms/XFormsBindContext.cxx index e03d0291ddd8..c7eb92855dfe 100644 --- a/xmloff/source/xforms/XFormsBindContext.cxx +++ b/xmloff/source/xforms/XFormsBindContext.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/xforms/XModel2.hpp> #include <tools/debug.hxx> +#include <osl/diagnose.h> using com::sun::star::beans::XPropertySet; using com::sun::star::uno::Reference; diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index f6f01bb3858f..e0503b7eb1f6 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xforms/XModel2.hpp> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx index f98613ded3dc..10bd88b43797 100644 --- a/xmloff/source/xforms/XFormsModelContext.cxx +++ b/xmloff/source/xforms/XFormsModelContext.cxx @@ -32,6 +32,8 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlerror.hxx> +#include <osl/diagnose.h> + #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/util/XUpdatable.hpp> diff --git a/xmloff/source/xforms/XFormsSubmissionContext.cxx b/xmloff/source/xforms/XFormsSubmissionContext.cxx index 2c2c84dd22ee..fb2398171069 100644 --- a/xmloff/source/xforms/XFormsSubmissionContext.cxx +++ b/xmloff/source/xforms/XFormsSubmissionContext.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/xforms/XModel2.hpp> #include <tools/debug.hxx> +#include <osl/diagnose.h> using com::sun::star::beans::XPropertySet; using com::sun::star::container::XNameContainer; diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index b2150ebea9ca..4f127a2f2d0e 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -33,6 +33,7 @@ #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx index 8070c6018385..d758b0fa9662 100644 --- a/xmlscript/source/xml_helper/xml_element.cxx +++ b/xmlscript/source/xml_helper/xml_element.cxx @@ -18,6 +18,7 @@ */ #include <xmlscript/xml_helper.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx index 0d097ac36be1..8db6fdc2a567 100644 --- a/xmlscript/source/xmldlg_imexp/imp_share.hxx +++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/xml/input/XRoot.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> +#include <osl/diagnose.h> #include <vector> #include <boost/shared_ptr.hpp> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 3aed2223ef43..17b4026fac62 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/document/XGraphicObjectResolver.hpp> #include <com/sun/star/script/vba/XVBACompatibility.hpp> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <i18nlangtag/languagetag.hxx> diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index 415047610a90..bf504e7ae099 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/util/Time.hpp> #include <tools/date.hxx> #include <tools/time.hxx> +#include <osl/diagnose.h> #include <com/sun/star/script/XScriptEventsSupplier.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp> diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index 9a5da2042825..1a8ba1dd7ead 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -22,6 +22,7 @@ #include "elementcollector.hxx" #include "buffernode.hxx" #include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp> +#include <osl/diagnose.h> namespace cssu = com::sun::star::uno; namespace cssxw = com::sun::star::xml::wrapper; diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index 3bef50911ab7..08914954392b 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> using namespace com::sun::star::uno; namespace cssu = com::sun::star::uno; diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index bdeb9eb8c165..9d42d447928e 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -23,7 +23,8 @@ #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> - #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> using namespace com::sun::star::uno; namespace cssl = com::sun::star::lang; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index f4d6637090b7..be60a3255757 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.hpp> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index d2b0e35690a3..300d1599ddc4 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -23,7 +23,8 @@ #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> - #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> using namespace com::sun::star::uno; namespace cssu = com::sun::star::uno; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index 054203becb4b..0db81535a28e 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> namespace cssu = com::sun::star::uno; namespace cssl = com::sun::star::lang; diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 46fe20b59e56..1d78da35c18d 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -29,6 +29,7 @@ #include <comphelper/documentconstants.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> #include <rtl/uri.hxx> using namespace ::com::sun::star::uno; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index cda4ce6da1fe..a306554b4032 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/embed/XStorageRawAccess.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <osl/diagnose.h> #include <rtl/uri.hxx> using namespace com::sun::star; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index 4885ce9c6776..fbf99a799e67 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -18,6 +18,7 @@ */ +#include <osl/diagnose.h> #include <osl/time.h> #include <rtl/random.h> #include <rtl/ref.hxx> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 37a052336713..dd3a5cc4c9cc 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -24,6 +24,7 @@ #include <sal/config.h> #include <sal/macros.h> +#include <osl/diagnose.h> #include "securityenvironment_nssimpl.hxx" #include "x509certificate_nssimpl.hxx" #include <comphelper/servicehelper.hxx> diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 9395b6d5242b..cf2377a5a3bc 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <osl/diagnose.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include "xmldocumentwrapper_xmlsecimpl.hxx" |