diff options
219 files changed, 0 insertions, 582 deletions
diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx index 70f2acebb043..70f2acebb043 100755..100644 --- a/basebmp/inc/basebmp/compositeiterator.hxx +++ b/basebmp/inc/basebmp/compositeiterator.hxx diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx index 1903518d991b..1903518d991b 100755..100644 --- a/basegfx/inc/basegfx/tools/canvastools.hxx +++ b/basegfx/inc/basegfx/tools/canvastools.hxx diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx index 8a4044e1ca4b..8a4044e1ca4b 100755..100644 --- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx +++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx diff --git a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx index eed9c46a6442..e54bc9361619 100644 --- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx +++ b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx @@ -28,22 +28,12 @@ #ifndef INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX #define INCLUDED_CANVAS_BUFFEREDGRAPHICDEVICEBASE_HXX -#ifndef _COM_SUN_STAR_AWT_XWINDOW2_HPP_ #include <com/sun/star/awt/XWindow2.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XTOPWINDOW_HPP_ #include <com/sun/star/awt/XTopWindow.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XWINDOWLISTENER_HPP_ #include <com/sun/star/awt/XWindowListener.hpp> -#endif -#ifndef INCLUDED_CANVAS_CANVASTOOLS_HXX #include <canvas/canvastools.hxx> -#endif -#ifndef INCLUDED_CANVAS_GRAPHICDEVICEBASE_HXX #include <canvas/base/graphicdevicebase.hxx> -#endif /* Definition of BufferedGraphicDeviceBase class */ diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 6c9fdfee484a..6c9fdfee484a 100755..100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx index 3e4d40f1efe7..9bf2fc6ef6af 100644 --- a/canvas/source/cairo/cairo_repainttarget.hxx +++ b/canvas/source/cairo/cairo_repainttarget.hxx @@ -28,9 +28,7 @@ #ifndef _CAIROCANVAS_REPAINTTARGET_HXX #define _CAIROCANVAS_REPAINTTARGET_HXX -#ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> -#endif #include "cairo_cairo.hxx" diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx index 5e767994e16c..5e767994e16c 100755..100644 --- a/canvas/source/directx/dx_bitmap.hxx +++ b/canvas/source/directx/dx_bitmap.hxx diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx index 411d8764dfc7..411d8764dfc7 100755..100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.hxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 75800f3c8abd..75800f3c8abd 100755..100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index be83b26e1b52..be83b26e1b52 100755..100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index 4a6c8b779ad0..4a6c8b779ad0 100755..100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx index 2f175cce88e5..2f175cce88e5 100755..100644 --- a/canvas/source/directx/dx_canvashelper.hxx +++ b/canvas/source/directx/dx_canvashelper.hxx diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx index 7c85f7a8f8de..7c85f7a8f8de 100755..100644 --- a/canvas/source/directx/dx_devicehelper.hxx +++ b/canvas/source/directx/dx_devicehelper.hxx diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx index 409449aab954..409449aab954 100755..100644 --- a/canvas/source/directx/dx_gdiplususer.hxx +++ b/canvas/source/directx/dx_gdiplususer.hxx diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx index 6eb0bc415ea5..6eb0bc415ea5 100755..100644 --- a/canvas/source/directx/dx_impltools.hxx +++ b/canvas/source/directx/dx_impltools.hxx diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx index cb2d76587169..cb2d76587169 100755..100644 --- a/canvas/source/directx/dx_linepolypolygon.hxx +++ b/canvas/source/directx/dx_linepolypolygon.hxx diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx index e6bd8a7b5701..e6bd8a7b5701 100755..100644 --- a/canvas/source/directx/dx_rendermodule.hxx +++ b/canvas/source/directx/dx_rendermodule.hxx diff --git a/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx index 56c984439f45..56c984439f45 100755..100644 --- a/canvas/source/directx/dx_sprite.hxx +++ b/canvas/source/directx/dx_sprite.hxx diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index b14d79050ccf..b14d79050ccf 100755..100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx index 5015818e0c77..5015818e0c77 100755..100644 --- a/canvas/source/directx/dx_spritecanvashelper.hxx +++ b/canvas/source/directx/dx_spritecanvashelper.hxx diff --git a/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx index b83b8b6a988c..b83b8b6a988c 100755..100644 --- a/canvas/source/directx/dx_spritehelper.hxx +++ b/canvas/source/directx/dx_spritehelper.hxx diff --git a/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx index 29b84ed81670..29b84ed81670 100755..100644 --- a/canvas/source/directx/dx_surfacegraphics.hxx +++ b/canvas/source/directx/dx_surfacegraphics.hxx diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx index ca8c6793fe87..ca8c6793fe87 100755..100644 --- a/canvas/source/directx/dx_textlayout.hxx +++ b/canvas/source/directx/dx_textlayout.hxx diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx index c484867055af..c484867055af 100755..100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.hxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx index fab96cb79e5a..fab96cb79e5a 100755..100644 --- a/canvas/source/directx/dx_vcltools.hxx +++ b/canvas/source/directx/dx_vcltools.hxx diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 935c12501768..935c12501768 100755..100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx index 12c31b39046c..6a360010c86f 100644 --- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx +++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx @@ -29,9 +29,7 @@ #define COMPHELPER_ACCESSIBLE_SELECTION_HELPER_HXX #include <comphelper/uno3.hxx> -#ifndef COMPHELPER_ACCESSIBLE_CONTEXT_HELPER_HXX #include <comphelper/accessiblecomponenthelper.hxx> -#endif #include <cppuhelper/implbase1.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx index cf04d22c7a6d..cf04d22c7a6d 100755..100644 --- a/comphelper/inc/comphelper/docpasswordrequest.hxx +++ b/comphelper/inc/comphelper/docpasswordrequest.hxx diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx index 8e34b0e00149..8e34b0e00149 100755..100644 --- a/comphelper/inc/comphelper/evtmethodhelper.hxx +++ b/comphelper/inc/comphelper/evtmethodhelper.hxx diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx index 1765716acb66..32176caa363c 100644 --- a/comphelper/inc/comphelper/ihwrapnofilter.hxx +++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx @@ -44,12 +44,8 @@ #include <com/sun/star/frame/DoubleInitializationException.hpp> #endif -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase3.hxx> -#endif -#ifndef INCLUDED_COMPHELPERDLLAPI_H #include "comphelper/comphelperdllapi.h" -#endif namespace comphelper { diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx index db203a08d750..7dde918b5b8a 100644 --- a/comphelper/inc/comphelper/ofopxmlhelper.hxx +++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx @@ -28,9 +28,7 @@ #ifndef _COMPHELPER_OFOPXMLHELPER_HXX #define _COMPHELPER_OFOPXMLHELPER_HXX -#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx index 737fd41efb84..05d4f706adf2 100644 --- a/comphelper/inc/comphelper/sequenceashashmap.hxx +++ b/comphelper/inc/comphelper/sequenceashashmap.hxx @@ -44,9 +44,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#ifndef _COM_SUN_STAR_BEANS_IllegalTypeException_HPP_ #include <com/sun/star/beans/IllegalTypeException.hpp> -#endif #include "comphelper/comphelperdllapi.h" // see method dbg_dumpToFile() below! diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx index 263b68b24c7c..f83d68a52eed 100644 --- a/comphelper/inc/comphelper/sequenceasvector.hxx +++ b/comphelper/inc/comphelper/sequenceasvector.hxx @@ -35,9 +35,7 @@ #include <algorithm> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_BEANS_IllegalTypeException_HPP_ #include <com/sun/star/beans/IllegalTypeException.hpp> -#endif //_______________________________________________ // namespace diff --git a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx index 1ade47220c6f..e43534dc8ba2 100644 --- a/comphelper/inc/comphelper/stillreadwriteinteraction.hxx +++ b/comphelper/inc/comphelper/stillreadwriteinteraction.hxx @@ -32,9 +32,7 @@ // includes #include <ucbhelper/interceptedinteraction.hxx> -#ifndef __COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP__ #include <com/sun/star/task/XInteractionHandler.hpp> -#endif #include <ucbhelper/interceptedinteraction.hxx> #include "comphelper/comphelperdllapi.h" diff --git a/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx index 7a3b17111072..2e223294bb6f 100644 --- a/comphelper/source/processfactory/componentfactory.cxx +++ b/comphelper/source/processfactory/componentfactory.cxx @@ -31,9 +31,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HDL_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif #include <cppuhelper/shlib.hxx> diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx index 9be2b5309e0f..64421e99cd60 100644 --- a/cppcanvas/source/inc/action.hxx +++ b/cppcanvas/source/inc/action.hxx @@ -30,9 +30,7 @@ #include <sal/types.h> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif namespace basegfx { diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index abae942eaa15..871c290546d6 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -30,9 +30,7 @@ #include <sal/types.h> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <cppcanvas/renderer.hxx> #include <cppcanvas/canvas.hxx> diff --git a/cppcanvas/source/mtfrenderer/outdevstate.hxx b/cppcanvas/source/mtfrenderer/outdevstate.hxx index 37930b2e78b4..356fc4d8b2c9 100644 --- a/cppcanvas/source/mtfrenderer/outdevstate.hxx +++ b/cppcanvas/source/mtfrenderer/outdevstate.hxx @@ -31,25 +31,13 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_RENDERING_STRINGCONTEXT_HPP__ #include <com/sun/star/rendering/StringContext.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__ #include <com/sun/star/rendering/RenderState.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__ #include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XCANVASFONT_HPP__ #include <com/sun/star/rendering/XCanvasFont.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_TEXTDIRECTION_HPP__ #include <com/sun/star/rendering/TextDirection.hpp> -#endif #include <basegfx/matrix/b2dhommatrix.hxx> -#ifndef _BGFX_POLYGON_B2DPOLYPOLGON_HXX #include <basegfx/polygon/b2dpolypolygon.hxx> -#endif #include <vcl/fntstyle.hxx> #include <vcl/vclenum.hxx> #include <vcl/outdev.hxx> diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx index 974eb4176b5a..fe1538d3f05c 100644 --- a/cppcanvas/source/wrapper/implbitmap.hxx +++ b/cppcanvas/source/wrapper/implbitmap.hxx @@ -29,12 +29,8 @@ #define _CPPCANVAS_IMPLBITMAP_HXX #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_RENDERING_XBITMAP_HPP__ #include <com/sun/star/rendering/XBitmap.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__ #include <com/sun/star/rendering/XGraphicDevice.hpp> -#endif #include <cppcanvas/bitmap.hxx> #include <canvasgraphichelper.hxx> diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 7d70f226848e..671d6f53c887 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -28,16 +28,10 @@ #ifndef _CPPCANVAS_IMPLBITMAPCANVAS_HXX #define _CPPCANVAS_IMPLBITMAPCANVAS_HXX -#ifndef _COM_SUN_STAR_RENDERING_XBITMAPCANVAS_HPP__ #include <com/sun/star/rendering/XBitmapCanvas.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XBITMAP_HPP__ #include <com/sun/star/rendering/XBitmap.hpp> -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <basegfx/vector/b2dsize.hxx> #include <cppcanvas/bitmapcanvas.hxx> diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx index 5140d905245c..d0fa19b212b4 100644 --- a/cppcanvas/source/wrapper/implcolor.hxx +++ b/cppcanvas/source/wrapper/implcolor.hxx @@ -30,13 +30,9 @@ #include <com/sun/star/uno/Sequence.hxx> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__ #include <com/sun/star/rendering/XGraphicDevice.hpp> -#endif #include <cppcanvas/color.hxx> diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index b02eab38df1e..bfb4bd67d2f5 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -30,9 +30,7 @@ #include <sal/types.h> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <cppcanvas/canvas.hxx> #include <cppcanvas/customsprite.hxx> diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index c7b93b876e10..dbd356874e2a 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -30,13 +30,9 @@ #include <com/sun/star/uno/Reference.hxx> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__ #include <com/sun/star/rendering/XCanvas.hpp> -#endif #include <cppcanvas/font.hxx> namespace rtl diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index bd5e02d6a3de..23c1bcd1e0b4 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.hxx @@ -29,15 +29,9 @@ #define _CANVAS_IMPLPOLYPOLYGON_HXX #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__ #include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__ #include <com/sun/star/rendering/XGraphicDevice.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_STROKEATTRIBUTES_HPP__ #include <com/sun/star/rendering/StrokeAttributes.hpp> -#endif #include <cppcanvas/polypolygon.hxx> #include <canvasgraphichelper.hxx> diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index 4f8c5fdcaef6..80487b84383b 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XSprite.hpp> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <cppcanvas/sprite.hxx> #include <implspritecanvas.hxx> diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 655bce3c05a2..40b2efb4538d 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -28,15 +28,11 @@ #ifndef _CPPCANVAS_IMPLSPRITECANVAS_HXX #define _CPPCANVAS_IMPLSPRITECANVAS_HXX -#ifndef _COM_SUN_STAR_RENDERING_XSPRITECANVAS_HPP__ #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#endif #include <basegfx/vector/b2dsize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <cppcanvas/spritecanvas.hxx> diff --git a/cppcanvas/source/wrapper/impltext.hxx b/cppcanvas/source/wrapper/impltext.hxx index b2c8d9fd0e1f..96d45837419d 100644 --- a/cppcanvas/source/wrapper/impltext.hxx +++ b/cppcanvas/source/wrapper/impltext.hxx @@ -28,18 +28,10 @@ #ifndef _CANVAS_IMPLTEXT_HXX #define _CANVAS_IMPLTEXT_HXX -#ifndef _COM_SUN_STAR_RENDERING_RENDERSTATE_HPP__ #include <com/sun/star/rendering/RenderState.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_STRINGCONTEXT_HPP__ #include <com/sun/star/rendering/StringContext.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__ #include <com/sun/star/rendering/XCanvas.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XCANVASFONT_HPP__ #include <com/sun/star/rendering/XCanvasFont.hpp> -#endif #include <cppcanvas/text.hxx> #include <canvasgraphichelper.hxx> diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx index 0429c7640ed7..4b4a275e88f6 100644 --- a/dtrans/source/generic/clipboardmanager.hxx +++ b/dtrans/source/generic/clipboardmanager.hxx @@ -30,9 +30,7 @@ #include <cppuhelper/compbase3.hxx> -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDMANAGER_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardManager.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <map> diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx index 54308b0a1bdd..136b8a1d0883 100644 --- a/dtrans/source/generic/generic_clipboard.hxx +++ b/dtrans/source/generic/generic_clipboard.hxx @@ -30,13 +30,9 @@ #include <cppuhelper/compbase4.hxx> -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDEX_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDNOTIFIER_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx index 833aa2680a8a..a8da829e6e1b 100644 --- a/dtrans/source/os2/clipb/Os2Transferable.hxx +++ b/dtrans/source/os2/clipb/Os2Transferable.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HDL_ #include <com/sun/star/lang/XEventListener.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <osl/thread.h> diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx index 0f21d00d7371..b11b616011cd 100644 --- a/dtrans/source/win32/dnd/globals.hxx +++ b/dtrans/source/win32/dnd/globals.hxx @@ -27,9 +27,7 @@ #ifndef _GLOBALS_HXX_ #define _GLOBALS_HXX_ -#ifndef _OSL_MUTEX_H_ #include <osl/mutex.hxx> -#endif #if defined _MSC_VER #pragma warning(push,1) diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index decf3f61368f..68df19d2dbca 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -31,12 +31,8 @@ #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#ifndef _OSL_MUTEX_H_ #include <osl/mutex.hxx> -#endif -#ifndef _CPPUHELPER_COMPBASE2_HXX_ #include <cppuhelper/compbase3.hxx> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include "../../inc/DtObjFactory.hxx" #include "globals.hxx" diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index 94982b54818f..9751a507be90 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -32,13 +32,9 @@ #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _CPPUHELPER_COMPBASE2_HXX_ #include <cppuhelper/compbase3.hxx> -#endif #include <cppuhelper/interfacecontainer.hxx> -#ifndef _OSL_MUTEX_H_ #include <osl/mutex.hxx> -#endif #if defined _MSC_VER #pragma warning(push,1) diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index dd99e857b908..528d48388be8 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include "DataFmtTransl.hxx" #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include <com/sun/star/datatransfer/XMimeContentType.hpp> diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx index 3f433561a3b1..617086d3cf7c 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.hxx +++ b/dtrans/source/win32/dtobj/FmtFilter.hxx @@ -31,9 +31,7 @@ #include <sal/types.h> -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ #include <com/sun/star/uno/Sequence.hxx> -#endif #if defined _MSC_VER #pragma warning(push,1) diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx index a4d59a69284e..52a9bae14cb1 100644 --- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx +++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/datatransfer/DataFlavor.hpp> -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_ #include <com/sun/star/uno/Sequence.h> -#endif #include "DTransHelper.hxx" #if defined _MSC_VER diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx index b7b20af56ac7..6ba02f03b713 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.hxx +++ b/dtrans/source/win32/dtobj/XTDataObject.hxx @@ -37,13 +37,9 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> -#ifndef _DATAFORMATTRANSLATOR_HXX_ #include "DataFmtTransl.hxx" -#endif -#ifndef _FETCLIST_HXX_ #include "FEtcList.hxx" -#endif #if defined _MSC_VER #pragma warning(push,1) diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx index 61f526a7f370..d0dc3f276758 100644 --- a/i18npool/inc/i18npool/mslangid.hxx +++ b/i18npool/inc/i18npool/mslangid.hxx @@ -30,9 +30,7 @@ #include <sal/config.h> -#ifndef INCLUDED_I18NPOOL_DLLAPI_H #include "i18npool/i18npooldllapi.h" -#endif #include "i18npool/lang.h" #include <com/sun/star/lang/Locale.hpp> diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx index 9e6d12cf4277..fd0a35ec3ae5 100644 --- a/padmin/source/cmddlg.hxx +++ b/padmin/source/cmddlg.hxx @@ -30,9 +30,7 @@ #include <vcl/dialog.hxx> #include <tools/config.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/combobox.hxx> diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index 636241b826a6..acd890292520 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -32,18 +32,12 @@ #include <list> #endif #include <tools/string.hxx> -#ifndef _RESID_HXX #include <tools/resid.hxx> -#endif #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_LISTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <vcl/combobox.hxx> class Config; diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx index 5b4aa9f755eb..6700eb28dfff 100644 --- a/padmin/source/newppdlg.hxx +++ b/padmin/source/newppdlg.hxx @@ -29,9 +29,7 @@ #define _PAD_NEWPPDLG_HXX_ #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 2a8285f8af88..81523a6c0da8 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -36,9 +36,7 @@ #include <vcl/dialog.hxx> #include <tools/config.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/edit.hxx> diff --git a/regexp/source/reclass.hxx b/regexp/source/reclass.hxx index e97c87019341..8f07c59d6f2f 100644 --- a/regexp/source/reclass.hxx +++ b/regexp/source/reclass.hxx @@ -27,21 +27,11 @@ #ifndef INCLUDED_REGEXP_RECLASS_HXX #define INCLUDED_REGEXP_RECLASS_HXX -#ifndef INCLUDED_I18NUTIL_UNICODE_HXX #include <i18nutil/unicode.hxx> -#endif -#ifndef _COM_SUN_STAR_UTIL_SEARCHFLAGS_HPP_ #include <com/sun/star/util/SearchFlags.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_SEARCHOPTIONS_HPP_ #include <com/sun/star/util/SearchOptions.hpp> -#endif -#ifndef _SAL_TYPES_H_ #include <sal/types.h> -#endif -#ifndef _COM_SUN_STAR_I18N_XEXTENDEDTRANSLITERATION_HPP_ #include <com/sun/star/i18n/XExtendedTransliteration.hpp> -#endif /* If any error codes are removed, changed, or added, update the `re_error_msg' table in regex.c. */ diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx index a21b03685325..d9a8f810c685 100644 --- a/rsc/inc/rscdef.hxx +++ b/rsc/inc/rscdef.hxx @@ -27,9 +27,7 @@ #ifndef _RSCDEF_HXX #define _RSCDEF_HXX -#ifndef _TOOLS_UNQIDX_HXX #include <tools/unqidx.hxx> -#endif #include <rsctree.hxx> /****************** C L A S S E S ****************************************/ diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx index 89e4bfda2402..f661f2c041c3 100644 --- a/rsc/inc/rsclst.hxx +++ b/rsc/inc/rsclst.hxx @@ -28,9 +28,7 @@ #ifndef _RSCLST_HXX #define _RSCLST_HXX -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <rscall.h> class REResourceList; diff --git a/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx index c2b0a70a1b66..5aa6245ef648 100644 --- a/rsc/inc/rscrsc.hxx +++ b/rsc/inc/rscrsc.hxx @@ -27,15 +27,9 @@ #ifndef _RSCRSC_HXX #define _RSCRSC_HXX -#ifndef RSCALL_H #include <rscall.h> -#endif -#ifndef RSCERROR_H #include <rscerror.h> -#endif -#ifndef RSCTOOLS_HXX #include <rsctools.hxx> -#endif #include <list> diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx index dde71accd680..b01d9cf290f2 100644 --- a/sax/inc/sax/parser/saxparser.hxx +++ b/sax/inc/sax/parser/saxparser.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <rtl/ref.hxx> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <map> #include <memory> diff --git a/sot/inc/absdev.hxx b/sot/inc/absdev.hxx index 3d251d98e0b6..b68f12cf28e8 100644 --- a/sot/inc/absdev.hxx +++ b/sot/inc/absdev.hxx @@ -28,9 +28,7 @@ #ifndef _SOT_ABSDEV_HXX #define _SOT_ABSDEV_HXX -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif class JobSetup; class AbstractDeviceData diff --git a/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx index dc67e72a4f82..f742929a364c 100644 --- a/sot/inc/sot/exchange.hxx +++ b/sot/inc/sot/exchange.hxx @@ -37,9 +37,7 @@ #include <tools/string.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/datatransfer/DataFlavor.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANTS_HDL_ #include <com/sun/star/datatransfer/dnd/DNDConstants.hdl> -#endif #include "sot/sotdllapi.h" class SotDataObject; diff --git a/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx index 08dd21a88aa5..d3b20a0382ed 100644 --- a/sot/inc/sot/factory.hxx +++ b/sot/inc/sot/factory.hxx @@ -28,12 +28,8 @@ #ifndef _SOT_FACTORY_HXX #define _SOT_FACTORY_HXX -#ifndef _TOOLS_GLOBNAME_HXX #include <tools/globname.hxx> -#endif -#ifndef _TOOLS_RTTI_HXX #include <tools/rtti.hxx> -#endif #include "sot/sotdllapi.h" /************************************************************************* diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index db2ac3b30ffc..8ba1674d4fae 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -29,12 +29,8 @@ #define _SOT_OBJECT_HXX #include <sot/sotref.hxx> -#ifndef _SOT_SOTDATA_HXX #include <sot/sotdata.hxx> -#endif -#ifndef _TOOLS_GLOBNAME_HXX #include <tools/globname.hxx> -#endif #include "sot/sotdllapi.h" /************************************************************************* diff --git a/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx index 8d8775b5e181..8153d06c6b08 100644 --- a/sot/inc/sot/sotdata.hxx +++ b/sot/inc/sot/sotdata.hxx @@ -31,9 +31,7 @@ /************************************************************************* *************************************************************************/ -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif #include "sot/sotdllapi.h" //==================class SotData_Impl==================================== diff --git a/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx index ae03032e286e..96c91aa3e0a7 100644 --- a/sot/inc/sot/sotref.hxx +++ b/sot/inc/sot/sotref.hxx @@ -28,9 +28,7 @@ #ifndef _SOT_SOTREF_HXX #define _SOT_SOTREF_HXX -#ifndef _TOOLS_REF_HXX #include <tools/ref.hxx> -#endif //======================================================================== enum SvCastEnum { SV_AGGREGATION_CAST }; diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 572e100c7299..45a3eaafffef 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -31,18 +31,12 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <com/sun/star/embed/XStorage.hpp> #include <sot/object.hxx> #include <sot/factory.hxx> -#ifndef _TOOLS_STREAM_HXX #include <tools/stream.hxx> -#endif -#ifndef _TOOLS_ERRCODE_HXX #include <tools/errcode.hxx> -#endif #include "sot/sotdllapi.h" #define STORAGE_FAILIFTHERE 0x02 diff --git a/sot/inc/stg.hxx b/sot/inc/stg.hxx index 84373e26d596..8dbf0eb67128 100644 --- a/sot/inc/stg.hxx +++ b/sot/inc/stg.hxx @@ -31,26 +31,16 @@ #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_H_ #include <com/sun/star/io/XInputStream.hpp> -#endif -#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_H_ #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_H_ #include <com/sun/star/embed/XStorage.hpp> -#endif #include <tools/rtti.hxx> -#ifndef _TOOLS_STREAM_HXX //autogen #include <tools/stream.hxx> -#endif -#ifndef _TOOLS_GLOBNAME_HXX //autogen #include <tools/globname.hxx> -#endif #include "sot/sotdllapi.h" #include <list> diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx index 66f424888e6d..755ef2868849 100644 --- a/sot/source/sdstor/stgavl.hxx +++ b/sot/source/sdstor/stgavl.hxx @@ -28,9 +28,7 @@ #ifndef _STGAVL_HXX #define _STGAVL_HXX -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif // This class must be overloaded to define real, living nodes. // Especially, the compare function must be implemented. diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index 5379f837b8b1..247e2ea7b11f 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -29,12 +29,8 @@ #define _STGCACHE_HXX #include <osl/endian.h> -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif -#ifndef _TOOLS_STREAM_HXX #include <tools/stream.hxx> -#endif #include <stgelem.hxx> class UCBStorageStream; diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index 7a5b7bc52b26..58e38f7db44d 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -31,9 +31,7 @@ #ifndef _STGELEM_HXX #define _STGELEM_HXX -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif #include <stg.hxx> diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx index 9b09f51db43f..15132d3fbb76 100644 --- a/sot/source/sdstor/stgstrms.hxx +++ b/sot/source/sdstor/stgstrms.hxx @@ -28,9 +28,7 @@ #ifndef _STGSTRMS_HXX #define _STGSTRMS_HXX -#ifndef _TOOLS_STREAM_HXX #include <tools/stream.hxx> -#endif class StgIo; class StgStrm; diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx index 1a4e8ced8381..b82bd40234f1 100644 --- a/svl/inc/pickerhistoryaccess.hxx +++ b/svl/inc/pickerhistoryaccess.hxx @@ -30,9 +30,7 @@ #include "svl/svldllapi.h" -#ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_ #include <com/sun/star/uno/Reference.hxx> -#endif //......................................................................... namespace svt diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx index a9b82dfa8be9..4f32dcdfeab7 100644 --- a/svl/inc/svl/cntwall.hxx +++ b/svl/inc/svl/cntwall.hxx @@ -29,9 +29,7 @@ #include "svl/svldllapi.h" -#ifndef SHL_HXX #include <tools/shl.hxx> -#endif #include <tools/rtti.hxx> #include <tools/color.hxx> #include <svl/poolitem.hxx> diff --git a/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx index 5ad244bfbd00..3a1e4bf31aa5 100644 --- a/svl/inc/svl/isethint.hxx +++ b/svl/inc/svl/isethint.hxx @@ -29,9 +29,7 @@ #include "svl/svldllapi.h" -#ifndef _HINT_HXX #include <svl/hint.hxx> -#endif class SfxItemSet; diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index 48bc55cd1aa0..0c002c69c78e 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -35,9 +35,7 @@ #include <tools/debug.hxx> #include <tools/string.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif class SvStream; diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index b3138309293f..8540931947d9 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -43,9 +43,7 @@ #include <svl/brdcst.hxx> #include <svl/poolitem.hxx> -#ifndef _SFX_STYLE_HRC #include <svl/style.hrc> -#endif class SfxItemSet; class SfxItemPool; diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 5492759d4d36..5ac63765bbd7 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -29,9 +29,7 @@ #include "svl/svldllapi.h" #include <tools/string.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <i18npool/lang.h> #include <svl/svarray.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/svl/inc/xmlement.hxx b/svl/inc/xmlement.hxx index d2680fbbf404..eddd0bd4f435 100644 --- a/svl/inc/xmlement.hxx +++ b/svl/inc/xmlement.hxx @@ -28,9 +28,7 @@ #ifndef _SVTOOLS_XMLEMENT_HXX #define _SVTOOLS_XMLEMENT_HXX -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif struct SvXMLEnumMapEntry { diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx index 971b4b26e13e..31d08e31c7ed 100644 --- a/svtools/inc/QueryFolderName.hxx +++ b/svtools/inc/QueryFolderName.hxx @@ -28,9 +28,7 @@ #define SVT_QUERYFOLDER_HXX #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <vcl/dialog.hxx> diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx index 3ee79e1fca0c..818f4c40b3f7 100644 --- a/svtools/inc/acceleratorexecute.hxx +++ b/svtools/inc/acceleratorexecute.hxx @@ -38,30 +38,18 @@ #define INCLUDED_VECTOR #endif -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include <com/sun/star/frame/XDispatchProvider.hpp> -#endif -#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#endif -#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ #include <com/sun/star/util/XURLTransformer.hpp> -#endif #include <com/sun/star/util/URL.hpp> -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif #include <vcl/keycod.hxx> #include <vcl/evntpost.hxx> #include <osl/mutex.h> diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx index f29ea2478b4e..812bee1997ed 100644 --- a/svtools/inc/addresstemplate.hxx +++ b/svtools/inc/addresstemplate.hxx @@ -37,9 +37,7 @@ #include <vcl/lstbox.hxx> #include <vcl/scrbar.hxx> #include <com/sun/star/container/XNameAccess.hpp> -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/util/AliasProgrammaticPair.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <unotools/configitem.hxx> diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx index f85887873bb0..b98d7e46f3f2 100644 --- a/svtools/inc/calendar.hxx +++ b/svtools/inc/calendar.hxx @@ -30,17 +30,11 @@ #include "svtools/svtdllapi.h" #include <unotools/calendarwrapper.hxx> -#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP #include <com/sun/star/i18n/Weekdays.hpp> -#endif -#ifndef _CTRL_HXX #include <vcl/ctrl.hxx> -#endif #include <vcl/timer.hxx> -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif class Table; class MouseEvent; diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx index 9e6e942daf1e..27745478cb3c 100644 --- a/svtools/inc/ctrlbox.hxx +++ b/svtools/inc/ctrlbox.hxx @@ -30,24 +30,12 @@ #include "svtools/svtdllapi.h" -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _COMBOBOX_HXX #include <vcl/combobox.hxx> -#endif -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif -#ifndef _VIRDEV_HXX #include <vcl/virdev.hxx> -#endif -#ifndef _METRIC_HXX #include <vcl/metric.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif class ImplFontList; class ImpColorList; diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx index a0eb5db2b955..fca5f9795f1f 100644 --- a/svtools/inc/ctrltool.hxx +++ b/svtools/inc/ctrltool.hxx @@ -30,13 +30,9 @@ #include "svtools/svtdllapi.h" -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif #include <tools/list.hxx> -#ifndef _METRIC_HXX #include <vcl/metric.hxx> -#endif class ImplFontListNameInfo; class OutputDevice; diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx index dd314bb23ca1..101090f80b6f 100644 --- a/svtools/inc/filectrl.hxx +++ b/svtools/inc/filectrl.hxx @@ -31,9 +31,7 @@ #include "svtools/svtdllapi.h" #include <vcl/window.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?! diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx index c04e48fc7658..e9ecd9a3d65c 100644 --- a/svtools/inc/filedlg.hxx +++ b/svtools/inc/filedlg.hxx @@ -30,9 +30,7 @@ #include "svtools/svtdllapi.h" -#ifndef _DIALOG_HXX #include <vcl/dialog.hxx> -#endif class Edit; class ImpSvFileDlg; diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx index 74476541dcd8..bd52e0824003 100644 --- a/svtools/inc/fileview.hxx +++ b/svtools/inc/fileview.hxx @@ -33,9 +33,7 @@ #include <vcl/ctrl.hxx> #include <vcl/image.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <rtl/ustring.hxx> diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index ff94cc966f4d..738a1b49ea8f 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -31,9 +31,7 @@ #include <vcl/ctrl.hxx> #include <vcl/imgctrl.hxx> -#ifndef _SVTOOLS_HYPERLABEL_HXX #include "svtools/hyperlabel.hxx" -#endif diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx index 12a125635132..54559e9030bb 100644 --- a/svtools/inc/rtfout.hxx +++ b/svtools/inc/rtfout.hxx @@ -31,9 +31,7 @@ #include "svtools/svtdllapi.h" #include <tools/solar.h> -#ifndef _RTL_TEXTENC_H_ #include <rtl/textenc.h> -#endif class String; class SvStream; diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx index 3caa9cd6bccd..71564e0974dc 100644 --- a/svtools/inc/ruler.hxx +++ b/svtools/inc/ruler.hxx @@ -31,9 +31,7 @@ #include "svtools/svtdllapi.h" #include <tools/link.hxx> #include <vcl/window.hxx> -#ifndef _VIRDEV_HXX #include <vcl/virdev.hxx> -#endif #include <vcl/field.hxx> class MouseEvent; diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx index 1542ed667133..98dc8f783ed6 100644 --- a/svtools/inc/scrwin.hxx +++ b/svtools/inc/scrwin.hxx @@ -30,9 +30,7 @@ #include "svtools/svtdllapi.h" -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif class DataChangedEvent; diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx index 1b7e9816a103..613f5aaded2a 100644 --- a/svtools/inc/stdmenu.hxx +++ b/svtools/inc/stdmenu.hxx @@ -30,9 +30,7 @@ #include "svtools/svtdllapi.h" #include <tools/link.hxx> -#ifndef _MENU_HXX #include <vcl/menu.hxx> -#endif class FontList; class FontInfo; diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx index 9606e93a2fa0..c80e5bd9cee6 100755..100644 --- a/svtools/inc/svtools/accessiblefactory.hxx +++ b/svtools/inc/svtools/accessiblefactory.hxx @@ -28,13 +28,9 @@ #ifndef SVTOOLS_ACCESSIBLE_FACTORY_HXX #define SVTOOLS_ACCESSIBLE_FACTORY_HXX -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX #include <com/sun/star/uno/Reference.hxx> -#endif -#ifndef _RTL_REF_HXX #include <rtl/ref.hxx> -#endif #include "AccessibleBrowseBoxObjType.hxx" #include "accessibletableprovider.hxx" #include "accessibletable.hxx" diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx index 8ff17a2b71c7..8ff17a2b71c7 100755..100644 --- a/svtools/inc/svtools/accessibletable.hxx +++ b/svtools/inc/svtools/accessibletable.hxx diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx index 200951d5c5e8..c885bdb83de1 100644 --- a/svtools/inc/svtools/chartprettypainter.hxx +++ b/svtools/inc/svtools/chartprettypainter.hxx @@ -28,9 +28,7 @@ #ifndef CHARTPRETTYPAINTER_HXX #define CHARTPRETTYPAINTER_HXX -#ifndef INCLUDED_SVTDLLAPI_H #include "svtools/svtdllapi.h" -#endif //#include <svtools/embedhlp.hxx> #include <vcl/outdev.hxx> diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx index 00ec9647aa7a..e5e6ff5c6ec3 100644 --- a/svtools/inc/svtools/colrdlg.hxx +++ b/svtools/inc/svtools/colrdlg.hxx @@ -30,9 +30,7 @@ #include "svtools/svtdllapi.h" #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <svtools/colctrl.hxx> diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx index f97449e1880c..0eafc79c69e4 100644 --- a/svtools/inc/svtools/editbrowsebox.hxx +++ b/svtools/inc/svtools/editbrowsebox.hxx @@ -36,9 +36,7 @@ #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> -#ifndef _IMAGEBTN_HXX #include <vcl/imagebtn.hxx> -#endif #include <svtools/brwbox.hxx> #include <vcl/timer.hxx> #include <svtools/brwhead.hxx> diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx index 967c41636ea3..827b781ac004 100644 --- a/svtools/inc/svtools/ehdl.hxx +++ b/svtools/inc/svtools/ehdl.hxx @@ -32,9 +32,7 @@ #include "svtools/svtdllapi.h" -#ifndef _EINF_HXX #include <tools/errinf.hxx> -#endif class Window; class ResMgr; diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx index 098b565385ec..812e79dfcd43 100644 --- a/svtools/inc/svtools/embedhlp.hxx +++ b/svtools/inc/svtools/embedhlp.hxx @@ -34,9 +34,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <vcl/graph.hxx> -#ifndef _SV_MAPUNIT_HXX #include <vcl/mapunit.hxx> -#endif #include <rtl/ustring.hxx> #define NS_UNO ::com::sun::star::uno diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx index 9394f1ba5ccd..9fff33ac2ca5 100644 --- a/svtools/inc/svtools/inettbc.hxx +++ b/svtools/inc/svtools/inettbc.hxx @@ -34,9 +34,7 @@ #include <tools/string.hxx> #include <tools/urlobj.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif class IUrlFilter; class SvtMatchContext_Impl; diff --git a/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx index afbbc2509011..d98d723bca2c 100644 --- a/svtools/inc/svtools/insdlg.hxx +++ b/svtools/inc/svtools/insdlg.hxx @@ -34,9 +34,7 @@ #include <tools/globname.hxx> #include <sot/formats.hxx> -#ifndef _OWNCONT_HXX #include <svl/ownlist.hxx> -#endif #include <svtools/transfer.hxx> class SvObjectServer diff --git a/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx index 8c455b910b41..090cb12f44ed 100644 --- a/svtools/inc/svtools/printdlg.hxx +++ b/svtools/inc/svtools/printdlg.hxx @@ -30,27 +30,13 @@ #include "svtools/svtdllapi.h" -#ifndef _VCL_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _VCL_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _VCL_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _VCL_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef _VCL_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _VCL_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _VCL_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <svtools/stdctrl.hxx> class Printer; diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx index 8e1ced9ed1a0..963d28ab2dda 100644 --- a/svtools/inc/svtools/prnsetup.hxx +++ b/svtools/inc/svtools/prnsetup.hxx @@ -30,24 +30,12 @@ #include "svtools/svtdllapi.h" -#ifndef _VCL_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _VCL_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _VCL_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _VCL_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef _VCL_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _VCL_TIMER_HXX #include <vcl/timer.hxx> -#endif #include <svtools/stdctrl.hxx> class Printer; diff --git a/svtools/inc/svtools/stdctrl.hxx b/svtools/inc/svtools/stdctrl.hxx index 4c0b794f78e3..cef065ae8f80 100644 --- a/svtools/inc/svtools/stdctrl.hxx +++ b/svtools/inc/svtools/stdctrl.hxx @@ -30,12 +30,8 @@ #include "svtools/svtdllapi.h" -#ifndef _EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif // ------------- // - FixedInfo - diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx index ac15f0b55be6..b8385e85ed42 100644 --- a/svtools/inc/svtools/svicnvw.hxx +++ b/svtools/inc/svtools/svicnvw.hxx @@ -28,9 +28,7 @@ #ifndef _SVICNVW_HXX #define _SVICNVW_HXX -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif #include <svtools/svlbox.hxx> class SvImpIconView; diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx index c28b8d5db10c..0e58f02f1ce8 100644 --- a/svtools/inc/svtools/svlbitm.hxx +++ b/svtools/inc/svtools/svlbitm.hxx @@ -31,13 +31,9 @@ #include "svtools/svtdllapi.h" -#ifndef LINK_HXX #include <tools/link.hxx> -#endif -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif #include <svtools/svlbox.hxx> class SvLBoxEntry; diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index f33784f45397..3c1371586a74 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -35,17 +35,11 @@ #define INCLUDED_DEQUE #endif -#ifndef _CTRL_HXX #include <vcl/ctrl.hxx> -#endif #include <vcl/seleng.hxx> -#ifndef _EDIT_HXX #include <vcl/edit.hxx> -#endif #include <vcl/timer.hxx> -#ifndef _ACCEL_HXX #include <vcl/accel.hxx> -#endif #include <vcl/mnemonicengine.hxx> #include <tools/gen.hxx> #include <svtools/treelist.hxx> diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx index 9a6ece489119..4f145cf3c25f 100644 --- a/svtools/inc/svtools/table/tabledatawindow.hxx +++ b/svtools/inc/svtools/table/tabledatawindow.hxx @@ -27,9 +27,7 @@ #ifndef SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX #define SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif #include <vcl/seleng.hxx> //........................................................................ diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx index ef27edee2efe..83f21b9647c2 100644 --- a/svtools/inc/svtools/texteng.hxx +++ b/svtools/inc/svtools/texteng.hxx @@ -57,9 +57,7 @@ class TETextPortion; #include <tools/string.hxx> #include <tools/gen.hxx> -#ifndef _COM_SUN_STAR_LOCALE_LOCALE_HPP_ #include <com/sun/star/lang/Locale.hpp> -#endif #include <com/sun/star/uno/Reference.hxx> struct TEIMEInfos; diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx index da03d7c6c3aa..da03d7c6c3aa 100755..100644 --- a/svtools/inc/svtools/toolpanel/decklayouter.hxx +++ b/svtools/inc/svtools/toolpanel/decklayouter.hxx diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx index 92b36acf9114..92b36acf9114 100755..100644 --- a/svtools/inc/svtools/toolpanel/tablayouter.hxx +++ b/svtools/inc/svtools/toolpanel/tablayouter.hxx diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx index a1009591ffba..a1009591ffba 100755..100644 --- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx +++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 5eac1484fff9..168f2fbb99a4 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -44,9 +44,7 @@ #include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> #include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/io/XInputStream.hpp> // ------------------------ diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index 3ba013d90830..e648023b9bbe 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -32,9 +32,7 @@ #include <tools/solar.h> #include <tools/list.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/link.hxx> #include <tools/string.hxx> #include <tools/debug.hxx> diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx index 0937d824daf0..b4dac5cc196c 100644 --- a/svtools/inc/svtools/valueset.hxx +++ b/svtools/inc/svtools/valueset.hxx @@ -30,12 +30,8 @@ #include "svtools/svtdllapi.h" -#ifndef _CTRL_HXX #include <vcl/ctrl.hxx> -#endif -#ifndef _VIRDEV_HXX #include <vcl/virdev.hxx> -#endif #include <vcl/timer.hxx> class MouseEvent; diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx index 02562ac4bb63..3fcfd4c20aa4 100644 --- a/svtools/inc/svtools/wizardmachine.hxx +++ b/svtools/inc/svtools/wizardmachine.hxx @@ -29,9 +29,7 @@ #include "svtools/svtdllapi.h" #include <svtools/wizdlg.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/tabpage.hxx> #include <comphelper/stl_types.hxx> diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx index 5bd2db5672ed..17fccaeea3ec 100644 --- a/svtools/inc/svtools/wizdlg.hxx +++ b/svtools/inc/svtools/wizdlg.hxx @@ -30,9 +30,7 @@ #include "svtools/svtdllapi.h" -#ifndef _VCL_DIALOG_HXX #include <vcl/dialog.hxx> -#endif class TabPage; class Button; diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx index eca425cf1369..eca425cf1369 100755..100644 --- a/svtools/inc/svtools/xwindowitem.hxx +++ b/svtools/inc/svtools/xwindowitem.hxx diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx index 46853fa07c03..32f0396cde8e 100644 --- a/svtools/inc/taskbar.hxx +++ b/svtools/inc/taskbar.hxx @@ -30,9 +30,7 @@ #include "svtools/svtdllapi.h" #include <tools/time.hxx> -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/toolbox.hxx> #include <vcl/status.hxx> diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx index 533d5ae3f6d3..468d68e82d3d 100644 --- a/svtools/inc/wallitem.hxx +++ b/svtools/inc/wallitem.hxx @@ -27,9 +27,7 @@ #ifndef _WALLITEM_HXX #define _WALLITEM_HXX -#ifndef SHL_HXX #include <tools/shl.hxx> -#endif // ----------------------------------------------------------------------------------------- // Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 1deb8aeb5b56..86157c991cd5 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -28,14 +28,10 @@ #ifndef _SFXDATWIN_HXX #define _SFXDATWIN_HXX -#ifndef _BRWBOX_HXX #include <svtools/brwbox.hxx> -#endif #include <svtools/brwhead.hxx> #include <vcl/timer.hxx> -#ifndef _IMAGE_HXX //autogen #include <vcl/image.hxx> -#endif #include <tools/list.hxx> #include <svtools/transfer.hxx> diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index cc7aa4e05ee1..b1a1f1b8547a 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -28,12 +28,8 @@ #ifndef _IMPICNVW_HXX #define _IMPICNVW_HXX -#ifndef _VIRDEV_HXX #include <vcl/virdev.hxx> -#endif -#ifndef _SCRBAR_HXX #include <vcl/scrbar.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/seleng.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index ebeb10a7651d..b538449a7839 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -42,9 +42,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_ #include <com/sun/star/task/XInteractionHandler.hdl> -#endif #include <com/sun/star/ucb/NumberedSortingInfo.hpp> #include <com/sun/star/ucb/XAnyCompareFactory.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index abde4a015ab8..d0340f2030b7 100755..100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -29,9 +29,7 @@ #include <tools/list.hxx> #include <tools/color.hxx> #include <tools/string.hxx> -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif #include <rtl/uuid.h> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/compbase6.hxx> diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx index 4d32565a2775..8a793eac3630 100644 --- a/svtools/source/dialogs/filedlg2.hxx +++ b/svtools/source/dialogs/filedlg2.hxx @@ -30,9 +30,7 @@ #include <tools/debug.hxx> #include <tools/fsys.hxx> -#ifndef _SV_BUTTON_HXX //autogen wg. PushButton #include <vcl/button.hxx> -#endif #include <vcl/unohelp.hxx> class FixedText; diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx index 949873ceb1b7..43d50dad1761 100644 --- a/svtools/source/dialogs/propctrl.hxx +++ b/svtools/source/dialogs/propctrl.hxx @@ -35,18 +35,10 @@ */ -#ifndef __PROPED_HXX__ #include <proped.hxx> -#endif -#ifndef _UNO_HXX #include <usr/uno.hxx> -#endif -#ifndef _USR_SEQU_HXX #include <usr/sequ.hxx> -#endif -#ifndef __TOOLSIDL_HXX__ #include <usr/toolsidl.hxx> -#endif /* class XPropertyEditor diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 3f8e13e80660..551c532fbabc 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -50,9 +50,7 @@ #include <com/sun/star/i18n/WordType.hpp> -#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> -#endif #include <com/sun/star/i18n/InputSequenceCheckMode.hpp> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx index 3c6a61e7508d..6a55440149be 100644 --- a/svtools/source/filter.vcl/igif/decode.hxx +++ b/svtools/source/filter.vcl/igif/decode.hxx @@ -28,9 +28,7 @@ #ifndef _DECODE_HXX #define _DECODE_HXX -#ifndef _BMPACC_HXX #include <vcl/bmpacc.hxx> -#endif struct GIFLZWTableEntry; diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx index 61e737022946..102c8c722a05 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.hxx +++ b/svtools/source/filter.vcl/wmf/winmtf.hxx @@ -33,12 +33,8 @@ #endif #include <sot/object.hxx> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif -#ifndef _TOOL_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <tools/stack.hxx> #include <tools/table.hxx> #include <tools/dynary.hxx> diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx index 9a59c7a95f6d..a2a5b1b58d47 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.hxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase2.hxx> -#endif class OHatchWindowFactory : public ::cppu::WeakImplHelper2< diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx index de4c6935ef67..0a78283b2914 100644 --- a/svtools/source/inc/gifread.hxx +++ b/svtools/source/inc/gifread.hxx @@ -28,12 +28,8 @@ #ifndef _GIFREAD_HXX #define _GIFREAD_HXX -#ifndef _GRAPH_HXX #include <vcl/graph.hxx> -#endif -#ifndef _BMPACC_HXX #include <vcl/bmpacc.hxx> -#endif #ifdef _GIFPRIVATE diff --git a/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx index 41887b67822a..37267818c5dc 100644 --- a/svtools/source/inc/gradwrap.hxx +++ b/svtools/source/inc/gradwrap.hxx @@ -26,9 +26,7 @@ ************************************************************************/ -#ifndef _SVGEN_HXX #include <svgen.hxx> -#endif /****************************************************************************** diff --git a/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx index 9923190c5e21..7bcd98036b2e 100644 --- a/svtools/source/inc/jpeg.hxx +++ b/svtools/source/inc/jpeg.hxx @@ -28,9 +28,7 @@ #ifndef _JPEG_HXX #define _JPEG_HXX -#ifndef _GRAPH_HXX #include <vcl/graph.hxx> -#endif #include <svtools/fltcall.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx index 689da1faf140..5da77a62c5e2 100644 --- a/svtools/source/inc/property.hxx +++ b/svtools/source/inc/property.hxx @@ -28,27 +28,13 @@ #ifndef SV_PROPERTY_HXX #define SV_PROPERTY_HXX -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif -#ifndef SV_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef SV_GROUP_HXX #include <vcl/group.hxx> -#endif -#ifndef SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef SV_MOREBTN_HXX #include <vcl/morebtn.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/field.hxx> #include <svl/svarray.hxx> diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 92b9f960b65c..8bc688b4227d 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -28,12 +28,8 @@ #ifndef _SVIMPLBOX_HXX #define _SVIMPLBOX_HXX -#ifndef _SELENG_HXX #include <vcl/seleng.hxx> -#endif -#ifndef _SCRBAR_HXX #include <vcl/scrbar.hxx> -#endif #include <vcl/vclevent.hxx> // #102891# ---------------- #include <unotools/intlwrapper.hxx> diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx index 20f98d2bcbbd..6b10938b429b 100644 --- a/svtools/source/inc/svimpicn.hxx +++ b/svtools/source/inc/svimpicn.hxx @@ -27,13 +27,9 @@ #ifndef _SVIMPICN_HXX #define _SVIMPICN_HXX -#ifndef _VIRDEV_HXX #include <vcl/virdev.hxx> -#endif -#ifndef _SCRBAR_HXX #include <vcl/scrbar.hxx> -#endif #include <limits.h> class SvLBoxEntry; diff --git a/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx index aab52eeffa63..9515148513bd 100644 --- a/svtools/source/inc/xbmread.hxx +++ b/svtools/source/inc/xbmread.hxx @@ -28,12 +28,8 @@ #ifndef _XBMREAD_HXX #define _XBMREAD_HXX -#ifndef _GRAPH_HXX #include <vcl/graph.hxx> -#endif -#ifndef _BMPACC_HXX #include <vcl/bmpacc.hxx> -#endif #ifdef _XBMPRIVATE diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx index 29edd15a3b1c..d7355724b75c 100644 --- a/svtools/source/inc/xpmread.hxx +++ b/svtools/source/inc/xpmread.hxx @@ -28,9 +28,7 @@ #ifndef _XPMREAD_HXX #define _XPMREAD_HXX -#ifndef _BITMAP_HXX #include <vcl/bitmap.hxx> -#endif #ifdef _XPMPRIVATE diff --git a/svtools/source/productregistration/registrationdlg.hxx b/svtools/source/productregistration/registrationdlg.hxx index 16761aff08fc..bbedb8e3a924 100644 --- a/svtools/source/productregistration/registrationdlg.hxx +++ b/svtools/source/productregistration/registrationdlg.hxx @@ -29,9 +29,7 @@ #define SVTOOLS_REGISTRATIONDLG_HXX #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> //........................................................................ diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 053766d92841..dfaf949ede53 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -27,13 +27,9 @@ #ifndef SVTOOLS_TABLECONTROL_IMPL_HXX #define SVTOOLS_TABLECONTROL_IMPL_HXX -#ifndef SVTOOLS_INC_TABLE_TABLEMODEL_HXX #include <svtools/table/tablemodel.hxx> -#endif -#ifndef SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX #include <svtools/table/abstracttablecontrol.hxx> -#endif #include <svtools/table/tablemodel.hxx> #include <vector> diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx index 3ddde0c98c64..97c7c646ceeb 100644 --- a/svtools/source/table/tablegeometry.hxx +++ b/svtools/source/table/tablegeometry.hxx @@ -27,13 +27,9 @@ #ifndef SVTOOLS_TABLEGEOMETRY_HXX #define SVTOOLS_TABLEGEOMETRY_HXX -#ifndef SVTOOLS_INC_TABLE_TABLETYPES_HXX #include <svtools/table/tabletypes.hxx> -#endif -#ifndef _SV_GEN_HXX #include <tools/gen.hxx> -#endif //........................................................................ namespace svt { namespace table diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx index bc7e2ae7db88..bc7e2ae7db88 100755..100644 --- a/svtools/source/toolpanel/paneldecklisteners.hxx +++ b/svtools/source/toolpanel/paneldecklisteners.hxx diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx index 4b6607ecbd05..4b6607ecbd05 100755..100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index b15507e4614f..b15507e4614f 100755..100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index fb110cb74391..49b6a9530ec6 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -64,9 +64,7 @@ #include <com/sun/star/awt/XUnoControlContainer.hpp> #include <com/sun/star/awt/XTextLayoutConstrains.hpp> #include <com/sun/star/awt/XNumericField.hpp> -#ifndef _COM_SUN_STAR_AWT_XMetricFIELD_HPP_ #include <com/sun/star/awt/XMetricField.hpp> -#endif #include <com/sun/star/awt/XButton.hpp> #include <com/sun/star/awt/XToggleButton.hpp> #include <com/sun/star/awt/XPointer.hpp> diff --git a/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx index d0b7adbbe497..5d93b453245f 100644 --- a/toolkit/inc/toolkit/controls/eventcontainer.hxx +++ b/toolkit/inc/toolkit/controls/eventcontainer.hxx @@ -27,12 +27,8 @@ #include <osl/diagnose.h> -#ifndef _COM_SUN_STAR_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_XCONTAINER_HPP_ #include <com/sun/star/container/XContainer.hpp> -#endif #include <toolkit/helper/listenermultiplexer.hxx> diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx index 6bcfa519ed3d..9ca71972499a 100644 --- a/toolkit/inc/toolkit/controls/unocontrol.hxx +++ b/toolkit/inc/toolkit/controls/unocontrol.hxx @@ -31,9 +31,7 @@ #include <toolkit/dllapi.h> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XWindow2.hpp> -#ifndef _COM_SUN_STAR_AWT_XView_HPP_ #include <com/sun/star/awt/XView.hpp> -#endif #include <com/sun/star/beans/XPropertiesChangeListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> diff --git a/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/toolkit/inc/toolkit/helper/accessiblefactory.hxx index f3f28287d460..4796e84dc610 100644 --- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx +++ b/toolkit/inc/toolkit/helper/accessiblefactory.hxx @@ -28,13 +28,9 @@ #ifndef TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX #define TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX #include <com/sun/star/uno/Reference.hxx> -#endif -#ifndef _RTL_REF_HXX #include <rtl/ref.hxx> -#endif namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx index 502f25520145..615f17959090 100644 --- a/toolkit/inc/toolkit/helper/formpdfexport.hxx +++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx @@ -28,19 +28,13 @@ #ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX #define _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX -#ifndef TOOLKIT_DLLAPI_H #include <toolkit/dllapi.h> -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_AWT_XCONTROL_HPP_ #include <com/sun/star/awt/XControl.hpp> -#endif /** === end UNO includes === **/ -#ifndef _VCL_PDFWRITER_HXX #include <vcl/pdfwriter.hxx> -#endif #include <memory> diff --git a/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx index a228b8bdea77..92c0e0fbdee8 100644 --- a/toolkit/workben/layout/wordcountdialog.hxx +++ b/toolkit/workben/layout/wordcountdialog.hxx @@ -28,9 +28,7 @@ #define SW_WORDCOUNTDIALOG_HXX #include <sfx2/basedlgs.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <layout/layout.hxx> #include <layout/layout-pre.hxx> struct SwDocStat; diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx index f0c617a4b4d6..6309b2bfc53d 100644 --- a/toolkit/workben/layout/zoom.hxx +++ b/toolkit/workben/layout/zoom.hxx @@ -31,9 +31,7 @@ #include <layout/layout.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <vcl/fixed.hxx> @@ -43,9 +41,7 @@ #define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) #define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) */ -#ifndef _SVX_ZOOM_HXX #include "zoom_def.hxx" -#endif // class SvxZoomDialog --------------------------------------------------- /* {k:\svx\prototyp\dialog\zoom.bmp} diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx index a99ad1dd11c4..5c2193356fe4 100644 --- a/tools/inc/tools/color.hxx +++ b/tools/inc/tools/color.hxx @@ -33,9 +33,7 @@ class SvStream; class ResId; #include <tools/solar.h> -#ifndef _BGFX_COLOR_BCOLOR_HXX #include <basegfx/color/bcolor.hxx> -#endif // -------------------- // - ColorCount-Types - diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index b8aa1c8b59fe..589017295487 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -30,9 +30,7 @@ #include "tools/toolsdllapi.h" -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif #include <tools/solar.h> // ------------ diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx index cf767b842b7a..2c02a280db4a 100644 --- a/tools/inc/tools/errcode.hxx +++ b/tools/inc/tools/errcode.hxx @@ -29,10 +29,8 @@ #define _ERRCODE_HXX #ifndef __RSC -#ifndef _SOLAR_H #include <tools/solar.h> #endif -#endif /* diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx index 880768c89d8c..4498abbd0d8a 100644 --- a/tools/inc/tools/fsys.hxx +++ b/tools/inc/tools/fsys.hxx @@ -32,9 +32,7 @@ #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/wldcrd.hxx> -#ifndef __ERRCODE_HXX #include <tools/errcode.hxx> -#endif #include "tools/toolsdllapi.h" #include <cstdarg> diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx index d7619fc34a4d..930ffe57cee0 100644 --- a/tools/inc/tools/inetmsg.hxx +++ b/tools/inc/tools/inetmsg.hxx @@ -30,13 +30,9 @@ #include "tools/toolsdllapi.h" #include <sal/types.h> -#ifndef _RTL_TEXTENC_H_ #include <rtl/textenc.h> -#endif -#ifndef _TOOLS_INETMIME_HXX #include <tools/inetmime.hxx> -#endif #include <tools/list.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx index ac99537a9f0d..1cddfed55379 100644 --- a/tools/inc/tools/ownlist.hxx +++ b/tools/inc/tools/ownlist.hxx @@ -28,9 +28,7 @@ #ifndef _TOOLS_OWNLIST_HXX #define _TOOLS_OWNLIST_HXX -#ifndef _TOOLS_LIST_HXX //autogen #include <tools/list.hxx> -#endif /************************************************************************* *************************************************************************/ diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx index 0d14385e5f08..c425e2502435 100644 --- a/tools/inc/tools/pstm.hxx +++ b/tools/inc/tools/pstm.hxx @@ -30,13 +30,9 @@ #include <hash_map> #include "tools/toolsdllapi.h" -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif -#ifndef _INQIDX_HXX #include <tools/unqidx.hxx> -#endif #include <tools/ref.hxx> #include <tools/rtti.hxx> #include <tools/stream.hxx> diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index 61af361aa5b7..0166fc4a37ff 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -30,9 +30,7 @@ #include "tools/toolsdllapi.h" #include <tools/solar.h> #include <tools/string.hxx> -#ifndef _EINF_HXX #include <tools/errinf.hxx> -#endif #include <tools/ref.hxx> #include <tools/rtti.hxx> diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 8b86a1835596..49b494c69705 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -32,12 +32,8 @@ #include <osl/thread.h> #include <rtl/textenc.h> #include <rtl/textcvt.h> -#ifndef _RTL_STRING_HXX #include <rtl/string.hxx> -#endif -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include "tools/toolsdllapi.h" /******************************************************************************* diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx index e24c2e259022..52a529ea1593 100644 --- a/tools/inc/tools/tenccvt.hxx +++ b/tools/inc/tools/tenccvt.hxx @@ -28,9 +28,7 @@ #define _TOOLS_TENCCVT_HXX #include <rtl/textenc.h> -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif #include "tools/toolsdllapi.h" // ---------------------------------------- diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx index a6b1546763bc..7e11ab1d084f 100644 --- a/tools/win/inc/toolsdll.hxx +++ b/tools/win/inc/toolsdll.hxx @@ -30,9 +30,7 @@ #ifdef WIN -#ifndef _STRING_H #include <string.h> -#endif #include <tools/svwin.h> #include <tools/solar.h> #include <tools/shl.hxx> diff --git a/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/ucbhelper/inc/ucbhelper/commandenvironment.hxx index ddcdd5712901..41db60e2eeea 100644 --- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx +++ b/ucbhelper/inc/ucbhelper/commandenvironment.hxx @@ -29,9 +29,7 @@ #define _UCBHELPER_COMMANDENVIRONMENT_HXX #include <com/sun/star/lang/XTypeProvider.hpp> -#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_ #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#endif #include <cppuhelper/weak.hxx> #include <ucbhelper/macros.hxx> #include "ucbhelper/ucbhelperdllapi.h" diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx index 00724ceb4b46..b6b6755b21b1 100644 --- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx +++ b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx @@ -29,9 +29,7 @@ #define _UCBHELPER_COMMANDENVIRONMENTPROXY_HXX #include <com/sun/star/lang/XTypeProvider.hpp> -#ifndef _COM_SUN_STAR_UCB_XCOMMMANDENVIRONMENT_HPP_ #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#endif #include <cppuhelper/weak.hxx> #include <ucbhelper/macros.hxx> diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx index 23ed0fb4d60b..63d2de64068d 100644 --- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx +++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx @@ -33,13 +33,9 @@ #include <vector> -#ifndef __COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP__ #include <com/sun/star/task/XInteractionHandler.hpp> -#endif -#ifndef __COM_SUN_STAR_TASK_XINTERACTIONREQUEST_HPP__ #include <com/sun/star/task/XInteractionRequest.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include "ucbhelper/ucbhelperdllapi.h" diff --git a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx index 213f504c7f61..213f504c7f61 100755..100644 --- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx diff --git a/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx index ba853381329f..e1be7da477f0 100644 --- a/unotools/inc/unotools/accessiblerelationsethelper.hxx +++ b/unotools/inc/unotools/accessiblerelationsethelper.hxx @@ -30,9 +30,7 @@ #include "unotools/unotoolsdllapi.h" -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESSTATESET_HPP_ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#endif #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weak.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx index 3847beeee146..7e4657c8ec26 100644 --- a/unotools/inc/unotools/accessiblestatesethelper.hxx +++ b/unotools/inc/unotools/accessiblestatesethelper.hxx @@ -29,9 +29,7 @@ #include "unotools/unotoolsdllapi.h" -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLESSTATESET_HPP_ #include <com/sun/star/accessibility/XAccessibleStateSet.hpp> -#endif #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weak.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx index e4f2a3443f1d..c1aa6aa8b614 100644 --- a/unotools/inc/unotools/collatorwrapper.hxx +++ b/unotools/inc/unotools/collatorwrapper.hxx @@ -29,9 +29,7 @@ #ifndef _UNOTOOLS_COLLATORWRAPPER_HXX #define _UNOTOOLS_COLLATORWRAPPER_HXX -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 9a26bdd73021..9a26bdd73021 100755..100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index fd09b07e58cb..9d2183547911 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.hxx @@ -35,9 +35,7 @@ #include <unotools/readwritemutexguard.hxx> #include "unotools/unotoolsdllapi.h" -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif namespace com { namespace sun { namespace star { diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx index 833e8d5700c3..ceafb650a134 100644 --- a/unotools/inc/unotools/optionsdlg.hxx +++ b/unotools/inc/unotools/optionsdlg.hxx @@ -27,9 +27,7 @@ #ifndef INCLUDED_unotools_OPTIONSDLG_HXX #define INCLUDED_unotools_OPTIONSDLG_HXX -#ifndef INCLUDED_unotoolsdllapi_H #include "unotools/unotoolsdllapi.h" -#endif #include <tools/string.hxx> #include <unotools/options.hxx> diff --git a/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx index ec4f1243f4d9..431d86055fcd 100644 --- a/unotools/inc/unotools/unotunnelhelper.hxx +++ b/unotools/inc/unotools/unotunnelhelper.hxx @@ -34,9 +34,7 @@ #include <rtl/uuid.h> #include <rtl/memory.h> -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include <cppuhelper/extract.hxx> -#endif namespace utl { diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx index db561660d3c2..88293586ad08 100644 --- a/unotools/inc/unotools/xmlaccelcfg.hxx +++ b/unotools/inc/unotools/xmlaccelcfg.hxx @@ -28,9 +28,7 @@ #ifndef INCLUDED_unotools_XMLACCELCFG_HXX #define INCLUDED_unotools_XMLACCELCFG_HXX -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif #include <cppuhelper/weak.hxx> #include <unotools/accelcfg.hxx> diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index a07c99b70381..99553d8ad225 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/weakref.hxx> -#ifndef __SGI_STL_HASH_MAP #include <hash_map> -#endif #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 3f722adb0dba..6a3dcd2b7d28 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -33,9 +33,7 @@ //#include <tools/intn.hxx> #endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_UTIL_SEARCHFLAGS_HDL_ #include <com/sun/star/util/SearchFlags.hdl> -#endif #include <com/sun/star/i18n/TransliterationModules.hpp> #include <unotools/charclass.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/processfactory/componentfactory.cxx b/unotools/source/processfactory/componentfactory.cxx index 67055ee215ca..c0155b4c5110 100644 --- a/unotools/source/processfactory/componentfactory.cxx +++ b/unotools/source/processfactory/componentfactory.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HDL_ #include <com/sun/star/registry/XRegistryKey.hpp> -#endif #include <cppuhelper/factory.hxx> diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 115f6cf823a7..e1ee66f1a1dd 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -37,9 +37,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase5.hxx> -#ifndef _CPPUHELPER_PROPERTYSETMIXIN_HXX_ #include <cppuhelper/propertysetmixin.hxx> -#endif #include <osl/mutex.hxx> class SvStream; diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index f27f663b3698..7cbe3e2262fc 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -33,9 +33,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/ucb/CommandAbortedException.hpp> -#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HDL_ #include <com/sun/star/ucb/XCommandEnvironment.hdl> -#endif #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/io/XActiveDataStreamer.hpp> diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/aqua/inc/aqua11yfocustracker.hxx index 1dbf68c4a5ef..8cd0ec28f7bd 100644 --- a/vcl/aqua/inc/aqua11yfocustracker.hxx +++ b/vcl/aqua/inc/aqua11yfocustracker.hxx @@ -28,9 +28,7 @@ #ifndef _AQUA11YFOCUSTRACKER_HXX_ #define _AQUA11YFOCUSTRACKER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif #include "keyboardfocuslistener.hxx" diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/aqua/inc/keyboardfocuslistener.hxx index 71eba2f46c02..ee704cd4bb83 100644 --- a/vcl/aqua/inc/keyboardfocuslistener.hxx +++ b/vcl/aqua/inc/keyboardfocuslistener.hxx @@ -28,9 +28,7 @@ #ifndef _KEYBOARDFOCUSLISTENER_HXX_ #define _KEYBOARDFOCUSLISTENER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif #include <rtl/ref.hxx> diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx index 74ccb69756fd..74ccb69756fd 100755..100644 --- a/vcl/aqua/inc/salcolorutils.hxx +++ b/vcl/aqua/inc/salcolorutils.hxx diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx index 6106dc328740..6106dc328740 100755..100644 --- a/vcl/aqua/inc/salmathutils.hxx +++ b/vcl/aqua/inc/salmathutils.hxx diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx index 863bc59d173f..223631dce0b9 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.hxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx @@ -28,13 +28,9 @@ #ifndef _DOCUMENTFOCUSLISTENER_HXX_ #define _DOCUMENTFOCUSLISTENER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTLISTENER_HPP_ #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include "aqua11yfocustracker.hxx" #include <set> diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx index 6baa8bb69d01..d0294fae25fd 100644 --- a/vcl/aqua/source/dtrans/DropTarget.hxx +++ b/vcl/aqua/source/dtrans/DropTarget.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETLISTENR_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp> diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx index 2fa134af5078..2fa134af5078 100755..100644 --- a/vcl/inc/vcl/abstdlg.hxx +++ b/vcl/inc/vcl/abstdlg.hxx diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx index 5b91bd0713ec..b970a576cd23 100644 --- a/vcl/inc/vcl/dndevdis.hxx +++ b/vcl/inc/vcl/dndevdis.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGESTURERECOGNIZER_HPP_ #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> -#endif #include <cppuhelper/implbase3.hxx> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx index e58881c9f463..f98d3c97d012 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/vcl/graphite_adaptors.hxx @@ -35,21 +35,13 @@ #include <stdexcept> // Platform -#ifndef _SVWIN_H #include <tools/svwin.h> -#endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif -#ifndef _SV_SALGDI_HXX #include <vcl/salgdi.hxx> -#endif -#ifndef _SV_SALLAYOUT_HXX #include <vcl/sallayout.hxx> -#endif // Module #include "vcl/dllapi.h" diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx index 954b2340d0c7..36ed136370a0 100644 --- a/vcl/inc/vcl/impprn.hxx +++ b/vcl/inc/vcl/impprn.hxx @@ -30,9 +30,7 @@ #include <vcl/print.hxx> #include <vcl/timer.hxx> -#ifndef _VCL_IMPDEL_HXX #include <vcl/impdel.hxx> -#endif #include <vector> diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index 39bd75439ad9..9abf992d0b9d 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -30,9 +30,7 @@ #include <vcl/dllapi.h> #include <tools/bigint.hxx> -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif class LocaleDataWrapper; diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx index 678b57fbf56f..460c1c54efcd 100644 --- a/vcl/inc/vcl/salbmp.hxx +++ b/vcl/inc/vcl/salbmp.hxx @@ -28,9 +28,7 @@ #ifndef _SV_SALBMP_HXX #define _SV_SALBMP_HXX -#ifndef _TL_GEN_HXX #include <tools/gen.hxx> -#endif #include <vcl/dllapi.h> #include <com/sun/star/rendering/XBitmapCanvas.hpp> diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx index 83ef6ae6cc36..5b54d896eeee 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/vcl/salframe.hxx @@ -33,9 +33,7 @@ #ifdef __cplusplus -#ifndef _SV_PTRSTYLE_HXX #include <vcl/ptrstyle.hxx> -#endif #include <vcl/sndstyle.hxx> #endif // __cplusplus @@ -44,9 +42,7 @@ #include <tools/gen.hxx> #include <vcl/region.hxx> -#ifndef _VCL_IMPDEL_HXX #include <vcl/impdel.hxx> -#endif #include <rtl/ustring.hxx> #include <vcl/keycod.hxx> diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx index e23090c42392..e23090c42392 100755..100644 --- a/vcl/inc/vcl/sallayout.hxx +++ b/vcl/inc/vcl/sallayout.hxx diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx index 2cc5f347b2cb..2cc5f347b2cb 100755..100644 --- a/vcl/inc/vcl/smartid.hxx +++ b/vcl/inc/vcl/smartid.hxx diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 8dbbe5221434..fa3b1e35a071 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -28,18 +28,14 @@ #ifndef _SV_SVAPP_HXX #define _SV_SVAPP_HXX -#ifndef _VOS_THREAD_HXX #include <vos/thread.hxx> -#endif #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/unqid.hxx> #include <vcl/sv.h> #include <vcl/dllapi.h> #include <vcl/apptypes.hxx> -#ifndef _VCL_SETTINGS_HXX #include <vcl/settings.hxx> -#endif #include <vcl/vclevent.hxx> class Link; class AllSettings; diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 5cc8f32d7ac9..21523fd5fac2 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -28,9 +28,7 @@ #ifndef _SV_SVDATA_HXX #define _SV_SVDATA_HXX -#ifndef _VOS_THREAD_HXX #include <vos/thread.hxx> -#endif #include <tools/string.hxx> #include <tools/gen.hxx> #include <tools/shl.hxx> diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 5a3693c85b2e..aaf93ad13a31 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -32,19 +32,13 @@ #include <vcl/dllapi.h> #include <vcl/outdev.hxx> #include <tools/resid.hxx> -#ifndef _SV_POINTR_HXX #include <vcl/pointr.hxx> -#endif #include <vcl/wintypes.hxx> -#ifndef _SV_APPTYPES_HXX #include <vcl/apptypes.hxx> -#endif #include <vcl/inputctx.hxx> #include <vcl/vclevent.hxx> // Only for compatibility - because many people outside haven't included event.hxx -#ifndef _VCL_EVENT_HXX #include <vcl/event.hxx> -#endif #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <rtl/ustring.hxx> diff --git a/vcl/os2/inc/salsound.hxx b/vcl/os2/inc/salsound.hxx index 7ec2aeed1720..bed724557c49 100644 --- a/vcl/os2/inc/salsound.hxx +++ b/vcl/os2/inc/salsound.hxx @@ -32,9 +32,7 @@ #include <sv.h> #include <tools/string.hxx> #include <salframe.hxx> -#ifndef _SV_SALSTYPE_HXX #include <salstype.hxx> -#endif #include <salsound.hxx> // ------------ diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index b081b5cf9615..9b76599e09b9 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -59,9 +59,7 @@ #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> -#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> -#endif #include <com/sun/star/i18n/InputSequenceCheckMode.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index f1cd779c97cf..f639dddff3f8 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -41,9 +41,7 @@ #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCollator.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 4448164e71c2..a5220407e478 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -73,9 +73,7 @@ #include <vcl/controllayout.hxx> #include <rtl/logfile.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HDL_ #include <com/sun/star/beans/PropertyValues.hdl> -#endif #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx index 3912977cc9be..5003c0fe1cd6 100644 --- a/vcl/source/glyphs/graphite_textsrc.hxx +++ b/vcl/source/glyphs/graphite_textsrc.hxx @@ -39,21 +39,13 @@ #include <stdexcept> // Platform -#ifndef _SVWIN_H #include <tools/svwin.h> -#endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif -#ifndef _SV_SALGDI_HXX #include <vcl/salgdi.hxx> -#endif -#ifndef _SV_SALLAYOUT_HXX #include <vcl/sallayout.hxx> -#endif // Module #include "vcl/dllapi.h" diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/unx/inc/i18n_status.hxx index 7202cf6e0eef..d641c12b852b 100644 --- a/vcl/unx/inc/i18n_status.hxx +++ b/vcl/unx/inc/i18n_status.hxx @@ -32,9 +32,7 @@ #include <tools/link.hxx> #include <tools/gen.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <vcl/salimestatus.hxx> #include <vector> diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 7e38e0a89bf2..4fbe32934ae7 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -34,9 +34,7 @@ #include <vcl/salframe.hxx> #include <salinst.h> #include <vcl/saldatabasic.hxx> -#ifndef _OSL_MODULE_H #include <osl/module.h> -#endif #include <vcl/dllapi.h> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index d359ff4022ac..78de508ed6ef 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -37,13 +37,9 @@ class SalXLib; // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include <salunx.h> #include <vcl/salgtype.hxx> -#ifndef _SV_PTRSTYLE_HXX #include <vcl/ptrstyle.hxx> -#endif #include <sal/types.h> -#ifndef _OSL_MUTEX_H #include <osl/mutex.h> -#endif #include <vector> #include <list> #include <hash_map> diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx index cbedede2cc99..dd28d9eaa255 100644 --- a/vcl/unx/inc/wmadaptor.hxx +++ b/vcl/unx/inc/wmadaptor.hxx @@ -28,9 +28,7 @@ #ifndef _VCL_WMADAPTOR_HXX_ #define _VCL_WMADAPTOR_HXX_ -#ifndef _TL_STRING_HXX #include <tools/string.hxx> -#endif #include <tools/gen.hxx> #include <vcl/dllapi.h> #ifndef _PREX_H diff --git a/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/source/dtrans/X11_clipboard.hxx index 21bf547a9cb7..3a4a44cd9f8b 100644 --- a/vcl/unx/source/dtrans/X11_clipboard.hxx +++ b/vcl/unx/source/dtrans/X11_clipboard.hxx @@ -30,13 +30,9 @@ #include <X11_selection.hxx> -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDEX_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDNOTIFIER_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#endif #include <cppuhelper/compbase4.hxx> // ------------------------------------------------------------------------ diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx index 47baa1776d1a..f47ac00f6b6c 100644 --- a/vcl/unx/source/dtrans/X11_selection.hxx +++ b/vcl/unx/source/dtrans/X11_selection.hxx @@ -40,9 +40,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <osl/thread.h> -#ifndef _OSL_CONDITION_HXX_ #include <osl/conditn.hxx> -#endif #include <hash_map> #include <list> diff --git a/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/source/dtrans/X11_transferable.hxx index 57f0d6682cab..a6d579db69ea 100644 --- a/vcl/unx/source/dtrans/X11_transferable.hxx +++ b/vcl/unx/source/dtrans/X11_transferable.hxx @@ -31,9 +31,7 @@ #include <X11_selection.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HDL_ #include <com/sun/star/lang/XEventListener.hpp> -#endif #include <cppuhelper/implbase1.hxx> namespace x11 { diff --git a/vcl/unx/source/gdi/xlfd_extd.hxx b/vcl/unx/source/gdi/xlfd_extd.hxx index 523f87fac477..c63ace707c16 100644 --- a/vcl/unx/source/gdi/xlfd_extd.hxx +++ b/vcl/unx/source/gdi/xlfd_extd.hxx @@ -28,12 +28,8 @@ #define XLFD_EXTENDED_HXX #include <salunx.h> -#ifndef _VCL_VCLENUM_HXX #include <vcl/enum.hxx> -#endif -#ifndef _VCL_OUTFONT_HXX #include <vcl/outfont.hxx> -#endif #include <vector> diff --git a/vcl/win/inc/wincomp.hxx b/vcl/win/inc/wincomp.hxx index 61e04779dbce..8da91d80cadf 100644 --- a/vcl/win/inc/wincomp.hxx +++ b/vcl/win/inc/wincomp.hxx @@ -28,9 +28,7 @@ #ifndef _SV_WINCOMP_HXX #define _SV_WINCOMP_HXX -#ifndef _STRING_H #include <string.h> -#endif #include <vcl/sv.h> // ---------- |