diff options
| author | George Bateman <george.bateman16@gmail.com> | 2020-08-04 21:36:11 +0000 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-09-04 08:55:42 +0200 |
| commit | df9ff47f984bfb8ce265cb73ec10a3dd5837bd10 (patch) | |
| tree | 3add658814387dfeebf529df5f730de4b8904bbc | |
| parent | 24491636d36a1d92a4bb9f3f1f1b2e65b81d8429 (diff) | |
tdf#124176 Use #pragma once in canvas
This commit was carried out by a Python script, source of which
is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.
Change-Id: Icd712adf20fa2dbaaea2fc33a0fd870c8595b7e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100147
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
74 files changed, 74 insertions, 296 deletions
diff --git a/canvas/inc/rendering/icolorbuffer.hxx b/canvas/inc/rendering/icolorbuffer.hxx index 7d851131eec8..6e0c250c5baa 100644 --- a/canvas/inc/rendering/icolorbuffer.hxx +++ b/canvas/inc/rendering/icolorbuffer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX -#define INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX +#pragma once #include <sal/types.h> @@ -72,6 +71,4 @@ namespace canvas }; } -#endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index 4eeae58eeeae..eede77844d3a 100644 --- a/canvas/source/cairo/cairo_devicehelper.hxx +++ b/canvas/source/cairo/cairo_devicehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_DEVICEHELPER_HXX +#pragma once #include <com/sun/star/rendering/XGraphicDevice.hpp> @@ -120,6 +119,4 @@ namespace cairocanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx index 2ec114901f9e..558ec7921ecb 100644 --- a/canvas/source/cairo/cairo_repainttarget.hxx +++ b/canvas/source/cairo/cairo_repainttarget.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX +#pragma once #include <com/sun/star/rendering/RenderState.hpp> #include <com/sun/star/rendering/ViewState.hpp> @@ -46,6 +45,4 @@ namespace cairocanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_REPAINTTARGET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx index 446b2a59ea7c..513283e308c9 100644 --- a/canvas/source/cairo/cairo_sprite.hxx +++ b/canvas/source/cairo/cairo_sprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX +#pragma once #include <base/sprite.hxx> @@ -63,6 +62,4 @@ namespace cairocanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 5fb9db2c47e9..7790e68904b0 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVAS_HXX +#pragma once #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -157,6 +156,4 @@ namespace cairocanvas typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx index 6d659afd00c2..2b11f1bcf0ac 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.hxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX +#pragma once #include <com/sun/star/rendering/XAnimatedSprite.hpp> #include <com/sun/star/rendering/XAnimation.hpp> @@ -138,6 +137,4 @@ namespace cairocanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITECANVASHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index 795a9daa4d07..63e9d13039f5 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.hxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEDEVICEHELPER_HXX +#pragma once #include <com/sun/star/awt/Rectangle.hpp> @@ -75,6 +74,4 @@ namespace cairocanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx index 84bf77dbc90f..df0919e7fd6a 100644 --- a/canvas/source/cairo/cairo_spritehelper.hxx +++ b/canvas/source/cairo/cairo_spritehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX +#pragma once #include <base/canvascustomspritehelper.hxx> @@ -100,6 +99,4 @@ namespace cairocanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SPRITEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx index 0824450726c8..a5115a507863 100644 --- a/canvas/source/cairo/cairo_surfaceprovider.hxx +++ b/canvas/source/cairo/cairo_surfaceprovider.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_SURFACEPROVIDER_HXX +#pragma once #include <rtl/ref.hxx> #include <com/sun/star/uno/XInterface.hpp> @@ -68,6 +67,4 @@ namespace cairocanvas typedef ::rtl::Reference< SurfaceProvider > SurfaceProviderRef; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index 6254108a50ad..a2ca8c93afbb 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX -#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -105,6 +104,4 @@ namespace cairocanvas } -#endif // INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx index f9e3470f0d5f..127ee5fc5b39 100644 --- a/canvas/source/directx/dx_bitmap.hxx +++ b/canvas/source/directx/dx_bitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAP_HXX +#pragma once #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> @@ -82,6 +81,4 @@ namespace dxcanvas typedef std::shared_ptr< DXBitmap > DXBitmapSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx index 8a5ecca64c27..46f970493f8e 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.hxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX +#pragma once #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XBitmapCanvas.hpp> @@ -124,6 +123,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPCANVASHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx index 3003f6ef34c4..be0a3318557e 100644 --- a/canvas/source/directx/dx_bitmapprovider.hxx +++ b/canvas/source/directx/dx_bitmapprovider.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_BITMAPPROVIDER_HXX +#pragma once #include "dx_ibitmap.hxx" #include <memory> @@ -32,6 +31,4 @@ namespace dxcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index acea85c762c5..5a00e07fa462 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVAS_HXX +#pragma once #include <rtl/ref.hxx> @@ -171,6 +170,4 @@ namespace dxcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 756791d1526d..b1725b447dec 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX +#pragma once #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/rendering/XBitmapCanvas.hpp> @@ -89,6 +88,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASBITMAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index 53886f636db3..2411a1527323 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> @@ -128,6 +127,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASCUSTOMSPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index 15b2fa8eef03..c5f369d00f5e 100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -90,6 +89,4 @@ namespace dxcanvas } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx index 12c939e2e9ac..54731a08eb44 100644 --- a/canvas/source/directx/dx_canvashelper.hxx +++ b/canvas/source/directx/dx_canvashelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASHELPER_HXX +#pragma once #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XBitmapCanvas.hpp> @@ -250,6 +249,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx index 496652b30197..14a77d19da78 100644 --- a/canvas/source/directx/dx_config.hxx +++ b/canvas/source/directx/dx_config.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CONFIG_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CONFIG_HXX +#pragma once #include <unotools/configitem.hxx> #include <optional> @@ -78,6 +77,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CONFIG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx index ac52c127a0d5..d5fa62b07c54 100644 --- a/canvas/source/directx/dx_devicehelper.hxx +++ b/canvas/source/directx/dx_devicehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX +#pragma once #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> @@ -112,6 +111,4 @@ namespace dxcanvas typedef ::rtl::Reference< css::rendering::XGraphicDevice > DeviceRef; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_DEVICEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx index a050d24fb389..4b0a0f52aa93 100644 --- a/canvas/source/directx/dx_gdiplususer.hxx +++ b/canvas/source/directx/dx_gdiplususer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX +#pragma once #include <sal/config.h> #include <memory> @@ -43,6 +42,4 @@ namespace dxcanvas } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GDIPLUSUSER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx index 2d7c3d894465..2d6d6188424a 100644 --- a/canvas/source/directx/dx_graphicsprovider.hxx +++ b/canvas/source/directx/dx_graphicsprovider.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX +#pragma once #include "dx_winstuff.hxx" #include <memory> @@ -44,6 +43,4 @@ namespace dxcanvas typedef std::shared_ptr< GraphicsProvider > GraphicsProviderSharedPtr; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_GRAPHICSPROVIDER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_ibitmap.hxx b/canvas/source/directx/dx_ibitmap.hxx index c16faaf5f60b..6d3f4d6f6a0d 100644 --- a/canvas/source/directx/dx_ibitmap.hxx +++ b/canvas/source/directx/dx_ibitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IBITMAP_HXX +#pragma once #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> @@ -59,6 +58,4 @@ namespace dxcanvas typedef std::shared_ptr<IBitmap> IBitmapSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx index 720826e35652..2c6b85ce83ff 100644 --- a/canvas/source/directx/dx_impltools.hxx +++ b/canvas/source/directx/dx_impltools.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -122,6 +121,4 @@ namespace dxcanvas::tools } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_IMPLTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx index 87311136a46f..eaec483a024d 100644 --- a/canvas/source/directx/dx_linepolypolygon.hxx +++ b/canvas/source/directx/dx_linepolypolygon.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX +#pragma once #include <canvas/canvastools.hxx> #include <basegfx/utils/unopolypolygon.hxx> @@ -45,6 +44,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_LINEPOLYPOLYGON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx index 0ab154182543..d8ea283b0791 100644 --- a/canvas/source/directx/dx_rendermodule.hxx +++ b/canvas/source/directx/dx_rendermodule.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_RENDERMODULE_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_RENDERMODULE_HXX +#pragma once #include <basegfx/vector/b2ivector.hxx> #include <basegfx/range/b2irectangle.hxx> @@ -78,6 +77,4 @@ namespace dxcanvas IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx index 82c43fbde8b9..c1f75e1b1e98 100644 --- a/canvas/source/directx/dx_sprite.hxx +++ b/canvas/source/directx/dx_sprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX +#pragma once #include <base/sprite.hxx> @@ -43,6 +42,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index 26f62f4e68ba..081337f72cfc 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVAS_HXX +#pragma once #include <rtl/ref.hxx> @@ -153,6 +152,4 @@ namespace dxcanvas typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx index 9e99489cd75a..5c2d98ba818e 100644 --- a/canvas/source/directx/dx_spritecanvashelper.hxx +++ b/canvas/source/directx/dx_spritecanvashelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX +#pragma once #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp> @@ -150,6 +149,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITECANVASHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx index 1e77a66fca97..ad7417770667 100644 --- a/canvas/source/directx/dx_spritedevicehelper.hxx +++ b/canvas/source/directx/dx_spritedevicehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX +#pragma once #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> @@ -96,6 +95,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEDEVICEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx index bc559c60127b..86e6dbaf6c12 100644 --- a/canvas/source/directx/dx_spritehelper.hxx +++ b/canvas/source/directx/dx_spritehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX +#pragma once #include <com/sun/star/rendering/XCustomSprite.hpp> @@ -100,6 +99,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SPRITEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx index 75cd630c6b6a..323a3b7f1737 100644 --- a/canvas/source/directx/dx_surfacebitmap.hxx +++ b/canvas/source/directx/dx_surfacebitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEBITMAP_HXX +#pragma once #include <rendering/isurfaceproxy.hxx> #include <rendering/isurfaceproxymanager.hxx> @@ -133,6 +132,4 @@ namespace dxcanvas typedef std::shared_ptr< DXSurfaceBitmap > DXSurfaceBitmapSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx index 930add339333..19f195a6ecd4 100644 --- a/canvas/source/directx/dx_surfacegraphics.hxx +++ b/canvas/source/directx/dx_surfacegraphics.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX +#pragma once #include "dx_graphicsprovider.hxx" @@ -34,6 +33,4 @@ namespace dxcanvas GraphicsSharedPtr createSurfaceGraphics(const COMReference<surface_type>& rSurface ); } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_SURFACEGRAPHICS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx index b24a1c8f00dc..24d37e2107a4 100644 --- a/canvas/source/directx/dx_textlayout.hxx +++ b/canvas/source/directx/dx_textlayout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -102,6 +101,4 @@ namespace dxcanvas } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx index 0448c39aa8d0..d5820451fb53 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.hxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX +#pragma once #include <memory> @@ -74,6 +73,4 @@ namespace dxcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_DRAWHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx index c3bd9bd28ff6..a54ec3b90bd3 100644 --- a/canvas/source/directx/dx_vcltools.hxx +++ b/canvas/source/directx/dx_vcltools.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/TriState.hpp> @@ -44,6 +43,4 @@ namespace dxcanvas::tools } -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_VCLTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index c585071796e7..b4c54c780971 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX -#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX +#pragma once #include <algorithm> #include <memory> @@ -149,6 +148,4 @@ namespace dxcanvas #include <postwin.h> -#endif // INCLUDED_CANVAS_SOURCE_DIRECTX_DX_WINSTUFF_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx index 08258174b923..5bdb9713d211 100644 --- a/canvas/source/opengl/ogl_bitmapcanvashelper.hxx +++ b/canvas/source/opengl/ogl_bitmapcanvashelper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BITMAPCANVASHELPER_HXX +#pragma once #include <com/sun/star/geometry/IntegerPoint2D.hpp> #include <com/sun/star/geometry/IntegerRectangle2D.hpp> @@ -69,6 +68,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_buffercontext.hxx b/canvas/source/opengl/ogl_buffercontext.hxx index 717adb1d6f56..d4262d35679c 100644 --- a/canvas/source/opengl/ogl_buffercontext.hxx +++ b/canvas/source/opengl/ogl_buffercontext.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_BUFFERCONTEXT_HXX +#pragma once #include <epoxy/gl.h> @@ -33,6 +32,4 @@ namespace oglcanvas typedef std::shared_ptr<IBufferContext> IBufferContextSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvasbitmap.hxx b/canvas/source/opengl/ogl_canvasbitmap.hxx index 72ac619c5b60..55564c66d018 100644 --- a/canvas/source/opengl/ogl_canvasbitmap.hxx +++ b/canvas/source/opengl/ogl_canvasbitmap.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASBITMAP_HXX +#pragma once #include <cppuhelper/compbase.hxx> @@ -70,6 +69,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index 0f0a7693c00b..3cd43cf4f17e 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASCUSTOMSPRITE_HXX +#pragma once #include <cppuhelper/compbase.hxx> @@ -90,6 +89,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index c7d44b8637b7..75eda6b0fb31 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -59,6 +58,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx index 26ec3f71eb63..49513983d157 100644 --- a/canvas/source/opengl/ogl_canvashelper.hxx +++ b/canvas/source/opengl/ogl_canvashelper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASHELPER_HXX +#pragma once #include <com/sun/star/rendering/XCanvas.hpp> @@ -217,6 +216,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_canvastools.hxx b/canvas/source/opengl/ogl_canvastools.hxx index 1ee15a9ba989..8e7029fbe5f4 100644 --- a/canvas/source/opengl/ogl_canvastools.hxx +++ b/canvas/source/opengl/ogl_canvastools.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASTOOLS_HXX +#pragma once #include <sal/config.h> #include <vector> @@ -35,6 +34,4 @@ namespace oglcanvas void renderOSD( const std::vector<double>& rNumbers, double scale ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 245575b863e7..33948b2d0cd2 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITECANVAS_HXX +#pragma once #include <rtl/ref.hxx> @@ -112,6 +111,4 @@ namespace oglcanvas typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index d5f3cb714548..3b9a26262509 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_SPRITEDEVICEHELPER_HXX +#pragma once #include <vcl/opengl/OpenGLContext.hxx> @@ -133,6 +132,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index 8c7a289d6ab9..f2e6869c466d 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -68,6 +67,4 @@ namespace oglcanvas } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_texturecache.hxx b/canvas/source/opengl/ogl_texturecache.hxx index 848b2e900abf..8d0a425ced17 100644 --- a/canvas/source/opengl/ogl_texturecache.hxx +++ b/canvas/source/opengl/ogl_texturecache.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTURECACHE_HXX +#pragma once #include <sal/types.h> #include <unordered_map> @@ -58,6 +57,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/opengl/ogl_tools.hxx b/canvas/source/opengl/ogl_tools.hxx index 469a5be7874b..8f42f734e68b 100644 --- a/canvas/source/opengl/ogl_tools.hxx +++ b/canvas/source/opengl/ogl_tools.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TOOLS_HXX +#pragma once #include <sal/config.h> #include <epoxy/gl.h> @@ -25,6 +24,4 @@ namespace oglcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx index cfb3cbd9d4bd..14fa17c53ae0 100644 --- a/canvas/source/tools/page.hxx +++ b/canvas/source/tools/page.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_PAGE_HXX -#define INCLUDED_CANVAS_SOURCE_TOOLS_PAGE_HXX +#pragma once #include <basegfx/vector/b2isize.hxx> #include <basegfx/range/b2irectangle.hxx> @@ -145,6 +144,4 @@ namespace canvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx index 761c84c33cf6..a5d905ef726c 100644 --- a/canvas/source/tools/pagemanager.hxx +++ b/canvas/source/tools/pagemanager.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_PAGEMANAGER_HXX -#define INCLUDED_CANVAS_SOURCE_TOOLS_PAGEMANAGER_HXX +#pragma once #include <basegfx/vector/b2isize.hxx> #include <rendering/irendermodule.hxx> @@ -73,6 +72,4 @@ namespace canvas typedef std::shared_ptr< PageManager > PageManagerSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx index e791e6b5050d..25b859ba416b 100644 --- a/canvas/source/tools/surface.hxx +++ b/canvas/source/tools/surface.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACE_HXX -#define INCLUDED_CANVAS_SOURCE_TOOLS_SURFACE_HXX +#pragma once #include <basegfx/point/b2ipoint.hxx> #include <basegfx/point/b2dpoint.hxx> @@ -141,6 +140,4 @@ namespace canvas typedef std::shared_ptr< Surface > SurfaceSharedPtr; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx index fb9308a61bc5..5c620d3e3bc8 100644 --- a/canvas/source/tools/surfaceproxy.hxx +++ b/canvas/source/tools/surfaceproxy.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACEPROXY_HXX -#define INCLUDED_CANVAS_SOURCE_TOOLS_SURFACEPROXY_HXX +#pragma once #include <rendering/isurfaceproxy.hxx> #include <rendering/icolorbuffer.hxx> @@ -116,6 +115,4 @@ namespace canvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/tools/surfacerect.hxx b/canvas/source/tools/surfacerect.hxx index ec73342ea799..808796d6d528 100644 --- a/canvas/source/tools/surfacerect.hxx +++ b/canvas/source/tools/surfacerect.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_TOOLS_SURFACERECT_HXX -#define INCLUDED_CANVAS_SOURCE_TOOLS_SURFACERECT_HXX +#pragma once #include <basegfx/point/b2ipoint.hxx> #include <basegfx/vector/b2isize.hxx> @@ -88,6 +87,4 @@ namespace canvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx index e6df6d857aaf..6bbeb85ec54b 100644 --- a/canvas/source/vcl/backbuffer.hxx +++ b/canvas/source/vcl/backbuffer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX +#pragma once #include <vcl/virdev.hxx> @@ -55,6 +54,4 @@ namespace vclcanvas typedef std::shared_ptr< BackBuffer > BackBufferSharedPtr; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_BACKBUFFER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx index fd2e45f5143a..9098e7e93813 100644 --- a/canvas/source/vcl/bitmapbackbuffer.hxx +++ b/canvas/source/vcl/bitmapbackbuffer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_BITMAPBACKBUFFER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_BITMAPBACKBUFFER_HXX +#pragma once #include <vcl/virdev.hxx> #include <vcl/bitmapex.hxx> @@ -91,6 +90,4 @@ namespace vclcanvas } -#endif // INCLUDED_CANVAS_SOURCE_VCL_BITMAPBACKBUFFER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx index f76b2c3fc59e..1b3b396ebd5a 100644 --- a/canvas/source/vcl/cachedbitmap.hxx +++ b/canvas/source/vcl/cachedbitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX +#pragma once #include <com/sun/star/rendering/RenderState.hpp> #include <base/cachedprimitivebase.hxx> @@ -64,6 +63,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CACHEDBITMAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 62f71b216848..be7d7858e3ad 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVAS_HXX +#pragma once #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -110,6 +109,4 @@ namespace vclcanvas }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index ee8ae6b45f41..7eea1ac31383 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX +#pragma once #include <cppuhelper/compbase.hxx> @@ -115,6 +114,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx index 328f96ca96fa..7e75f92e82d6 100644 --- a/canvas/source/vcl/canvasbitmaphelper.hxx +++ b/canvas/source/vcl/canvasbitmaphelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX +#pragma once #include "canvashelper.hxx" @@ -104,6 +103,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CANVASBITMAPHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 675699a333e2..1a7d3ccfb69e 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <comphelper/uno3.hxx> @@ -114,6 +113,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CANVASCUSTOMSPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index f9cd2d6d29f3..fdfa870f5ed3 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -85,6 +84,4 @@ namespace vclcanvas } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx index c09d8c81d636..48a6a2742431 100644 --- a/canvas/source/vcl/canvashelper.hxx +++ b/canvas/source/vcl/canvashelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX +#pragma once #include <com/sun/star/geometry/IntegerPoint2D.hpp> #include <com/sun/star/geometry/IntegerRectangle2D.hpp> @@ -307,6 +306,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_CANVASHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx index bcb08119752f..f8ff12aedc45 100644 --- a/canvas/source/vcl/devicehelper.hxx +++ b/canvas/source/vcl/devicehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX +#pragma once #include <com/sun/star/rendering/XGraphicDevice.hpp> @@ -84,6 +83,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_DEVICEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx index f20b052d5534..028ea1174f3c 100644 --- a/canvas/source/vcl/impltools.hxx +++ b/canvas/source/vcl/impltools.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_IMPLTOOLS_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_IMPLTOOLS_HXX +#pragma once #include <osl/mutex.hxx> @@ -175,6 +174,4 @@ namespace vclcanvas } } -#endif // INCLUDED_CANVAS_SOURCE_VCL_IMPLTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx index 10cab044f53e..668212b9db4a 100644 --- a/canvas/source/vcl/outdevprovider.hxx +++ b/canvas/source/vcl/outdevprovider.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX +#pragma once #include <memory> @@ -48,6 +47,4 @@ namespace vclcanvas typedef std::shared_ptr< OutDevProvider > OutDevProviderSharedPtr; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_OUTDEVPROVIDER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/repainttarget.hxx b/canvas/source/vcl/repainttarget.hxx index b5ee27542f8a..b7b4058e9e9d 100644 --- a/canvas/source/vcl/repainttarget.hxx +++ b/canvas/source/vcl/repainttarget.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX +#pragma once #include "cachedbitmap.hxx" @@ -50,6 +49,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_REPAINTTARGET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx index 3d29041d9916..30ab15aaf0a1 100644 --- a/canvas/source/vcl/sprite.hxx +++ b/canvas/source/vcl/sprite.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX +#pragma once #include <base/sprite.hxx> @@ -63,6 +62,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_SPRITE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index 05897741d9ab..8f7c76880f51 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVAS_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVAS_HXX +#pragma once #include <rtl/ref.hxx> @@ -161,6 +160,4 @@ namespace vclcanvas } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx index b7553e367c5d..af3f5526a8da 100644 --- a/canvas/source/vcl/spritecanvashelper.hxx +++ b/canvas/source/vcl/spritecanvashelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX +#pragma once #include <com/sun/star/rendering/XAnimatedSprite.hpp> #include <com/sun/star/rendering/XAnimation.hpp> @@ -167,6 +166,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_SPRITECANVASHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx index 8db1b115eed3..5f4ef570a699 100644 --- a/canvas/source/vcl/spritedevicehelper.hxx +++ b/canvas/source/vcl/spritedevicehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITEDEVICEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_SPRITEDEVICEHELPER_HXX +#pragma once #include <com/sun/star/awt/Rectangle.hpp> @@ -58,6 +57,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_SPRITEDEVICEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx index 1599fe40717e..41d9883f6ffe 100644 --- a/canvas/source/vcl/spritehelper.hxx +++ b/canvas/source/vcl/spritehelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX +#pragma once #include <vcl/bitmapex.hxx> @@ -106,6 +105,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_SPRITEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx index f7378f6116cd..b3c9acdb7de6 100644 --- a/canvas/source/vcl/textlayout.hxx +++ b/canvas/source/vcl/textlayout.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -101,6 +100,4 @@ namespace vclcanvas } -#endif // INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx index 83f5e65e6a5c..d9d69e9a37c9 100644 --- a/canvas/source/vcl/windowoutdevholder.hxx +++ b/canvas/source/vcl/windowoutdevholder.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CANVAS_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX -#define INCLUDED_CANVAS_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/awt/XWindow.hpp> @@ -54,6 +53,4 @@ namespace vclcanvas }; } -#endif // INCLUDED_CANVAS_SOURCE_VCL_WINDOWOUTDEVHOLDER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |