[Libreoffice-commits] core.git: 8 commits - avmedia/source basctl/source basegfx/source basic/source binaryurp/source bin/gen-iwyu-dummy-lib bin/run bridges/source canvas/source chart2/source cli_ure/source comphelper/source connectivity/source cppcanvas/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source drawinglayer/source dtrans/source editeng/source embeddedobj/source embedserv/source extensions/source filter/source forms/source formula/source fpicker/source framework/source hwpfilter/source i18npool/source idlc/source idl/source include/basegfx include/connectivity include/cppuhelper include/osl include/rtl include/salhelper include/svl include/uno include/unotools io/source jvmfwk/plugins lotuswordpro/source Makefile.in oox/source package/source pyuno/source registry/source reportdesign/source sal/osl sal/qa sal/rtl sax/source scripting/source sc/source sc/workben sdext/source sd/source sfx2/qa sfx2/source shell/source slideshow/source solenv/gbuild sot/source sta rmath/source stoc/source svl/source svtools/source svx/source sw/inc sw/source tools/source ucbhelper/source ucb/source unotools/source unoxml/source uui/source vcl/osx vcl/source vcl/unx writerfilter/source writerperfect/inc writerperfect/source xmlhelp/source xmloff/source xmlscript/source xmlsecurity/source
Michael Stahl
mstahl at redhat.com
Mon Nov 17 02:14:52 PST 2014
Makefile.in | 4
avmedia/source/macavf/manager.mm | 1
avmedia/source/quicktime/manager.mm | 1
basctl/source/basicide/docsignature.cxx | 3
basegfx/source/color/bcolormodifier.cxx | 2
basegfx/source/curve/b2dcubicbezier.cxx | 2
basegfx/source/matrix/b2dhommatrixtools.cxx | 2
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 2
basegfx/source/polygon/b2dtrapezoid.cxx | 3
basegfx/source/polygon/b3dpolypolygontools.cxx | 1
basegfx/source/range/b2drangeclipper.cxx | 1
basegfx/source/tools/b2dclipstate.cxx | 2
basegfx/source/tools/keystoplerp.cxx | 1
basic/source/basmgr/basicmanagerrepository.cxx | 1
basic/source/comp/codegen.cxx | 1
basic/source/comp/dim.cxx | 1
basic/source/comp/parser.cxx | 1
basic/source/comp/symtbl.cxx | 3
bin/gen-iwyu-dummy-lib | 64 ++++++++++
bin/run | 7 +
binaryurp/source/outgoingrequests.cxx | 1
bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx | 6
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx | 1
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 8 -
bridges/source/cpp_uno/gcc3_macosx_x86-64/abi.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 1
bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx | 8 -
bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx | 1
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 1
bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx | 1
canvas/source/directx/dx_config.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 1
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 1
chart2/source/model/filter/XMLFilter.cxx | 1
chart2/source/tools/CommonConverters.cxx | 1
chart2/source/tools/MeanValueRegressionCurveCalculator.cxx | 1
chart2/source/tools/NumberFormatterWrapper.cxx | 1
chart2/source/tools/PropertyHelper.cxx | 1
chart2/source/tools/RelativePositionHelper.cxx | 1
chart2/source/tools/XMLRangeHelper.cxx | 1
chart2/source/view/charttypes/Splines.cxx | 1
chart2/source/view/main/Clipping.cxx | 2
chart2/source/view/main/PlotterBase.cxx | 1
cli_ure/source/uno_bridge/cli_uno.cxx | 1
comphelper/source/misc/accimplaccess.cxx | 1
comphelper/source/misc/docpasswordhelper.cxx | 1
comphelper/source/misc/logging.cxx | 1
comphelper/source/misc/mimeconfighelper.cxx | 2
comphelper/source/misc/storagehelper.cxx | 2
comphelper/source/property/ChainablePropertySet.cxx | 2
comphelper/source/property/MasterPropertySet.cxx | 2
comphelper/source/property/propertysethelper.cxx | 2
comphelper/source/property/propertysetinfo.cxx | 2
comphelper/source/streaming/memorystream.cxx | 1
comphelper/source/streaming/seqstream.cxx | 2
connectivity/source/commontools/AutoRetrievingBase.cxx | 2
connectivity/source/commontools/sqlerror.cxx | 1
connectivity/source/cpool/ZPoolCollection.cxx | 1
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 1
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 1
connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 2
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 1
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx | 1
cppcanvas/source/wrapper/implcolor.cxx | 1
cppcanvas/source/wrapper/implpolypolygon.cxx | 1
cppu/source/AffineBridge/AffineBridge.cxx | 1
cppu/source/LogBridge/LogBridge.cxx | 1
cppuhelper/source/implementationentry.cxx | 2
cui/source/options/sdbcdriverenum.cxx | 1
dbaccess/source/core/dataaccess/documentevents.cxx | 1
dbaccess/source/core/inc/composertools.hxx | 1
dbaccess/source/ui/misc/propertystorage.cxx | 2
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 2
dbaccess/source/ui/querydesign/TableWindowData.cxx | 1
desktop/source/deployment/manager/dp_informationprovider.cxx | 1
desktop/source/deployment/misc/dp_interact.cxx | 1
desktop/source/deployment/misc/dp_platform.cxx | 1
desktop/source/deployment/misc/dp_update.cxx | 1
desktop/source/migration/services/jvmfwk.cxx | 1
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 2
dtrans/source/win32/dtobj/DOTransferable.cxx | 1
editeng/source/uno/unoedhlp.cxx | 1
editeng/source/uno/unoedsrc.cxx | 2
editeng/source/uno/unoipset.cxx | 1
embeddedobj/source/commonembedding/xfactory.hxx | 1
embeddedobj/source/inc/xcreator.hxx | 1
embeddedobj/source/msole/closepreventer.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 1
embeddedobj/source/msole/xolefactory.hxx | 1
embedserv/source/embed/servprov.cxx | 1
extensions/source/config/ldap/ldapaccess.cxx | 2
extensions/source/dbpilots/dbptools.cxx | 1
extensions/source/ole/unotypewrapper.cxx | 1
extensions/source/propctrlr/unourl.cxx | 1
extensions/source/propctrlr/xsddatatypes.cxx | 1
extensions/source/update/check/download.cxx | 1
extensions/source/update/check/updateprotocol.cxx | 1
extensions/source/update/feed/updatefeed.cxx | 1
filter/source/config/cache/cacheitem.cxx | 2
filter/source/config/cache/querytokenizer.cxx | 3
filter/source/msfilter/msocximex.cxx | 1
filter/source/msfilter/rtfutil.cxx | 1
filter/source/odfflatxml/OdfFlatXml.cxx | 1
filter/source/placeware/filter.cxx | 1
filter/source/svg/parserfragments.cxx | 1
filter/source/svg/units.cxx | 1
forms/source/helper/controlfeatureinterception.cxx | 1
forms/source/helper/formnavigation.cxx | 2
forms/source/xforms/NameContainer.hxx | 1
forms/source/xforms/computedexpression.cxx | 2
forms/source/xforms/convert.cxx | 1
forms/source/xforms/enumeration.cxx | 2
forms/source/xforms/resourcehelper.cxx | 1
forms/source/xforms/submission/replace.cxx | 1
formula/source/core/api/token.cxx | 1
fpicker/source/office/fpsmartcontent.cxx | 1
fpicker/source/office/fpsofficeResMgr.hxx | 1
fpicker/source/office/iodlgimp.cxx | 1
fpicker/source/win32/filepicker/controlcommand.cxx | 3
fpicker/source/win32/filepicker/previewadapter.cxx | 1
fpicker/source/win32/folderpicker/MtaFop.hxx | 1
framework/source/fwe/interaction/preventduplicateinteraction.cxx | 2
hwpfilter/source/hwpreader.cxx | 1
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 1
i18npool/source/localedata/localedata.cxx | 1
idl/source/objects/bastype.cxx | 1
idl/source/objects/object.cxx | 1
idl/source/objects/slot.cxx | 1
idl/source/prj/command.cxx | 4
idlc/source/astdeclaration.cxx | 1
idlc/source/astdump.cxx | 2
idlc/source/astexpression.cxx | 2
idlc/source/astinterface.cxx | 2
idlc/source/astscope.cxx | 1
idlc/source/parser.y | 1
include/basegfx/color/bcolormodifier.hxx | 3
include/basegfx/raster/rasterconvert3d.hxx | 3
include/connectivity/sqlnode.hxx | 1
include/cppuhelper/interfacecontainer.h | 2
include/osl/conditn.hxx | 3
include/osl/file.hxx | 1
include/osl/mutex.hxx | 3
include/osl/thread.hxx | 3
include/rtl/byteseq.hxx | 2
include/rtl/instance.hxx | 2
include/rtl/ref.hxx | 1
include/rtl/strbuf.hxx | 3
include/rtl/string.hxx | 1
include/rtl/ustrbuf.hxx | 1
include/rtl/ustring.hxx | 1
include/salhelper/refobj.hxx | 1
include/svl/filerec.hxx | 2
include/uno/mapping.hxx | 1
include/unotools/componentresmodule.hxx | 2
io/source/acceptor/acc_pipe.cxx | 1
io/source/stm/omark.cxx | 1
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2
lotuswordpro/source/filter/bencont.cxx | 1
lotuswordpro/source/filter/lwpfoundry.cxx | 3
lotuswordpro/source/filter/lwpfrib.cxx | 3
oox/source/core/binarycodec.cxx | 1
oox/source/core/contexthandler2.cxx | 1
oox/source/core/filterbase.cxx | 1
oox/source/core/recordparser.cxx | 1
oox/source/core/relationshandler.cxx | 1
oox/source/core/xmlfilterbase.cxx | 1
oox/source/docprop/docprophandler.cxx | 1
oox/source/drawingml/chart/axisconverter.cxx | 1
oox/source/drawingml/chart/chartconverter.cxx | 1
oox/source/drawingml/chart/chartdrawingfragment.cxx | 2
oox/source/drawingml/chart/converterbase.cxx | 1
oox/source/drawingml/chart/datasourcecontext.cxx | 2
oox/source/drawingml/chart/objectformatter.cxx | 1
oox/source/drawingml/chart/plotareaconverter.cxx | 1
oox/source/drawingml/chart/seriesconverter.cxx | 1
oox/source/drawingml/chart/titlecontext.cxx | 2
oox/source/drawingml/chart/titleconverter.cxx | 1
oox/source/drawingml/chart/typegroupconverter.cxx | 1
oox/source/drawingml/color.cxx | 1
oox/source/drawingml/customshapegeometry.cxx | 1
oox/source/drawingml/customshapeproperties.cxx | 1
oox/source/drawingml/diagram/constraintlistcontext.cxx | 1
oox/source/drawingml/diagram/datamodelcontext.cxx | 1
oox/source/drawingml/diagram/diagram.cxx | 1
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 1
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 1
oox/source/drawingml/diagram/layoutnodecontext.cxx | 1
oox/source/drawingml/drawingmltypes.cxx | 1
oox/source/drawingml/fillproperties.cxx | 1
oox/source/drawingml/hyperlinkcontext.cxx | 1
oox/source/drawingml/lineproperties.cxx | 1
oox/source/drawingml/textfield.cxx | 1
oox/source/drawingml/textparagraphproperties.cxx | 2
oox/source/drawingml/textrun.cxx | 2
oox/source/export/ColorPropertySet.cxx | 1
oox/source/helper/binaryinputstream.cxx | 1
oox/source/helper/containerhelper.cxx | 1
oox/source/helper/graphichelper.cxx | 1
oox/source/helper/modelobjecthelper.cxx | 1
oox/source/helper/progressbar.cxx | 1
oox/source/helper/propertymap.cxx | 1
oox/source/helper/storagebase.cxx | 1
oox/source/helper/textinputstream.cxx | 1
oox/source/helper/zipstorage.cxx | 1
oox/source/ole/axbinaryreader.cxx | 2
oox/source/ole/axcontrol.cxx | 1
oox/source/ole/axcontrolfragment.cxx | 2
oox/source/ole/olehelper.cxx | 1
oox/source/ole/oleobjecthelper.cxx | 1
oox/source/ole/olestorage.cxx | 1
oox/source/ole/vbacontrol.cxx | 1
oox/source/ole/vbahelper.cxx | 1
oox/source/ole/vbamodule.cxx | 1
oox/source/ole/vbaproject.cxx | 1
oox/source/ppt/pptimport.cxx | 1
oox/source/ppt/presentationfragmenthandler.cxx | 1
oox/source/ppt/slidefragmenthandler.cxx | 1
oox/source/ppt/slidepersist.cxx | 2
oox/source/ppt/slidetransition.cxx | 2
oox/source/vml/vmldrawing.cxx | 1
oox/source/vml/vmlformatting.cxx | 1
oox/source/vml/vmlinputstream.cxx | 1
oox/source/vml/vmlshapecontainer.cxx | 2
oox/source/vml/vmlshapecontext.cxx | 2
oox/source/vml/vmltextboxcontext.cxx | 1
package/source/manifest/ManifestExport.cxx | 1
package/source/manifest/ManifestImport.cxx | 1
package/source/xstor/register.cxx | 1
package/source/xstor/xfactory.cxx | 1
package/source/zipapi/Deflater.cxx | 1
package/source/zipapi/XUnbufferedStream.cxx | 1
package/source/zipapi/ZipFile.cxx | 1
package/source/zipapi/ZipOutputEntry.cxx | 1
package/source/zipapi/ZipOutputStream.cxx | 1
package/source/zippackage/ZipPackage.cxx | 1
pyuno/source/module/pyuno_callable.cxx | 1
pyuno/source/module/pyuno_runtime.cxx | 1
registry/source/keyimpl.cxx | 1
registry/source/reflread.cxx | 1
registry/source/regkey.cxx | 1
reportdesign/source/core/api/ReportVisitor.cxx | 4
reportdesign/source/core/misc/conditionalexpression.cxx | 3
reportdesign/source/ui/misc/FunctionHelper.cxx | 3
reportdesign/source/ui/report/dlgedclip.cxx | 1
sal/osl/unx/file_stat.cxx | 2
sal/qa/rtl/textenc/rtl_textcvt.cxx | 1
sal/rtl/ustrbuf.cxx | 1
sax/source/expatwrap/saxwriter.cxx | 1
sax/source/tools/converter.cxx | 1
sc/source/core/data/column.cxx | 1
sc/source/core/data/columniterator.cxx | 2
sc/source/core/data/dpfilteredcache.cxx | 1
sc/source/core/data/dpgroup.cxx | 1
sc/source/core/data/dpsave.cxx | 1
sc/source/core/data/dpshttab.cxx | 1
sc/source/core/data/dptabdat.cxx | 1
sc/source/core/data/dputil.cxx | 1
sc/source/core/data/globalx.cxx | 1
sc/source/core/data/markarr.cxx | 2
sc/source/core/data/markdata.cxx | 2
sc/source/core/data/olinetab.cxx | 2
sc/source/core/data/sheetevents.cxx | 1
sc/source/core/data/sortparam.cxx | 2
sc/source/core/data/subtotalparam.cxx | 2
sc/source/core/data/table6.cxx | 1
sc/source/core/data/tabprotection.cxx | 1
sc/source/core/tool/address.cxx | 1
sc/source/core/tool/adiasync.cxx | 1
sc/source/core/tool/chartpos.cxx | 2
sc/source/core/tool/consoli.cxx | 1
sc/source/core/tool/defaultsoptions.cxx | 1
sc/source/core/tool/doubleref.cxx | 1
sc/source/core/tool/filtopt.cxx | 1
sc/source/core/tool/formulaopt.cxx | 1
sc/source/core/tool/jumpmatrix.cxx | 2
sc/source/core/tool/printopt.cxx | 1
sc/source/core/tool/prnsave.cxx | 2
sc/source/core/tool/queryparam.cxx | 1
sc/source/core/tool/rangelst.cxx | 1
sc/source/core/tool/rangenam.cxx | 1
sc/source/core/tool/rangeseq.cxx | 1
sc/source/core/tool/rechead.cxx | 2
sc/source/core/tool/refupdat.cxx | 2
sc/source/core/tool/stylehelper.cxx | 1
sc/source/filter/dif/difexp.cxx | 1
sc/source/filter/dif/difimp.cxx | 1
sc/source/filter/excel/xerecord.cxx | 2
sc/source/filter/excel/xestring.cxx | 2
sc/source/filter/excel/xistream.cxx | 1
sc/source/filter/excel/xladdress.cxx | 2
sc/source/filter/excel/xlpivot.cxx | 1
sc/source/filter/excel/xlview.cxx | 1
sc/source/filter/ftools/fprogressbar.cxx | 1
sc/source/filter/ftools/ftools.cxx | 1
sc/source/filter/inc/fapihelper.hxx | 1
sc/source/filter/inc/namebuff.hxx | 1
sc/source/filter/inc/richstringcontext.hxx | 1
sc/source/filter/inc/tokstack.hxx | 1
sc/source/filter/inc/tool.h | 1
sc/source/filter/inc/xlformula.hxx | 1
sc/source/filter/oox/autofilterbuffer.cxx | 1
sc/source/filter/oox/biffhelper.cxx | 1
sc/source/filter/oox/biffinputstream.cxx | 1
sc/source/filter/oox/commentsbuffer.cxx | 1
sc/source/filter/oox/condformatbuffer.cxx | 1
sc/source/filter/oox/connectionsbuffer.cxx | 1
sc/source/filter/oox/defnamesbuffer.cxx | 1
sc/source/filter/oox/drawingbase.cxx | 1
sc/source/filter/oox/drawingmanager.cxx | 1
sc/source/filter/oox/excelchartconverter.cxx | 1
sc/source/filter/oox/excelfilter.cxx | 1
sc/source/filter/oox/externallinkbuffer.cxx | 1
sc/source/filter/oox/formulabase.cxx | 1
sc/source/filter/oox/formulaparser.cxx | 1
sc/source/filter/oox/numberformatsbuffer.cxx | 1
sc/source/filter/oox/ooxformulaparser.cxx | 1
sc/source/filter/oox/pivotcachebuffer.cxx | 1
sc/source/filter/oox/pivotcachefragment.cxx | 1
sc/source/filter/oox/querytablebuffer.cxx | 1
sc/source/filter/oox/tablebuffer.cxx | 1
sc/source/filter/oox/unitconverter.cxx | 1
sc/source/filter/oox/viewsettings.cxx | 1
sc/source/filter/oox/worksheetbuffer.cxx | 1
sc/source/filter/oox/worksheethelper.cxx | 1
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 1
sc/source/filter/xml/XMLDDELinksContext.cxx | 1
sc/source/filter/xml/XMLExportSharedData.cxx | 1
sc/source/filter/xml/XMLStylesImportHelper.cxx | 1
sc/source/filter/xml/XMLTableShapeResizer.cxx | 2
sc/source/filter/xml/sheetdata.cxx | 1
sc/source/ui/app/uiitems.cxx | 1
sc/source/ui/docshell/macromgr.cxx | 1
sc/source/ui/docshell/pagedata.cxx | 2
sc/source/ui/miscdlgs/solverutil.cxx | 1
sc/source/ui/unoobj/listenercalls.cxx | 1
sc/source/ui/view/scextopt.cxx | 2
sc/workben/addin.cxx | 4
sc/workben/result.cxx | 4
scripting/source/inc/util/MiscUtils.hxx | 1
scripting/source/provider/URIHelper.cxx | 1
scripting/source/vbaevents/service.cxx | 1
sd/source/filter/ppt/propread.cxx | 1
sd/source/ui/animations/STLPropertySet.cxx | 2
sd/source/ui/sidebar/MasterPageContainer.cxx | 1
sd/source/ui/slidesorter/view/SlsFontProvider.cxx | 1
sdext/source/minimizer/configurationaccess.cxx | 1
sdext/source/pdfimport/misc/pwdinteract.cxx | 1
sdext/source/pdfimport/odf/odfemitter.cxx | 1
sdext/source/pdfimport/sax/emitcontext.cxx | 1
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 1
sdext/source/pdfimport/tree/imagecontainer.cxx | 1
sdext/source/pdfimport/tree/writertreevisiting.cxx | 1
sdext/source/presenter/PresenterBitmapContainer.cxx | 1
sdext/source/presenter/PresenterConfigurationAccess.cxx | 1
sdext/source/presenter/PresenterTheme.cxx | 1
sfx2/qa/cppunit/test_metadatable.cxx | 3
sfx2/source/control/msg.cxx | 2
sfx2/source/control/sorgitm.cxx | 2
sfx2/source/doc/sfxmodelfactory.cxx | 2
sfx2/source/doc/zoomitem.cxx | 1
sfx2/source/sidebar/ContextChangeBroadcaster.cxx | 1
sfx2/source/sidebar/EnumContext.cxx | 2
shell/source/backends/macbe/macbackend.mm | 1
shell/source/unix/sysshell/recently_used_file_handler.cxx | 1
slideshow/source/engine/activitiesqueue.cxx | 1
slideshow/source/engine/screenupdater.cxx | 2
slideshow/source/engine/transitions/snakewipe.cxx | 1
slideshow/source/engine/unoviewcontainer.cxx | 4
solenv/gbuild/LinkTarget.mk | 2
solenv/gbuild/StaticLibrary.mk | 12 +
sot/source/base/factory.cxx | 1
sot/source/base/filelist.cxx | 1
sot/source/sdstor/stgcache.cxx | 1
sot/source/sdstor/stgdir.cxx | 3
sot/source/sdstor/ucbstorage.cxx | 1
starmath/source/accessibility.hxx | 4
starmath/source/cfgitem.hxx | 4
stoc/source/implementationregistration/mergekeys.cxx | 2
stoc/source/security/permissions.cxx | 1
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 1
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 1
svl/source/config/ctloptions.cxx | 1
svl/source/config/itemholder2.cxx | 1
svl/source/inc/fsfactory.hxx | 1
svl/source/items/cenumitm.cxx | 1
svl/source/items/cintitem.cxx | 1
svl/source/items/cntwall.cxx | 1
svl/source/items/ctypeitm.cxx | 1
svl/source/items/custritm.cxx | 1
svl/source/items/globalnameitem.cxx | 2
svl/source/items/intitem.cxx | 1
svl/source/items/itempool.cxx | 1
svl/source/items/lckbitem.cxx | 1
svl/source/items/nranges.cxx | 2
svl/source/items/poolitem.cxx | 1
svl/source/items/ptitem.cxx | 1
svl/source/items/rectitem.cxx | 1
svl/source/items/slstitm.cxx | 1
svl/source/items/srchitem.cxx | 1
svl/source/items/style.cxx | 1
svl/source/items/stylepool.cxx | 4
svl/source/items/szitem.cxx | 1
svl/source/items/visitem.cxx | 1
svl/source/misc/inethist.cxx | 2
svl/source/misc/inettype.cxx | 1
svl/source/misc/strmadpt.cxx | 1
svl/source/numbers/numfmuno.cxx | 1
svl/source/numbers/supservs.cxx | 1
svl/source/passwordcontainer/passwordcontainer.cxx | 1
svl/source/passwordcontainer/syscreds.cxx | 1
svtools/source/config/itemholder2.cxx | 1
svtools/source/config/optionsdrawinglayer.cxx | 4
svtools/source/config/slidesorterbaropt.cxx | 1
svtools/source/filter/exportdialog.cxx | 4
svtools/source/misc/imageresourceaccess.cxx | 1
svtools/source/misc/templatefoldercache.cxx | 1
svtools/source/uno/unoevent.cxx | 1
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 1
svx/source/dialog/rulritem.cxx | 1
svx/source/form/fmcontrolbordermanager.cxx | 1
svx/source/form/fmsrccfg.cxx | 2
svx/source/form/fmtextcontrolfeature.cxx | 1
svx/source/form/formtoolbars.cxx | 1
svx/source/items/rotmodit.cxx | 1
svx/source/items/viewlayoutitem.cxx | 1
svx/source/items/zoomslideritem.cxx | 2
sw/inc/txtfld.hxx | 1
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 1
sw/source/core/bastyp/breakit.cxx | 1
sw/source/core/bastyp/swcache.cxx | 5
sw/source/core/docnode/finalthreadmanager.cxx | 1
sw/source/core/docnode/threadmanager.cxx | 2
sw/source/core/fields/flddropdown.cxx | 2
sw/source/core/inc/drawfont.hxx | 1
sw/source/core/inc/scriptinfo.hxx | 1
sw/source/core/text/wrong.cxx | 1
sw/source/core/unocore/XMLRangeHelper.cxx | 1
sw/source/core/unocore/swunohelper.cxx | 1
sw/source/core/unocore/unomap.cxx | 1
sw/source/filter/ww8/styles.cxx | 1
sw/source/ui/vba/service.cxx | 1
sw/source/uibase/inc/maildispatcher.hxx | 1
tools/source/generic/b3dtrans.cxx | 2
tools/source/generic/bigint.cxx | 1
tools/source/generic/fract.cxx | 1
tools/source/generic/poly.cxx | 1
tools/source/generic/poly2.cxx | 1
tools/source/inet/inetmime.cxx | 1
tools/source/ref/errinf.cxx | 1
tools/source/ref/pstm.cxx | 1
tools/source/stream/stream.cxx | 1
ucb/source/ucp/tdoc/tdoc_contentcaps.cxx | 1
ucb/source/ucp/tdoc/tdoc_provider.cxx | 1
ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 2
ucb/source/ucp/tdoc/tdoc_storage.cxx | 1
ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 1
ucb/source/ucp/webdav-neon/LockSequence.cxx | 1
ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 1
ucbhelper/source/client/interceptedinteraction.cxx | 1
ucbhelper/source/client/proxydecider.cxx | 2
ucbhelper/source/provider/fd_inputstream.cxx | 1
ucbhelper/source/provider/interactionrequest.cxx | 4
ucbhelper/source/provider/simpleinteractionrequest.cxx | 2
unotools/source/config/cmdoptions.cxx | 1
unotools/source/config/eventcfg.cxx | 1
unotools/source/config/extendedsecurityoptions.cxx | 1
unotools/source/config/fltrcfg.cxx | 1
unotools/source/config/fontcfg.cxx | 1
unotools/source/config/saveopt.cxx | 1
unotools/source/config/searchopt.cxx | 1
unotools/source/config/viewoptions.cxx | 1
unotools/source/i18n/localedatawrapper.cxx | 1
unotools/source/misc/datetime.cxx | 1
unotools/source/misc/desktopterminationobserver.cxx | 1
unotools/source/misc/mediadescriptor.cxx | 1
unotools/source/misc/sharedunocomponent.cxx | 1
unotools/source/ucbhelper/ucblockbytes.cxx | 1
unoxml/source/dom/attr.cxx | 2
unoxml/source/dom/characterdata.cxx | 2
unoxml/source/dom/document.cxx | 2
unoxml/source/dom/documentbuilder.cxx | 1
unoxml/source/dom/documenttype.cxx | 2
unoxml/source/dom/domimplementation.cxx | 1
unoxml/source/dom/element.cxx | 1
unoxml/source/dom/elementlist.cxx | 2
unoxml/source/dom/entitiesmap.cxx | 2
unoxml/source/dom/entity.cxx | 2
unoxml/source/dom/node.cxx | 1
unoxml/source/dom/notation.cxx | 2
unoxml/source/dom/notationsmap.cxx | 2
unoxml/source/dom/text.cxx | 2
unoxml/source/rdf/librdf_repository.cxx | 1
uui/source/passwordcontainer.cxx | 1
vcl/osx/HtmlFmtFlt.cxx | 1
vcl/osx/OSXTransferable.cxx | 1
vcl/osx/documentfocuslistener.cxx | 4
vcl/source/edit/textdoc.cxx | 1
vcl/source/filter/FilterConfigItem.cxx | 1
vcl/source/font/PhysicalFontCollection.cxx | 4
vcl/source/fontsubset/fontsubset.cxx | 2
vcl/source/gdi/bitmap4.cxx | 1
vcl/source/gdi/bmpacc.cxx | 2
vcl/source/gdi/region.cxx | 1
vcl/source/gdi/regionband.cxx | 1
vcl/source/gdi/salmisc.cxx | 1
vcl/source/outdev/text.cxx | 4
vcl/unx/gtk/a11y/atktext.cxx | 2
vcl/unx/gtk/a11y/atkwrapper.cxx | 1
writerfilter/source/dmapper/CellMarginHandler.cxx | 1
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 1
writerfilter/source/dmapper/MeasureHandler.cxx | 1
writerfilter/source/dmapper/NumberingManager.cxx | 1
writerfilter/source/dmapper/OLEHandler.cxx | 1
writerfilter/source/dmapper/PropertyMap.cxx | 1
writerfilter/source/dmapper/SectionColumnHandler.cxx | 1
writerfilter/source/dmapper/StyleSheetTable.cxx | 1
writerfilter/source/dmapper/TrackChangesHandler.cxx | 1
writerfilter/source/filter/RtfFilter.cxx | 1
writerfilter/source/filter/WriterFilterDetection.cxx | 1
writerperfect/inc/writerperfect/ImportFilter.hxx | 1
writerperfect/source/impress/ImportFilterBase.cxx | 2
xmlhelp/source/cxxhelp/provider/db.hxx | 1
xmloff/source/chart/ColorPropertySet.cxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 1
xmloff/source/core/DocumentSettingsContext.cxx | 1
xmloff/source/core/ProgressBarHelper.cxx | 2
xmloff/source/core/SvXMLAttrCollection.cxx | 1
xmloff/source/core/attrlist.cxx | 1
xmloff/source/core/xmlerror.cxx | 1
xmloff/source/core/xmluconv.cxx | 1
xmloff/source/draw/XMLReplacementImageContext.cxx | 1
xmloff/source/draw/animationimport.cxx | 1
xmloff/source/draw/animimp.cxx | 1
xmloff/source/draw/eventimp.cxx | 1
xmloff/source/draw/layerimp.cxx | 1
xmloff/source/draw/shapeimport.cxx | 1
xmloff/source/draw/ximp3dobject.cxx | 1
xmloff/source/draw/ximppage.cxx | 1
xmloff/source/draw/ximpshap.cxx | 1
xmloff/source/draw/ximpstyl.cxx | 1
xmloff/source/forms/attriblistmerge.cxx | 2
xmloff/source/forms/elementimport_impl.hxx | 2
xmloff/source/forms/eventimport.cxx | 1
xmloff/source/forms/formattributes.cxx | 3
xmloff/source/forms/handler/form_handler_factory.cxx | 1
xmloff/source/forms/property_meta_data.cxx | 1
xmloff/source/style/EnumPropertyHdl.cxx | 1
xmloff/source/style/PageMasterImportContext.cxx | 1
xmloff/source/style/PageMasterPropHdlFactory.cxx | 1
xmloff/source/style/XMLConstantsPropertyHandler.cxx | 1
xmloff/source/style/XMLIsPercentagePropertyHandler.cxx | 1
xmloff/source/style/cdouthdl.cxx | 1
xmloff/source/style/prstylei.cxx | 1
xmloff/source/style/undlihdl.cxx | 1
xmloff/source/style/xmlimppr.cxx | 1
xmloff/source/style/xmlnumfi.cxx | 1
xmloff/source/style/xmlnumi.cxx | 1
xmloff/source/table/XMLTableImport.cxx | 2
xmloff/source/text/XMLIndexTOCContext.cxx | 1
xmloff/source/text/XMLTextFrameContext.cxx | 1
xmloff/source/text/XMLTextMarkImportContext.cxx | 1
xmloff/source/text/XMLTextMasterPageContext.cxx | 1
xmloff/source/text/XMLTextNumRuleInfo.cxx | 1
xmloff/source/text/txtfldi.cxx | 1
xmloff/source/text/txtimp.cxx | 1
xmloff/source/text/txtimppr.cxx | 1
xmloff/source/text/txtlists.cxx | 1
xmloff/source/text/txtprhdl.cxx | 1
xmloff/source/text/txtprmap.cxx | 1
xmloff/source/text/txtvfldi.cxx | 1
xmloff/source/transform/ChartOASISTContext.cxx | 1
xmloff/source/transform/ChartOOoTContext.cxx | 1
xmloff/source/transform/ChartPlotAreaOASISTContext.cxx | 1
xmloff/source/transform/ChartPlotAreaOOoTContext.cxx | 1
xmloff/source/transform/ControlOASISTContext.cxx | 1
xmloff/source/transform/CreateElemTContext.cxx | 1
xmloff/source/transform/DeepTContext.cxx | 1
xmloff/source/transform/DlgOASISTContext.cxx | 1
xmloff/source/transform/EventOASISTContext.cxx | 1
xmloff/source/transform/EventOOoTContext.cxx | 1
xmloff/source/transform/FormPropOASISTContext.cxx | 1
xmloff/source/transform/FormPropOOoTContext.cxx | 1
xmloff/source/transform/FrameOASISTContext.cxx | 1
xmloff/source/transform/FrameOOoTContext.cxx | 1
xmloff/source/transform/MergeElemTContext.cxx | 1
xmloff/source/transform/NotesTContext.cxx | 1
xmloff/source/transform/OOo2Oasis.cxx | 1
xmloff/source/transform/PersMixedContentTContext.cxx | 2
xmloff/source/transform/StyleOASISTContext.cxx | 1
xmloff/source/transform/StyleOOoTContext.cxx | 1
xmloff/source/transform/TransformerActions.cxx | 1
xmloff/source/transform/TransformerBase.cxx | 1
xmloff/source/transform/TransformerContext.cxx | 1
xmloff/source/transform/XMLFilterRegistration.cxx | 1
xmloff/source/xforms/SchemaRestrictionContext.cxx | 1
xmloff/source/xforms/SchemaSimpleTypeContext.cxx | 2
xmloff/source/xforms/XFormsBindContext.cxx | 1
xmloff/source/xforms/XFormsInstanceContext.cxx | 1
xmloff/source/xforms/XFormsModelContext.cxx | 2
xmloff/source/xforms/XFormsSubmissionContext.cxx | 1
xmloff/source/xforms/xformsapi.cxx | 1
xmlscript/source/xml_helper/xml_element.cxx | 1
xmlscript/source/xmldlg_imexp/imp_share.hxx | 1
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 1
xmlsecurity/source/framework/buffernode.cxx | 1
xmlsecurity/source/framework/decryptorimpl.cxx | 1
xmlsecurity/source/framework/encryptorimpl.cxx | 3
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 1
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 3
xmlsecurity/source/framework/signatureverifierimpl.cxx | 1
xmlsecurity/source/helper/documentsignaturehelper.cxx | 1
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 1
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 1
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 1
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 1
619 files changed, 827 insertions(+), 88 deletions(-)
New commits:
commit e9a7ff98800b820e2245a2b90a263ef8b60a459c
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Nov 15 00:04:54 2014 +0100
salhelper: include-what-you-use cleanup of public headers
Change-Id: Ie778e541cecadeefc5ee5f30af9577a00c870a58
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index f84c312..f918784 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -22,7 +22,6 @@
#include <sal/types.h>
#include <rtl/alloc.h>
-#include <rtl/ref.hxx>
#include <osl/diagnose.h>
#include <osl/interlck.h>
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index 8dc22fc..7ebb1ec1 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/mail/XMailMessage.hpp>
#include <osl/thread.hxx>
#include <osl/conditn.hxx>
+#include <rtl/ref.hxx>
#include <salhelper/refobj.hxx>
#include <list>
commit 6a0fe37dec107392fbe468a35b89071b9a93d2c1
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 14 22:52:35 2014 +0100
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
diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm
index 8fc0f2b..ece9d58 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 fa315fd..7de493c 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 0553bbd..0212f9e 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 44515fa..7727efd 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 b2b53fc..bbafb7b 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 386ee9b..645d4c7 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 c4cb856..5b0c3c8 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 3b80c0b..a5ac050 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 e77cb91..0f74f6e 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 3f8f6f6..60100be 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 ddb2318..54d2797 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 70bdb7e..14a0312 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 d7928d8..3f873e4 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 e0e1dec..9d8ac57 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 a838be8..2142324 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 c7e122a..9ce5bdb 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 99e02e3..9cef215 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 06b2553..1f4254f 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 facdcdd..2a66686 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 3c489d4..aa91f3f 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 52826e0..c0da728 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 facdcdd..2a66686 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 5399284..a299fc5 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 1ff0234..fd8eab4 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 0927cf6..48a8650 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 d2b9d5c..27c8ef6 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 55cbeb2..a7cf474 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 7ecfe52..64d591a 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 a7e7dc1..78a0076 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 85d8e7e..cfee937 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 9574f36..a5acbc5 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 7230d94..ae3ac82 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 a5984ede..0fd2cf4 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 d7d27ee..8571f94 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 0278fb7..b40243e 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 1a65728..13b7ed1 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 2ca570a..365e3a3 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 f195c83..233bc98 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 b66a2c7..526499f 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 9992f9d..ee814eb 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 85f8762..d391c4f 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 c273899..8d1334e 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 97b0fa0..aa1a1a0 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 96f255d..d40a2a0 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 25a5e96..4bda261 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 d340157..4c4d56d 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 249f474..ee9b6e5 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 67d14c1..2b01808 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 1f29c4a..4c66d8c 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 6cb5abf..5ba477a 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 b85fe96..9c522c7 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 ce42d4a..3b10733 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 9f71eb2..3701683 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 5bc44a5..6e8f93b 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 9157e33..ac573ac 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 39e46db..37c4e65 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 9976b55..8639743 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 8416f41..d3cb62b 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 08e660d..8e30cfe 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 a39f617..d6ca0cf 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 cfe2a60..a0ea035 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 9b36e68..c66a68f 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 d98ffd2..fa59576 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 f390ed6..9273778 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 24b8127..378544e 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 a7d0de7..3393580 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 6b10eac..d810e5e 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 cac802c..9a35a3b 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 1e43dad..40c0d18 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 83df52e..d5b98ff 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 3d59a5e..7fb7c99 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 44ffd4d..d27e3da 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 0d6607b..f6bfa84 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 7ccb609..7ff3e91 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 2c35355..0921d69 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 a63d527..7f217f1 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 f8bde2e..3ce55ea 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 888bb5e..f8dd6ba2 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 607c411..9d4813b 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 a88b32b..6198d8d 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 dec1333..6424892 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 ac5f6a0..b20565c 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 499361a..0700000 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 1c0e583..1cfe18a 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 d637545..171b41f 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 2076e5a..e381aa8 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 7b9fe78..df15f97 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 eefaf27..b4dac71 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 a2db313..d68e682 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 2acd027..39bd5b8 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 a6ce9fd..1b647e8 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 3191c4f..dd6364b 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 5b9d316..51b2b9e 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 1844162..8334af6 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 8c0d6d6..092f141 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 6287c9c..b10a97f 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 fe41615..5428544 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 65945af..ef0b66f 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 2869f34..4dea850 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 88af7e8..a2c8598 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 847ba34..f833fb1 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 fe800ef..64b6dd1 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 e4064cf..2d73c33 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 812f808..9310db8 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 9bbf917..d0165b1 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 18904ea..a341316 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 1d647d7..b3ad065 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 7d1b63b..9f70e3c 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 4dd5e59..d51e71f 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 ddaeafa8..4dee774 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 2ae9408..50f9f3c 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 b6641a0..a061457 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 2c2f670..0abdab0 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 06cc812..92486dc 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 d5b7df6..3774e8b 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 7fb6f05..76b4538 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 949ffaf..8994f9a 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 25225d5..6800e67 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 380750e..1655fe2 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 683c8e8..4e2fb2c 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 1eb828e..c4a62bb 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 af7b231..59aed8a 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 e7b1309..684ef2b 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 f223026..85a16dc 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 f83f901..fc9d3b8 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 6af559c..96bd62e 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 023a926..f0853a7 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 465cbfc..6e19727 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 f5adfea..c23894e 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 c9a2c47..90b182c 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 99d415d..bb01c0a 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 8bd8fb7..f6b9eef 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 172c2be..c57d14c 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 4007780..af911c6 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 7a0ddb5..33287ce 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 162ef84..92e7c03 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 980ec62..389bd88 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 4b52c55..2813af0 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 07773b8..293f18d 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 e5331ef..0c095a2 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 c54aa64..c49e371 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 f8b75a7..25f5173 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 77de66a..942923a 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 21cca10..0f65c43 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 8ed7381..64c26cf 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 66b320f..72048b3 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 6b8b2c3..d078ad1 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 2291bc2..2ad5ae1 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 ff8bd91..f30cdcd 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 f087b44..abab10b 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 4ef6c70..004842c 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 1a2173d..a305139 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 8ed9df1..14951bf3 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 04fa6f3..580f5fd 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 ea90d08..aca528b 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 2a2289e..25f367a 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 1201aed..5e6b739 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 5537f3e..48c5f2a 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 2e73390..708632b 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 4802b8f..9bcd1e3 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 18a443a..ccebf18 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 5182b99..54b3c50 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 0767895..0090cae 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 7304fbc..b39ca70 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 d8f8092..5a7035b 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 611d8d7..022d867 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 c157e74..946b5bd 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 dd53dde..c7d2368 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 f15086d..bc054ce 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 ab4f7df..1925314 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 e589335..7c4a190 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 844aa0a..0aeba99 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 3a23d44..7a7b2a6 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 e6f3bf1..2d36cbf 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 6868e2c..9d6db8f 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 64fe535..7a1b171 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 04b14fb..99d5614 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 b5b6dff..209e718 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 8741353..3961beb 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 cd304b9..7f43761 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 dc5f2db..180a613 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 facfda4..c920706 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 c2fb438..31529ed 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 fd45658..d25f8bf 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 aae50e8..8dfb90c 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 e819981..efa1ab8 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 2523156..21b47f1 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 a7b5f6b..22bab14 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 f4b75db..ca744e8 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 5a40215..ae7df6e 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 6c97222..b514beb 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 805a9c5..4a9d723 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 180df3c..0638ffe 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 4b6ef28..d29755b 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 307a78b..36820d7 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 6404cf9..5dd70be 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 1083d02..ff6e1f0 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 82148c4..d5e7894 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 be8068c..d535ac6 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 9df00e7..cee80c4 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 d3d0297..4dca8af 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 9f4d812..0f6604c 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 88a80e8..92aacef 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 a2c008a..f5d4df4 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 46533d0..8d27eea 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 c60007b..30d7e00 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 18a1416..d47726f 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 86689eb..4c0bf9b 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 6bffdd7..24d474d 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 c3d733a..1d6e7c6 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 811550e..541e2a1 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 0edece0..95ea839 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 54b28e6..82d0f9f 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 45b0076..45e7cce 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 97634ef..c808c7f 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 83f4c29..4056970 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 28ef7bb..9fab155 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 76daf62..3b40e56 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 f3ed601..71905ba 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 c882021..8a1d5fb 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 1ced0a6..b7a6acb 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 6c25115..02854f7 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 bf57fc7..3020ddd 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 ffc3f22..54905ab 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 42628d7..70fe26d 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 329e45f..c4fbcfa 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 1fd536f..cd4ed2e 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 54600d59..adbbf25 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 902816e..9c12527 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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list