diff options
28 files changed, 58 insertions, 35 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 4055250956a5..1d04aac7d5ba 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -11,6 +11,7 @@ #define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_HXX #include "LibreOfficeKit.h" +#include "LibreOfficeKitInit.h" /* * The reasons this C++ code is not as pretty as it could be are: diff --git a/include/basebmp/basebmpdllapi.h b/include/basebmp/basebmpdllapi.h index c44eee01ce7b..88241af7a812 100644 --- a/include/basebmp/basebmpdllapi.h +++ b/include/basebmp/basebmpdllapi.h @@ -20,6 +20,8 @@ #ifndef INCLUDED_BASEBMP_BASEBMPDLLAPI_H #define INCLUDED_BASEBMP_BASEBMPDLLAPI_H +#include <sal/types.h> + #if defined BASEBMP_DLLIMPLEMENTATION #define BASEBMP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx index cddca2186578..f11dcf26a9f9 100644 --- a/include/basegfx/raster/bzpixelraster.hxx +++ b/include/basegfx/raster/bzpixelraster.hxx @@ -22,6 +22,7 @@ #include <basegfx/raster/bpixelraster.hxx> #include <basegfx/basegfxdllapi.h> +#include <osl/diagnose.h> namespace basegfx { diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index 1ae28adcade5..17ef7566b764 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_BASIC_SBXCORE_HXX #define INCLUDED_BASIC_SBXCORE_HXX -#include <tools/rtti.hxx> -#include <tools/ref.hxx> - -#include <basic/sbxdef.hxx> #include <basic/basicdllapi.h> +#include <basic/sbxdef.hxx> +#include <rtl/ustring.hxx> +#include <tools/ref.hxx> +#include <tools/rtti.hxx> class SvStream; diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx index a6b2557e3d0a..e0ac82ac33ef 100644 --- a/include/canvas/base/canvascustomspritehelper.hxx +++ b/include/canvas/base/canvascustomspritehelper.hxx @@ -20,14 +20,15 @@ #ifndef INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX #define INCLUDED_CANVAS_BASE_CANVASCUSTOMSPRITEHELPER_HXX -#include <com/sun/star/rendering/XCustomSprite.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> +#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/point/b2dpoint.hxx> -#include <basegfx/vector/b2dvector.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/vector/b2dvector.hxx> #include <canvas/base/spritesurface.hxx> #include <canvas/canvastoolsdllapi.h> +#include <com/sun/star/rendering/XCustomSprite.hpp> +#include <com/sun/star/rendering/XPolyPolygon2D.hpp> namespace canvas { diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx index b0caf19734e2..6e3c12c9e0ba 100644 --- a/include/canvas/base/disambiguationhelper.hxx +++ b/include/canvas/base/disambiguationhelper.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX #define INCLUDED_CANVAS_BASE_DISAMBIGUATIONHELPER_HXX +#include <com/sun/star/lang/EventObject.hpp> #include <osl/mutex.hxx> diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx index 30bc610c75f6..2516a7cfee61 100644 --- a/include/canvas/rendering/icachedprimitive.hxx +++ b/include/canvas/rendering/icachedprimitive.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX #define INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX +#include <com/sun/star/rendering/Viewstate.hpp> #include <sal/types.h> #include <memory> diff --git a/include/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx index 704946b46d8c..19e5ce8bd734 100644 --- a/include/connectivity/SQLStatementHelper.hxx +++ b/include/connectivity/SQLStatementHelper.hxx @@ -22,6 +22,7 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <rtl/ustrbuf.hxx> namespace dbtools { diff --git a/include/connectivity/StdTypeDefs.hxx b/include/connectivity/StdTypeDefs.hxx index 9c68fc34c834..78720651e723 100644 --- a/include/connectivity/StdTypeDefs.hxx +++ b/include/connectivity/StdTypeDefs.hxx @@ -19,18 +19,17 @@ #ifndef INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX #define INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX -#include <sal/config.h> - #include <map> #include <vector> -#include <sal/types.h> + +#include <rtl/ustring.hxx> namespace connectivity { typedef ::std::vector< OUString> TStringVector; - typedef ::std::vector< sal_Int32> TIntVector; - typedef ::std::map<sal_Int32,sal_Int32> TInt2IntMap; + typedef ::std::vector< sal_Int32> TIntVector; + typedef ::std::map<sal_Int32,sal_Int32> TInt2IntMap; typedef ::std::map< OUString,sal_Int32> TString2IntMap; typedef ::std::map< sal_Int32,OUString> TInt2StringMap; } diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx index e1b477bc82e7..ab773c8073c7 100644 --- a/include/drawinglayer/processor2d/canvasprocessor.hxx +++ b/include/drawinglayer/processor2d/canvasprocessor.hxx @@ -20,17 +20,17 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX -#include <drawinglayer/drawinglayerdllapi.h> - -#include <drawinglayer/processor2d/baseprocessor2d.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> -#include <svtools/optionsdrawinglayer.hxx> -#include <com/sun/star/rendering/ViewState.hpp> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <com/sun/star/rendering/RenderState.hpp> +#include <com/sun/star/rendering/ViewState.hpp> +#include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <i18nlangtag/lang.h> -#include <basegfx/polygon/b2dpolypolygon.hxx> +#include <svtools/optionsdrawinglayer.hxx> #include <vcl/mapmod.hxx> +#include <vcl/vclptr.hxx> namespace basegfx { class BColor; diff --git a/include/editeng/eedata.hxx b/include/editeng/eedata.hxx index cd1db6e0775c..321cf04e43e7 100644 --- a/include/editeng/eedata.hxx +++ b/include/editeng/eedata.hxx @@ -25,6 +25,8 @@ // later. #include <vector> +#include <sal/types.h> + namespace EEngineData { // spell checking wrong vector containing the redlining data diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx index 9bc8f9aa3c1a..755dfe5ae8a0 100644 --- a/include/filter/msfilter/msocximex.hxx +++ b/include/filter/msfilter/msocximex.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX #define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX +#include <com/sun/star/uno/Reference.hxx> #include <filter/msfilter/msfilterdllapi.h> namespace com{namespace sun{namespace star{ diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 752b99240e3d..bd37a8e7107f 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX #define INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX +#include <com/sun/star/io/XInputStream.hpp> #include <rtl/ustring.hxx> #include <tools/solar.h> #include <tools/gen.hxx> diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 312e18c87b11..5b549d29ac20 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -20,14 +20,16 @@ #ifndef INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX #define INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX -#include <tools/solar.h> -#include <filter/msfilter/msfilterdllapi.h> - #include <map> #include <unordered_map> +#include <filter/msfilter/msfilterdllapi.h> +#include <rtl/ustring.hxx> +#include <sot/storage.hxx> +#include <tools/solar.h> +#include <tools/ref.hxx> + class SfxObjectShell; -class SotStorage; /* Construct with the root storage of the MS document, with bImportCode * set the visual basic code will be imported into the stardocument when Import diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx index 11cf043255eb..5d74fb1d6845 100644 --- a/include/formula/IControlReferenceHandler.hxx +++ b/include/formula/IControlReferenceHandler.hxx @@ -20,6 +20,7 @@ #define INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX #include <formula/formuladllapi.h> +#include <rtl/ustring.hxx> namespace formula { diff --git a/include/jvmaccess/unovirtualmachine.hxx b/include/jvmaccess/unovirtualmachine.hxx index 7b34b5f71a46..5ff94a784916 100644 --- a/include/jvmaccess/unovirtualmachine.hxx +++ b/include/jvmaccess/unovirtualmachine.hxx @@ -21,14 +21,13 @@ #define INCLUDED_JVMACCESS_UNOVIRTUALMACHINE_HXX #include <jvmaccess/jvmaccessdllapi.h> +#include <jvmaccess/virtualmachine.hxx> #include <sal/config.h> #include <salhelper/simplereferenceobject.hxx> #include <rtl/ref.hxx> namespace jvmaccess { -class VirtualMachine; - /** An encapsulating wrapper around a Java virtual machine and an appropriate UNO class loader. */ diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx index 417e552fff30..66854f61998f 100644 --- a/include/oox/export/utils.hxx +++ b/include/oox/export/utils.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_OOX_EXPORT_UTILS_HXX #define INCLUDED_OOX_EXPORT_UTILS_HXX +#include <rtl/ustring.hxx> + #define I32S(x) OString::number( (sal_Int32) x ).getStr() #define I64S(x) OString::number( (sal_Int64) x ).getStr() #define IS(x) OString::number( x ).getStr() diff --git a/include/svx/globl3d.hxx b/include/svx/globl3d.hxx index 233a64196742..88fec321b895 100644 --- a/include/svx/globl3d.hxx +++ b/include/svx/globl3d.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_SVX_GLOBL3D_HXX #define INCLUDED_SVX_GLOBL3D_HXX +#include <sal/types.h> + const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+ sal_uInt32('3')*0x00000100+ sal_uInt32('D')*0x00010000+ diff --git a/include/tools/appendunixshellword.hxx b/include/tools/appendunixshellword.hxx index 4585bf36cf8f..dbe66c628851 100644 --- a/include/tools/appendunixshellword.hxx +++ b/include/tools/appendunixshellword.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX #define INCLUDED_TOOLS_APPENDUNIXSHELLWORD_HXX -#include <sal/config.h> +#include <rtl/strbuf.hxx> #if defined UNX #include <tools/toolsdllapi.h> diff --git a/include/tools/getprocessworkingdir.hxx b/include/tools/getprocessworkingdir.hxx index 985a683a872c..b0dbe709dcdb 100644 --- a/include/tools/getprocessworkingdir.hxx +++ b/include/tools/getprocessworkingdir.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_TOOLS_GETPROCESSWORKINGDIR_HXX #define INCLUDED_TOOLS_GETPROCESSWORKINGDIR_HXX -#include <sal/config.h> +#include <rtl/ustring.hxx> #include <tools/toolsdllapi.h> diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx index a68b6b45b251..660db9183e6f 100644 --- a/include/tools/mapunit.hxx +++ b/include/tools/mapunit.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_TOOLS_MAPUNIT_HXX #define INCLUDED_TOOLS_MAPUNIT_HXX +#include <sal/types.h> + enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM, MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH, MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT, diff --git a/include/unotest/gettestargument.hxx b/include/unotest/gettestargument.hxx index e2160ba51938..734b77e57b8a 100644 --- a/include/unotest/gettestargument.hxx +++ b/include/unotest/gettestargument.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_UNOTEST_GETTESTARGUMENT_HXX #define INCLUDED_UNOTEST_GETTESTARGUMENT_HXX -#include <sal/config.h> - +#include <rtl/ustring.hxx> #include <unotest/detail/unotestdllapi.hxx> diff --git a/include/unotest/toabsolutefileurl.hxx b/include/unotest/toabsolutefileurl.hxx index 975e7f411002..5bdb7b05ef04 100644 --- a/include/unotest/toabsolutefileurl.hxx +++ b/include/unotest/toabsolutefileurl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX #define INCLUDED_UNOTEST_TOABSOLUTEFILEURL_HXX -#include <sal/config.h> +#include <rtl/ustring.hxx> #include <unotest/detail/unotestdllapi.hxx> diff --git a/include/vcl/fontcapabilities.hxx b/include/vcl/fontcapabilities.hxx index 069afff14113..57342603fa8e 100644 --- a/include/vcl/fontcapabilities.hxx +++ b/include/vcl/fontcapabilities.hxx @@ -13,6 +13,8 @@ #include <boost/dynamic_bitset.hpp> #include <vector> +#include <sal/types.h> + //See OS/2 table, i.e. http://www.microsoft.com/typography/otspec/os2.htm#ur namespace vcl { diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index de8a5555fee4..8a340099a11d 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_SALGTYPE_HXX #define INCLUDED_VCL_SALGTYPE_HXX +#include <sal/types.h> + typedef sal_uInt32 SalColor; #define MAKE_SALCOLOR( r, g, b ) ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16)) #define SALCOLOR_RED( n ) ((sal_uInt8)((n)>>16)) diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx index 060d81932a48..04de8f1684f2 100644 --- a/include/xmloff/DashStyle.hxx +++ b/include/xmloff/DashStyle.hxx @@ -20,9 +20,8 @@ #ifndef INCLUDED_XMLOFF_DASHSTYLE_HXX #define INCLUDED_XMLOFF_DASHSTYLE_HXX -#include <sal/config.h> +#include <rtl/ustring.hxx> #include <xmloff/dllapi.h> -#include <sal/types.h> class SvXMLImport; class SvXMLExport; diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx index ebab3816aa0f..2482397932c7 100644 --- a/include/xmloff/styleexp.hxx +++ b/include/xmloff/styleexp.hxx @@ -21,6 +21,7 @@ #include <sal/config.h> #include <xmloff/dllapi.h> +#include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx index aefee1c7ecd4..338a48f753ac 100644 --- a/include/xmloff/xmlcnimp.hxx +++ b/include/xmloff/xmlcnimp.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_XMLOFF_XMLCNIMP_HXX #define INCLUDED_XMLOFF_XMLCNIMP_HXX -#include <xmloff/dllapi.h> -#include <sal/types.h> #include <memory> +#include <rtl/ustring.hxx> +#include <xmloff/dllapi.h> + class SvXMLAttrCollection; class XMLOFF_DLLPUBLIC SvXMLAttrContainerData |