vcl/inc/accmgr.hxx | 5 +----
vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx | 5 +----
vcl/inc/bitmap/BitmapScaleSuperFilter.hxx | 5 +----
vcl/inc/bitmap/Octree.hxx | 5 +----
vcl/inc/bitmap/ScanlineTools.hxx | 5 +----
vcl/inc/bitmap/bmpfast.hxx | 5 +----
vcl/inc/bitmap/impoctree.hxx | 5 +----
vcl/inc/brdwin.hxx | 5 +----
vcl/inc/calendar.hxx | 5 +----
vcl/inc/canvasbitmap.hxx | 5 +----
vcl/inc/configsettings.hxx | 6 +-----
vcl/inc/cursor_hotspots.hxx | 5 +----
vcl/inc/debugevent.hxx | 5 +----
vcl/inc/displayconnectiondispatch.hxx | 7 +------
vcl/inc/dndeventdispatcher.hxx | 5 +----
vcl/inc/dndlistenercontainer.hxx | 5 +----
vcl/inc/driverblocklist.hxx | 5 +----
vcl/inc/factory.hxx | 6 +-----
vcl/inc/fltcall.hxx | 5 +----
vcl/inc/font/OpenTypeFeatureStrings.hrc | 5 +----
vcl/inc/fontattributes.hxx | 5 +----
vcl/inc/headless/svpbmp.hxx | 5 +----
vcl/inc/headless/svpdummies.hxx | 5 +----
vcl/inc/headless/svpframe.hxx | 5 +----
vcl/inc/headless/svpinst.hxx | 5 +----
vcl/inc/headless/svpprn.hxx | 5 +----
vcl/inc/headless/svpvd.hxx | 5 +----
vcl/inc/helpwin.hxx | 5 +----
vcl/inc/hyperlabel.hxx | 6 ++----
vcl/inc/iconview.hxx | 5 +----
vcl/inc/image.h | 5 +----
vcl/inc/imagerepository.hxx | 6 +-----
vcl/inc/impdel.hxx | 5 +----
vcl/inc/impfontcharmap.hxx | 5 +----
vcl/inc/impglyphitem.hxx | 5 +----
vcl/inc/implimagetree.hxx | 5 +----
vcl/inc/ios/iosinst.hxx | 5 +----
vcl/inc/jobdata.hxx | 6 +-----
vcl/inc/jobset.h | 5 +----
vcl/inc/langboost.hxx | 5 ++---
vcl/inc/listbox.hxx | 5 +----
vcl/inc/menubarvalue.hxx | 5 +----
vcl/inc/messagedialog.hxx | 5 +----
vcl/inc/opengl/win/WinDeviceInfo.hxx | 5 +----
vcl/inc/opengl/zone.hxx | 5 +----
vcl/inc/osx/osxvcltypes.h | 5 +----
vcl/inc/osx/printview.h | 5 +----
vcl/inc/osx/runinmain.hxx | 5 +----
vcl/inc/osx/saldata.hxx | 5 +----
vcl/inc/osx/salframe.h | 5 +----
vcl/inc/osx/salframeview.h | 5 +----
vcl/inc/osx/salmenu.h | 5 +----
vcl/inc/osx/salnativewidgets.h | 5 +----
vcl/inc/osx/salnsmenu.h | 5 +----
vcl/inc/osx/salnstimer.h | 5 +----
vcl/inc/osx/salobj.h | 5 +----
vcl/inc/osx/salprn.h | 5 +----
vcl/inc/osx/salsys.h | 5 +----
vcl/inc/osx/saltimer.h | 5 +----
vcl/inc/osx/svsys.h | 5 +----
vcl/inc/ppdparser.hxx | 6 ++----
vcl/inc/print.h | 5 +----
vcl/inc/print.hrc | 5 +----
vcl/inc/printaccessoryview.hrc | 5 +----
vcl/inc/printdlg.hxx | 5 +----
vcl/inc/printerinfomanager.hxx | 5 +----
vcl/inc/quartz/CGHelpers.hxx | 5 +----
vcl/inc/quartz/common.h | 5 +----
vcl/inc/quartz/salbmp.h | 5 +----
vcl/inc/quartz/salgdicommon.hxx | 5 +----
vcl/inc/quartz/salvd.h | 5 +----
vcl/inc/quartz/utils.h | 5 +----
vcl/inc/regband.hxx | 5 +----
vcl/inc/regionband.hxx | 6 ++----
vcl/inc/salbmp.hxx | 5 +----
vcl/inc/salframe.hxx | 5 +----
vcl/inc/salgdiimpl.hxx | 5 +----
vcl/inc/salgeom.hxx | 5 +----
vcl/inc/salinst.hxx | 5 +----
vcl/inc/sallayout.hxx | 5 +----
vcl/inc/salmenu.hxx | 5 +----
vcl/inc/salobj.hxx | 5 +----
vcl/inc/salprn.hxx | 5 +----
vcl/inc/salptype.hxx | 5 +----
vcl/inc/salsession.hxx | 5 +----
vcl/inc/salsys.hxx | 5 +----
vcl/inc/salusereventlist.hxx | 5 +----
vcl/inc/salvd.hxx | 5 +----
vcl/inc/salwtype.hxx | 5 +----
vcl/inc/scanlinewriter.hxx | 5 +----
vcl/inc/schedulerimpl.hxx | 5 +----
vcl/inc/scrptrun.h | 5 +----
vcl/inc/scrwnd.hxx | 5 +----
vcl/inc/sft.hxx | 5 +----
vcl/inc/skia/osx/bitmap.hxx | 5 +----
vcl/inc/skia/utils.hxx | 5 +----
vcl/inc/skia/win/gdiimpl.hxx | 5 +----
vcl/inc/skia/zone.hxx | 5 +----
vcl/inc/strings.hrc | 5 +----
vcl/inc/svimpbox.hxx | 5 +----
vcl/inc/svsys.h | 5 +----
vcl/inc/test/outputdevice.hxx | 5 +----
vcl/inc/toolbarvalue.hxx | 5 +----
vcl/inc/toolbox.h | 5 +----
vcl/inc/units.hrc | 5 +----
vcl/inc/vclpluginapi.h | 5 +----
vcl/inc/win/salids.hrc | 5 +----
vcl/inc/win/salmenu.h | 5 +----
108 files changed, 112 insertions(+), 437 deletions(-)
New commits:
commit c448bb47544968f9557f4b319c5158cd95521266
Author: Jim Chen <jim.chen.1...@gmail.com>
AuthorDate: Sun Mar 23 23:08:38 2025 -0700
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Fri Mar 28 11:59:26 2025 +0100
tdf#143148 Replace #include guards with #pragma once in vcl
Replaces include guards in headers with #pragma once directive
Change-Id: I7e4f6a84ddb9895b294016e74f55522c78c071c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183255
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index 55e028f69a1b..352050447343 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_ACCMGR_HXX
-#define INCLUDED_VCL_INC_ACCMGR_HXX
+#pragma once
#include <vector>
#include <optional>
@@ -48,6 +47,4 @@ public:
bool IsAccelKey( const vcl::KeyCode& rKeyCode );
};
-#endif // INCLUDED_VCL_INC_ACCMGR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
b/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
index c48cb7bb1610..2370ff2246cd 100644
--- a/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef VCL_INC_BITMAP_BITMAPSCALECONVOLUTIONFILTER_HXX
-#define VCL_INC_BITMAP_BITMAPSCALECONVOLUTIONFILTER_HXX
+#pragma once
#include <vcl/bitmap/BitmapFilter.hxx>
@@ -73,6 +72,4 @@ public:
};
}
-#endif // VCL_INC_BITMAPSCALECONVOLUTIONFILTER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
b/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
index 172138670795..d6c7a2097f04 100644
--- a/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
+++ b/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_BITMAP_BITMAPSCALESUPER_HXX
-#define INCLUDED_VCL_INC_BITMAP_BITMAPSCALESUPER_HXX
+#pragma once
#include <vcl/bitmap/BitmapFilter.hxx>
@@ -35,6 +34,4 @@ private:
double mrScaleY;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmap/Octree.hxx b/vcl/inc/bitmap/Octree.hxx
index 178c4eeae357..eff1d1b292e4 100644
--- a/vcl/inc/bitmap/Octree.hxx
+++ b/vcl/inc/bitmap/Octree.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OCTREE_HXX
-#define INCLUDED_VCL_INC_OCTREE_HXX
+#pragma once
#include <vcl/dllapi.h>
#include <vcl/BitmapColor.hxx>
@@ -78,6 +77,4 @@ public:
sal_uInt16 GetBestPaletteIndex(const BitmapColor& rColor);
};
-#endif // INCLUDED_VCL_INC_OCTREE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmap/ScanlineTools.hxx b/vcl/inc/bitmap/ScanlineTools.hxx
index 1b7db0eadffc..311b96cff95b 100644
--- a/vcl/inc/bitmap/ScanlineTools.hxx
+++ b/vcl/inc/bitmap/ScanlineTools.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_VCL_INC_BITMAP_SCANLINETOOLS_HXX
-#define INCLUDED_VCL_INC_BITMAP_SCANLINETOOLS_HXX
+#pragma once
#include <tools/color.hxx>
#include <vcl/BitmapPalette.hxx>
@@ -175,6 +174,4 @@ std::unique_ptr<ScanlineTransformer>
getScanlineTransformer(sal_uInt16 nBits,
}
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmap/bmpfast.hxx b/vcl/inc/bitmap/bmpfast.hxx
index 3234f7a840c1..e76dcdeb2487 100644
--- a/vcl/inc/bitmap/bmpfast.hxx
+++ b/vcl/inc/bitmap/bmpfast.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_BMPFAST_HXX
-#define INCLUDED_VCL_INC_BMPFAST_HXX
+#pragma once
#include <vcl/dllapi.h>
#include <vcl/Scanline.hxx>
@@ -46,6 +45,4 @@ bool ImplFastBitmapBlending( BitmapWriteAccess const & rDst,
bool ImplFastEraseBitmap( BitmapBuffer&, const BitmapColor& );
-#endif // INCLUDED_VCL_INC_BMPFAST_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/bitmap/impoctree.hxx b/vcl/inc/bitmap/impoctree.hxx
index 7581b910885a..2cc0e35f3131 100644
--- a/vcl/inc/bitmap/impoctree.hxx
+++ b/vcl/inc/bitmap/impoctree.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_IMPOCTREE_HXX
-#define INCLUDED_VCL_INC_IMPOCTREE_HXX
+#pragma once
#include <vcl/BitmapColor.hxx>
@@ -105,6 +104,4 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() const
std::clamp(nBlue, sal_Int16(0), sal_Int16(8160)) >> 5);
}
-#endif // INCLUDED_VCL_INC_IMPOCTREE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index f9c8a8edb894..042e207a300b 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_BRDWIN_HXX
-#define INCLUDED_VCL_INC_BRDWIN_HXX
+#pragma once
#include <vcl/notebookbar/notebookbar.hxx>
#include <vcl/window.hxx>
@@ -285,6 +284,4 @@ public:
virtual void DrawWindow(vcl::RenderContext& rRenderContext,
const Point* pOffset = nullptr) override;
};
-#endif // INCLUDED_VCL_INC_BRDWIN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/calendar.hxx b/vcl/inc/calendar.hxx
index b727039ceeb1..c8e54e66ad65 100644
--- a/vcl/inc/calendar.hxx
+++ b/vcl/inc/calendar.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_CALENDAR_HXX
-#define INCLUDED_VCL_CALENDAR_HXX
+#pragma once
#include <unotools/calendarwrapper.hxx>
@@ -223,6 +222,4 @@ public:
virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
};
-#endif // INCLUDED_VCL_CALENDAR_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index d6ac581e0aff..3c76cbf984f6 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_CANVASBITMAP_HXX
-#define INCLUDED_VCL_INC_CANVASBITMAP_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
@@ -118,6 +117,4 @@ namespace vcl::unotools
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/configsettings.hxx b/vcl/inc/configsettings.hxx
index 7daae5449482..cc1aff23ffe1 100644
--- a/vcl/inc/configsettings.hxx
+++ b/vcl/inc/configsettings.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_CONFIGSETTINGS_HXX
-#define INCLUDED_VCL_CONFIGSETTINGS_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
@@ -60,7 +59,4 @@ namespace vcl
} // namespace vcl
-
-#endif // INCLUDED_VCL_CONFIGSETTINGS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/cursor_hotspots.hxx b/vcl/inc/cursor_hotspots.hxx
index 7f356fa956dc..a896c563effb 100644
--- a/vcl/inc/cursor_hotspots.hxx
+++ b/vcl/inc/cursor_hotspots.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_CURSOR_HOTSPOTS_HXX
-#define INCLUDED_VCL_INC_CURSOR_HOTSPOTS_HXX
+#pragma once
#define help_curs_x_hot 0
#define help_curs_y_hot 0
@@ -166,6 +165,4 @@
#define fatcross_curs_x_hot 15
#define fatcross_curs_y_hot 15
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/inc/debugevent.hxx b/vcl/inc/debugevent.hxx
index 89010face23f..be93c9d88003 100644
--- a/vcl/inc/debugevent.hxx
+++ b/vcl/inc/debugevent.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_DEBUGEVENT_HXX
-#define INCLUDED_VCL_DEBUGEVENT_HXX
+#pragma once
#include <vcl/timer.hxx>
#include <sal/types.h>
@@ -30,6 +29,4 @@ class DebugEventInjector final : private Timer {
static DebugEventInjector *getCreate();
};
-#endif // INCLUDED_VCL_DEBUGEVENT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/displayconnectiondispatch.hxx
b/vcl/inc/displayconnectiondispatch.hxx
index a763ccd469c3..d535b7c48dab 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_DISPLAYCONNECTIONDISPATCH_HXX
-#define INCLUDED_VCL_INC_DISPLAYCONNECTIONDISPATCH_HXX
+#pragma once
#include <sal/config.h>
#include <com/sun/star/awt/XDisplayConnection.hpp>
@@ -56,8 +55,4 @@ public:
}
-
-
-#endif // INCLUDED_VCL_INC_DISPLAYCONNECTIONDISPATCH_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndeventdispatcher.hxx b/vcl/inc/dndeventdispatcher.hxx
index 0b3f58560282..eb413882134a 100644
--- a/vcl/inc/dndeventdispatcher.hxx
+++ b/vcl/inc/dndeventdispatcher.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_DNDEVENTDISPATCHER_HXX
-#define INCLUDED_VCL_INC_DNDEVENTDISPATCHER_HXX
+#pragma once
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
@@ -107,6 +106,4 @@ public:
virtual void SAL_CALL disposing( const css::lang::EventObject& eo )
override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dndlistenercontainer.hxx b/vcl/inc/dndlistenercontainer.hxx
index bc4109d5e42c..3bd0fdc22734 100644
--- a/vcl/inc/dndlistenercontainer.hxx
+++ b/vcl/inc/dndlistenercontainer.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_DNDLCON_HXX
-#define INCLUDED_VCL_INC_DNDLCON_HXX
+#pragma once
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
@@ -130,6 +129,4 @@ public:
virtual void SAL_CALL setDefaultActions( sal_Int8 actions ) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/driverblocklist.hxx b/vcl/inc/driverblocklist.hxx
index 4b3bc9cd502e..515972ae56f9 100644
--- a/vcl/inc/driverblocklist.hxx
+++ b/vcl/inc/driverblocklist.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_DRIVERBLOCKLIST_HXX
-#define INCLUDED_VCL_DRIVERBLOCKLIST_HXX
+#pragma once
#include <vcl/dllapi.h>
#include <xmlreader/xmlreader.hxx>
@@ -171,6 +170,4 @@ inline uint64_t OpenGLVersion(uint32_t a, uint32_t b,
uint32_t c, uint32_t d)
} // namespace
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index 4a808d29c70b..8a21ff9e0110 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_FACTORY_HXX
-#define INCLUDED_VCL_INC_FACTORY_HXX
+#pragma once
#include <sal/config.h>
@@ -52,7 +51,4 @@ css::uno::Reference<css::uno::XInterface>
DropTarget_createInstance(
}
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/fltcall.hxx b/vcl/inc/fltcall.hxx
index f10e72b0702a..e93b76567057 100644
--- a/vcl/inc/fltcall.hxx
+++ b/vcl/inc/fltcall.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_FLTCALL_HXX
-#define INCLUDED_VCL_FLTCALL_HXX
+#pragma once
class FilterConfigItem;
class SvStream;
@@ -32,6 +31,4 @@ typedef bool (*PFilterCall)(SvStream & rStream, Graphic &
rGraphic,
// pOptionsConfig can be NULL; if not, the group of the config is already
set
// and may not be changed by this filter!
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/font/OpenTypeFeatureStrings.hrc
b/vcl/inc/font/OpenTypeFeatureStrings.hrc
index 086d7d500c0e..d73727b3324c 100644
--- a/vcl/inc/font/OpenTypeFeatureStrings.hrc
+++ b/vcl/inc/font/OpenTypeFeatureStrings.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_FONT_OPENTYPEFEATRESTRINGS_HRC
-#define INCLUDED_VCL_INC_FONT_OPENTYPEFEATRESTRINGS_HRC
+#pragma once
#define NC_(Context, String) TranslateId(Context, u8##String)
@@ -99,6 +98,4 @@
#define STR_FONT_FEATURE_ID_ZERO NC_("STR_FONT_FEATURE_ID_ZERO",
"Slashed Zero")
#define STR_FONT_FEATURE_PARAM_NONE NC_("STR_FONT_FEATURE_PARAM_NONE",
"None")
-#endif // INCLUDED_VCL_INC_STRINGS_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 6d2983222bc7..4da51d702c56 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_FONTATTRIBUTES_HXX
-#define INCLUDED_VCL_INC_FONTATTRIBUTES_HXX
+#pragma once
#include <vcl/dllapi.h>
#include <rtl/ustring.hxx>
@@ -85,6 +84,4 @@ inline void FontAttributes::SetMicrosoftSymbolEncoded(const
bool bMicrosoftSymbo
mbMicrosoftSymbolEncoded = bMicrosoftSymbolEncoded;
}
-#endif // INCLUDED_VCL_INC_FONTATTRIBUTES_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index c50cc4ea2cb6..a7cc058b3e1d 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
+#pragma once
#include <sal/config.h>
@@ -70,6 +69,4 @@ public:
SAL_DLLPRIVATE virtual const basegfx::SystemDependentDataHolder*
accessSystemDependentDataHolder() const override;
};
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 1049637a5de3..9ff422f43a28 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
+#pragma once
#include <vcl/sysdata.hxx>
#include <unx/gensys.h>
@@ -59,6 +58,4 @@ public:
const std::vector< OUString >& rButtons )
override;
};
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 1c61236029dc..94f7951d6dc1 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
+#pragma once
#include <vcl/sysdata.hxx>
@@ -140,6 +139,4 @@ inline std::basic_ostream<charT, traits>&
operator<<(std::basic_ostream<charT, t
return stream;
}
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 2edd71dd78c7..c259b256628d 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
+#pragma once
#include <osl/thread.hxx>
#include <osl/conditn.hxx>
@@ -200,6 +199,4 @@ inline void SvpSalInstance::deregisterFrame( SalFrame*
pFrame )
VCL_DLLPUBLIC cairo_surface_t* get_underlying_cairo_surface(const
VirtualDevice& rDevice);
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index e1dd1e15f9e2..a05573314b7a 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
+#pragma once
#include <unx/genprn.h>
@@ -34,6 +33,4 @@ public:
SvpSalPrinter(SalInfoPrinter* pInfoPrinter);
};
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 245634d229d9..4bc796f32a60 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
-#define INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
+#pragma once
#include <salvd.hxx>
#include <basegfx/vector/b2ivector.hxx>
@@ -62,6 +61,4 @@ public:
virtual tools::Long GetHeight() const override;
};
-#endif // INCLUDED_VCL_INC_HEADLESS_SVPVD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 5a9975cee88d..72af82e27937 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_HELPWIN_HXX
-#define INCLUDED_VCL_INC_HELPWIN_HXX
+#pragma once
#include <vcl/toolkit/floatwin.hxx>
#include <vcl/timer.hxx>
@@ -81,6 +80,4 @@ void ImplDestroyHelpWindow(ImplSVHelpData& rHelpData, bool
bUpdateHideTime);
void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle,
QuickHelpFlags nStyle,
const Point& rPos, const tools::Rectangle&
rHelpArea );
-#endif // INCLUDED_VCL_INC_HELPWIN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/hyperlabel.hxx b/vcl/inc/hyperlabel.hxx
index fa69d30f83f1..0c726c531ed3 100644
--- a/vcl/inc/hyperlabel.hxx
+++ b/vcl/inc/hyperlabel.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_HYPERLABEL_HXX
-#define INCLUDED_VCL_HYPERLABEL_HXX
+
+#pragma once
#include <vcl/toolkit/fixed.hxx>
@@ -64,6 +64,4 @@ namespace vcl
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/iconview.hxx b/vcl/inc/iconview.hxx
index a0cf975377c2..e868629a1966 100644
--- a/vcl/inc/iconview.hxx
+++ b/vcl/inc/iconview.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVTOOLS_ICONVIEW_HXX
-#define INCLUDED_SVTOOLS_ICONVIEW_HXX
+#pragma once
#include <tools/json_writer.hxx>
#include <vcl/toolkit/treelistbox.hxx>
@@ -63,6 +62,4 @@ private:
void DumpEntryAndSiblings(tools::JsonWriter& rJsonWriter, SvTreeListEntry*
pEntry);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 3f6feb3f96e7..e5b73e09644d 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_IMAGE_H
-#define INCLUDED_VCL_INC_IMAGE_H
+#pragma once
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
@@ -75,6 +74,4 @@ public:
}
};
-#endif // INCLUDED_VCL_INC_IMAGE_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/imagerepository.hxx b/vcl/inc/imagerepository.hxx
index 5e1b87595b60..5e903a7378e2 100644
--- a/vcl/inc/imagerepository.hxx
+++ b/vcl/inc/imagerepository.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_IMAGEREPOSITORY_HXX
-#define INCLUDED_VCL_IMAGEREPOSITORY_HXX
+#pragma once
#include <rtl/ustring.hxx>
@@ -52,7 +51,4 @@ namespace vcl
} // namespace vcl
-
-#endif // INCLUDED_VCL_IMAGEREPOSITORY_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impdel.hxx b/vcl/inc/impdel.hxx
index 3b9dbb60a45e..a9107351cf2c 100644
--- a/vcl/inc/impdel.hxx
+++ b/vcl/inc/impdel.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_IMPDEL_HXX
-#define INCLUDED_VCL_IMPDEL_HXX
+#pragma once
#include <algorithm>
#include <vector>
@@ -82,6 +81,4 @@ inline void DeletionNotifier::notifyDelete()
} // namespace vcl
-#endif // INCLUDED_VCL_IMPDEL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
index 59f9f3baa001..b2352c48a12f 100644
--- a/vcl/inc/impfontcharmap.hxx
+++ b/vcl/inc/impfontcharmap.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_IMPFONTCHARMAP_HXX
-#define INCLUDED_VCL_INC_IMPFONTCHARMAP_HXX
+#pragma once
#include <tools/ref.hxx>
#include <vcl/dllapi.h>
@@ -51,6 +50,4 @@ private:
bool VCL_DLLPUBLIC HasMicrosoftSymbolCmap(const unsigned char* pRawData, int
nRawLength);
-#endif // INCLUDED_VCL_INC_IMPFONTCHARMAP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impglyphitem.hxx b/vcl/inc/impglyphitem.hxx
index 320adc27f667..47e972d6c26b 100644
--- a/vcl/inc/impglyphitem.hxx
+++ b/vcl/inc/impglyphitem.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_IMPGLYPHITEM_HXX
-#define INCLUDED_VCL_IMPGLYPHITEM_HXX
+#pragma once
#include <basegfx/range/b2drectangle.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -164,6 +163,4 @@ private:
SalLayoutFlags mnFlags = SalLayoutFlags::NONE;
};
-#endif // INCLUDED_VCL_IMPGLYPHITEM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index beecb233e1d9..9ca076d44376 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_IMPLIMAGETREE_HXX
-#define INCLUDED_VCL_INC_IMPLIMAGETREE_HXX
+#pragma once
#include <sal/config.h>
@@ -164,6 +163,4 @@ private:
static OUString fallbackStyle(std::u16string_view rStyle);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index aef3ea79c2d2..3c052cc76372 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_IOS_IOSINST_HXX
-#define INCLUDED_VCL_INC_IOS_IOSINST_HXX
+#pragma once
#include <premac.h>
#include <CoreGraphics/CoreGraphics.h>
@@ -59,6 +58,4 @@ public:
virtual ~SalData();
};
-#endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/jobdata.hxx b/vcl/inc/jobdata.hxx
index 46110057a888..bd1a2824c558 100644
--- a/vcl/inc/jobdata.hxx
+++ b/vcl/inc/jobdata.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_JOBDATA_HXX
-#define INCLUDED_VCL_JOBDATA_HXX
+#pragma once
#include "ppdparser.hxx"
@@ -75,7 +74,4 @@ struct VCL_DLLPUBLIC JobData
} // namespace
-
-#endif // PSPRINT_JOBDATA_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 7c0d0b55a4c3..7f2a0f38de93 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_JOBSET_H
-#define INCLUDED_VCL_INC_JOBSET_H
+#pragma once
#include <rtl/ustring.hxx>
#include <i18nutil/paper.hxx>
@@ -106,6 +105,4 @@ public:
// If paper width/height is 0, in the system-independent part it will
// automatically be computed from paper format, if the latter is not
PAPER_USER.
-#endif // INCLUDED_VCL_INC_JOBSET_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/langboost.hxx b/vcl/inc/langboost.hxx
index 77553de05c6b..9fb7dc593b5d 100644
--- a/vcl/inc/langboost.hxx
+++ b/vcl/inc/langboost.hxx
@@ -6,13 +6,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_LANGBOOST_HXX
-#define INCLUDED_VCL_INC_LANGBOOST_HXX
+
+#pragma once
namespace vcl
{
const char* getLangBoost();
}
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index b37a633cbf5b..725e0d3c7c49 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_LISTBOX_HXX
-#define INCLUDED_VCL_INC_LISTBOX_HXX
+#pragma once
#include <sal/config.h>
@@ -598,6 +597,4 @@ public:
void ImplInitDropDownButton( PushButton* pButton );
-#endif // INCLUDED_VCL_INC_LISTBOX_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/menubarvalue.hxx b/vcl/inc/menubarvalue.hxx
index 0b9f0dbbec5b..6f3f8e5e190f 100644
--- a/vcl/inc/menubarvalue.hxx
+++ b/vcl/inc/menubarvalue.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_MENUBARVALUE_HXX
-#define INCLUDED_VCL_INC_MENUBARVALUE_HXX
+#pragma once
#include <vcl/salnativewidgets.hxx>
@@ -43,6 +42,4 @@ public:
int maTopDockingAreaHeight;
};
-#endif // INCLUDED_VCL_INC_MENUBARVALUE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
index 9c265c057078..e95389f4663c 100644
--- a/vcl/inc/messagedialog.hxx
+++ b/vcl/inc/messagedialog.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
-#define INCLUDED_VCL_INC_MESSAGEDIALOG_HXX
+#pragma once
#include <vcl/toolkit/dialog.hxx>
#include <vcl/toolkit/vclmedit.hxx>
@@ -54,6 +53,4 @@ public:
VclContainer* get_message_area() const { return m_pMessageBox.get(); }
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 2f9a52596bb3..9e998b117a39 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_OPENGL_WIN_WINDEVICEINFO_HXX
-#define INCLUDED_VCL_OPENGL_WIN_WINDEVICEINFO_HXX
+#pragma once
#include <vcl/dllapi.h>
@@ -91,6 +90,4 @@ public:
}
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index f03e07ccfdf2..2bb64b728170 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_OPENGL_ZONE_H
-#define INCLUDED_VCL_INC_OPENGL_ZONE_H
+#pragma once
#include <sal/config.h>
#include <vcl/dllapi.h>
@@ -28,6 +27,4 @@ public:
static const char* name() { return "OpenGL"; }
};
-#endif // INCLUDED_VCL_INC_OPENGL_ZONE_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/osxvcltypes.h b/vcl/inc/osx/osxvcltypes.h
index bf3f4ec46f7d..5ae9aee6e5ca 100644
--- a/vcl/inc/osx/osxvcltypes.h
+++ b/vcl/inc/osx/osxvcltypes.h
@@ -17,14 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
-#define INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
+#pragma once
#include <premac.h>
#import <Cocoa/Cocoa.h>
#import <AppKit/NSEvent.h>
#include <postmac.h>
-#endif // INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/printview.h b/vcl/inc/osx/printview.h
index a2a6e5454ef2..f15ff3a97c4f 100644
--- a/vcl/inc/osx/printview.h
+++ b/vcl/inc/osx/printview.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_PRINTVIEW_H
-#define INCLUDED_VCL_INC_OSX_PRINTVIEW_H
+#pragma once
#include <premac.h>
#include <Cocoa/Cocoa.h>
@@ -58,6 +57,4 @@ struct PrintAccessoryViewState
withState: (PrintAccessoryViewState*)pState;
@end
-#endif // INCLUDED_VCL_INC_OSX_PRINTVIEW_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/runinmain.hxx b/vcl/inc/osx/runinmain.hxx
index e68bc4d35010..aa33400d6260 100644
--- a/vcl/inc/osx/runinmain.hxx
+++ b/vcl/inc/osx/runinmain.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_RUNINMAIN_HXX
-#define INCLUDED_VCL_INC_OSX_RUNINMAIN_HXX
+#pragma once
/**
* Runs a command in the main thread.
@@ -170,6 +169,4 @@ union RuninmainResult
#define OSX_SALDATA_RUNINMAIN_UNION( command, member ) \
OSX_RUNINMAIN_UNION( GetSalData()->mpInstance, command, member )
-#endif // INCLUDED_VCL_INC_OSX_RUNINMAIN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx
index ba4d6e8c856b..66c6b3f11cd7 100644
--- a/vcl/inc/osx/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALDATA_HXX
-#define INCLUDED_VCL_INC_OSX_SALDATA_HXX
+#pragma once
#include <config_features.h>
@@ -104,6 +103,4 @@ public:
bool ImplSalYieldMutexTryToAcquire();
void ImplSalYieldMutexRelease();
-#endif // INCLUDED_VCL_INC_OSX_SALDATA_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index beb5bff493fe..5244e1ebab38 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALFRAME_H
-#define INCLUDED_VCL_INC_OSX_SALFRAME_H
+#pragma once
#include <premac.h>
#include <IOKit/pwr_mgt/IOPMLib.h>
@@ -244,6 +243,4 @@ inline bool AquaSalFrame::isAlive( const AquaSalFrame*
pFrame )
return pInst && pInst->isFrameAlive( pFrame );
}
-#endif // INCLUDED_VCL_INC_OSX_SALFRAME_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h
index 8b141f7aafe5..db53b2195dee 100644
--- a/vcl/inc/osx/salframeview.h
+++ b/vcl/inc/osx/salframeview.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
-#define INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
+#pragma once
#include <osx/a11ywrapper.h>
@@ -284,6 +283,4 @@ enum class SalEvent;
-(void)dealloc;
@end
-#endif // INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index e750f1fd1596..8d41715564cc 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALMENU_H
-#define INCLUDED_VCL_INC_OSX_SALMENU_H
+#pragma once
#include <premac.h>
#include <Cocoa/Cocoa.h>
@@ -106,6 +105,4 @@ public:
NSMenuItem* mpMenuItem; // The NSMenuItem
};
-#endif // INCLUDED_VCL_INC_OSX_SALMENU_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salnativewidgets.h b/vcl/inc/osx/salnativewidgets.h
index 86675e0623d6..5c36ad8c8b08 100644
--- a/vcl/inc/osx/salnativewidgets.h
+++ b/vcl/inc/osx/salnativewidgets.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
-#define INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
+#pragma once
#define TAB_HEIGHT 20 // height of tab header in pixels
#define TAB_TEXT_MARGIN 12 // left/right margin of text within tab
headers
@@ -64,6 +63,4 @@
#define SPINBOX_OFFSET 1 // left offset for alignment with editboxes,
comboboxes, and listboxes
-#endif // INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salnsmenu.h b/vcl/inc/osx/salnsmenu.h
index d6b065a7706e..a6dac9f22e4f 100644
--- a/vcl/inc/osx/salnsmenu.h
+++ b/vcl/inc/osx/salnsmenu.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALNSMENU_H
-#define INCLUDED_VCL_INC_OSX_SALNSMENU_H
+#pragma once
class AquaSalMenu;
class AquaSalMenuItem;
@@ -62,6 +61,4 @@ class AquaSalMenuItem;
- (BOOL)performKeyEquivalent:(NSEvent*)pEvent;
@end
-#endif // INCLUDED_VCL_INC_OSX_SALNSMENU_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salnstimer.h b/vcl/inc/osx/salnstimer.h
index 5c831cdf45fe..d342fa531943 100644
--- a/vcl/inc/osx/salnstimer.h
+++ b/vcl/inc/osx/salnstimer.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALNSTIMER_H
-#define INCLUDED_VCL_INC_OSX_SALNSTIMER_H
+#pragma once
#include <premac.h>
#include <Cocoa/Cocoa.h>
@@ -30,6 +29,4 @@
- (void)timerElapsed:(NSTimer*)pTimer;
@end
-#endif // INCLUDED_VCL_INC_OSX_SALNSTIMER_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h
index 0fc41c02d4c9..1cb0f9f4d4a3 100644
--- a/vcl/inc/osx/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALOBJ_H
-#define INCLUDED_VCL_INC_OSX_SALOBJ_H
+#pragma once
#include <sal/config.h>
@@ -66,6 +65,4 @@ public:
virtual const SystemEnvData& GetSystemData() const override;
};
-#endif // INCLUDED_VCL_INC_OSX_SALOBJ_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h
index cd262795178e..24df3f172daa 100644
--- a/vcl/inc/osx/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALPRN_H
-#define INCLUDED_VCL_INC_OSX_SALPRN_H
+#pragma once
#include <sal/config.h>
@@ -155,6 +154,4 @@ inline int PtTo10Mu( double nPoints ) { return
static_cast<int>((nPoints*fPtTo10
inline double TenMuToPt( double nUnits ) { return
floor((nUnits/fPtTo100thMM)+0.5); }
-#endif // INCLUDED_VCL_INC_OSX_SALPRN_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/salsys.h b/vcl/inc/osx/salsys.h
index 4b8b077088c7..023b4cc18aac 100644
--- a/vcl/inc/osx/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALSYS_H
-#define INCLUDED_VCL_INC_OSX_SALSYS_H
+#pragma once
#include <salsys.hxx>
@@ -39,6 +38,4 @@ public:
const OUString& rMessage) override;
};
-#endif // INCLUDED_VCL_INC_OSX_SALSYS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/saltimer.h b/vcl/inc/osx/saltimer.h
index cdde3ec8471d..3f25ac11969d 100644
--- a/vcl/inc/osx/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SALTIMER_H
-#define INCLUDED_VCL_INC_OSX_SALTIMER_H
+#pragma once
#include <premac.h>
#include <Cocoa/Cocoa.h>
@@ -70,6 +69,4 @@ inline bool AquaSalTimer::IsDirectTimeout() const
return m_bDirectTimeout;
}
-#endif // INCLUDED_VCL_INC_OSX_SALTIMER_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/osx/svsys.h b/vcl/inc/osx/svsys.h
index 9fcabe074f70..f55c1e44d1b4 100644
--- a/vcl/inc/osx/svsys.h
+++ b/vcl/inc/osx/svsys.h
@@ -17,13 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_OSX_SVSYS_H
-#define INCLUDED_VCL_INC_OSX_SVSYS_H
+#pragma once
#include <premac.h>
#include <Cocoa/Cocoa.h>
#include <postmac.h>
-#endif // INCLUDED_VCL_INC_OSX_SVSYS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ppdparser.hxx b/vcl/inc/ppdparser.hxx
index f59bb41c88b5..5ae25d4afa9e 100644
--- a/vcl/inc/ppdparser.hxx
+++ b/vcl/inc/ppdparser.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_PPDPARSER_HXX
-#define INCLUDED_VCL_PPDPARSER_HXX
+
+#pragma once
#include <sal/config.h>
@@ -268,6 +268,4 @@ public:
} // namespace
-#endif // INCLUDED_VCL_PPDPARSER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index dc61c9cd9607..b16e17f45fa8 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_PRINT_H
-#define INCLUDED_VCL_INC_PRINT_H
+#pragma once
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
@@ -68,6 +67,4 @@ void Add(
std::unique_ptr<SalPrinterQueueInfo> pData );
void ImplDeletePrnQueueList();
void ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
-#endif // INCLUDED_VCL_INC_PRINT_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
index 661e881690b3..f581c6269a49 100644
--- a/vcl/inc/print.hrc
+++ b/vcl/inc/print.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_PRINT_HRC
-#define INCLUDED_VCL_INC_PRINT_HRC
+#pragma once
#include <unotools/resmgr.hxx>
@@ -119,6 +118,4 @@ const TranslateId RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "On-screen Show (16:10)")
};
-#endif // INCLUDED_VCL_INC_PRINT_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printaccessoryview.hrc b/vcl/inc/printaccessoryview.hrc
index 9d94654b4c7a..33c877cd77b7 100644
--- a/vcl/inc/printaccessoryview.hrc
+++ b/vcl/inc/printaccessoryview.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
-#define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
+#pragma once
#include <unotools/resmgr.hxx>
@@ -33,6 +32,4 @@ const TranslateId SV_PRINT_NATIVE_STRINGS[] =
NC_("SV_PRINT_NATIVE_STRINGS", "Print selection only")
};
-#endif // INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 26d5ebb2777d..624ab74cafe1 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef VCL_INC_NEWPRINTDLG_HXX
-#define VCL_INC_NEWPRINTDLG_HXX
+#pragma once
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
@@ -272,6 +271,4 @@ namespace vcl
};
}
-#endif // VCL_INC_NEWPRINTDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 67dd8e59b2e0..1a2bf828eec8 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_PRINTERINFOMANAGER_HXX
-#define INCLUDED_VCL_PRINTERINFOMANAGER_HXX
+#pragma once
#include <memory>
#include <vector>
@@ -163,6 +162,4 @@ public:
} // namespace
-#endif // INCLUDED_VCL_PRINTERINFOMANAGER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/CGHelpers.hxx b/vcl/inc/quartz/CGHelpers.hxx
index a43b3e975185..35d7e8e774ef 100644
--- a/vcl/inc/quartz/CGHelpers.hxx
+++ b/vcl/inc/quartz/CGHelpers.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_VCL_INC_QUARTZ_CGHELPER_HXX
-#define INCLUDED_VCL_INC_QUARTZ_CGHELPER_HXX
+#pragma once
#include <premac.h>
#include <CoreGraphics/CoreGraphics.h>
@@ -100,6 +99,4 @@ public:
void restoreState() { CGContextRestoreGState(mpContext); }
};
-#endif // INCLUDED_VCL_INC_QUARTZ_CGHELPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/common.h b/vcl/inc/quartz/common.h
index 851fa5d7a727..c57c31cf4983 100644
--- a/vcl/inc/quartz/common.h
+++ b/vcl/inc/quartz/common.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_QUARTZ_COMMON_H
-#define INCLUDED_VCL_INC_QUARTZ_COMMON_H
+#pragma once
#include <iostream>
@@ -36,6 +35,4 @@
std::ostream &operator <<(std::ostream& s, CTFontRef pFont);
-#endif // INCLUDED_VCL_INC_QUARTZ_COMMON_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 8f4e6a34ee1c..1ab59403cdd3 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_QUARTZ_SALBMP_H
-#define INCLUDED_VCL_INC_QUARTZ_SALBMP_H
+#pragma once
#include <tools/gen.hxx>
@@ -100,6 +99,4 @@ public:
void doDestroy();
};
-#endif // INCLUDED_VCL_INC_QUARTZ_SALBMP_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salgdicommon.hxx b/vcl/inc/quartz/salgdicommon.hxx
index 71c40acdfab6..3cd0845b0671 100644
--- a/vcl/inc/quartz/salgdicommon.hxx
+++ b/vcl/inc/quartz/salgdicommon.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
-#define INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
+#pragma once
#include <iostream>
@@ -106,6 +105,4 @@ private:
bool m_bIsEnabled;
};
-#endif // INCLUDED_VCL_INC_QUARTZ_SALGDICOMMON_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index db953d1ec295..a489dc9662fa 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_QUARTZ_SALVD_H
-#define INCLUDED_VCL_INC_QUARTZ_SALVD_H
+#pragma once
#include <premac.h>
#ifdef MACOSX
@@ -71,6 +70,4 @@ public:
}
};
-#endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/utils.h b/vcl/inc/quartz/utils.h
index 759e47f72f2b..37dd0d2113bd 100644
--- a/vcl/inc/quartz/utils.h
+++ b/vcl/inc/quartz/utils.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_QUARTZ_UTILS_H
-#define INCLUDED_VCL_INC_QUARTZ_UTILS_H
+#pragma once
#include <iostream>
@@ -48,6 +47,4 @@ std::ostream &operator <<(std::ostream& s, CGColorRef pSize);
std::ostream &operator <<(std::ostream& s, const CGAffineTransform &aXform);
std::ostream &operator <<(std::ostream& s, CGColorSpaceRef cs);
-#endif // INCLUDED_VCL_INC_QUARTZ_UTILS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx
index 33cedcd309e8..dd412b612e5c 100644
--- a/vcl/inc/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_REGBAND_HXX
-#define INCLUDED_VCL_INC_REGBAND_HXX
+#pragma once
#include <tools/long.hxx>
@@ -126,6 +125,4 @@ public:
ImplRegionBand* SplitBand (const sal_Int32 nY);
};
-#endif // INCLUDED_VCL_INC_REGBAND_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index c25b5dd648eb..9b395a8bdb37 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_REGIONBAND_HXX
-#define INCLUDED_VCL_INC_REGIONBAND_HXX
+
+#pragma once
#include <vcl/region.hxx>
@@ -78,6 +78,4 @@ public:
void GetRegionRectangles(RectangleVector& rTarget) const;
};
-#endif // INCLUDED_VCL_INC_REGIONBAND_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 7d4fceb4397e..b948f4e38c52 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALBMP_HXX
-#define INCLUDED_VCL_INC_SALBMP_HXX
+#pragma once
#include <tools/gen.hxx>
#include <tools/solar.h>
@@ -194,6 +193,4 @@ private:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 3d83d861e069..9e9b50f80350 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALFRAME_HXX
-#define INCLUDED_VCL_INC_SALFRAME_HXX
+#pragma once
#include "impdel.hxx"
#include "salwtype.hxx"
@@ -320,6 +319,4 @@ public:
virtual void SetTaskBarState(VclTaskBarStates /*eTaskBarState*/) {}
};
-#endif // INCLUDED_VCL_INC_SALFRAME_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index 4d76d9a41446..6610bddc1be4 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALGDIIMPL_HXX
-#define INCLUDED_VCL_INC_SALGDIIMPL_HXX
+#pragma once
#include <vcl/dllapi.h>
@@ -221,6 +220,4 @@ public:
virtual bool supportsOperation(OutDevSupportType eType) const = 0;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salgeom.hxx b/vcl/inc/salgeom.hxx
index 418b1cf37549..5a9cf322c813 100644
--- a/vcl/inc/salgeom.hxx
+++ b/vcl/inc/salgeom.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALGEOM_HXX
-#define INCLUDED_VCL_INC_SALGEOM_HXX
+#pragma once
#include <iostream>
@@ -85,6 +84,4 @@ public:
virtual bool IsOffScreen() const = 0;
};
-#endif // INCLUDED_VCL_INC_SALGEOM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index ee67654830d3..5ad28f71c360 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALINST_HXX
-#define INCLUDED_VCL_INC_SALINST_HXX
+#pragma once
#include <sal/types.h>
#include <rtl/ref.hxx>
@@ -231,6 +230,4 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore );
const OUString& SalGetDesktopEnvironment();
-#endif // INCLUDED_VCL_INC_SALINST_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index a8c0de8438c2..785bda76f4b9 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALLAYOUT_HXX
-#define INCLUDED_VCL_INC_SALLAYOUT_HXX
+#pragma once
#include <sal/config.h>
@@ -176,6 +175,4 @@ private:
bool m_bHasFontKashidaPositions = false;
};
-#endif // INCLUDED_VCL_INC_SALLAYOUT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
index 7ecd220209bb..8f0d44a04781 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALMENU_HXX
-#define INCLUDED_VCL_INC_SALMENU_HXX
+#pragma once
#include <utility>
#include <vcl/menu.hxx>
@@ -95,6 +94,4 @@ public:
virtual int GetMenuBarHeight() const;
};
-#endif // INCLUDED_VCL_INC_SALMENU_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index c736957d3eeb..ffa5d7f4e34e 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALOBJ_HXX
-#define INCLUDED_VCL_INC_SALOBJ_HXX
+#pragma once
#include <vcl/dllapi.h>
#include <vcl/syschild.hxx>
@@ -74,6 +73,4 @@ public:
{ return m_bEraseBackground; }
};
-#endif // INCLUDED_VCL_INC_SALOBJ_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 05dca2fcabec..d6778be6d1ef 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALPRN_HXX
-#define INCLUDED_VCL_INC_SALPRN_HXX
+#pragma once
#include <i18nutil/paper.hxx>
#include <rtl/ustring.hxx>
@@ -125,6 +124,4 @@ public:
};
-#endif // INCLUDED_VCL_INC_SALPRN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx
index 32405aaf2484..36c8f688014e 100644
--- a/vcl/inc/salptype.hxx
+++ b/vcl/inc/salptype.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALPTYPE_HXX
-#define INCLUDED_VCL_INC_SALPTYPE_HXX
+#pragma once
#include <sal/config.h>
@@ -48,6 +47,4 @@ enum class SalPrinterError {
class SalPrinter;
typedef long (*SALPRNABORTPROC)( void* pInst, SalPrinter* pPrinter );
-#endif // INCLUDED_VCL_INC_SALPTYPE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salsession.hxx b/vcl/inc/salsession.hxx
index fb9763bb6882..26814467dea8 100644
--- a/vcl/inc/salsession.hxx
+++ b/vcl/inc/salsession.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALSESSION_HXX
-#define INCLUDED_VCL_INC_SALSESSION_HXX
+#pragma once
#include <vcl/dllapi.h>
@@ -108,6 +107,4 @@ public:
virtual bool cancelShutdown() = 0;
};
-#endif // INCLUDED_VCL_INC_SALSESSION_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index d7cf10edb149..f473c58418a4 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALSYS_HXX
-#define INCLUDED_VCL_INC_SALSYS_HXX
+#pragma once
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
@@ -78,6 +77,4 @@ VCL_DLLPUBLIC SalSystem* ImplGetSalSystem();
#define VIRTUAL_DESKTOP_WIDTH 1024
#define VIRTUAL_DESKTOP_HEIGHT 768
-#endif // INCLUDED_VCL_INC_SALSYS_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salusereventlist.hxx b/vcl/inc/salusereventlist.hxx
index 864802c50a0b..f4d26a75b412 100644
--- a/vcl/inc/salusereventlist.hxx
+++ b/vcl/inc/salusereventlist.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALUSEREVENTLIST_HXX
-#define INCLUDED_VCL_INC_SALUSEREVENTLIST_HXX
+#pragma once
#include <sal/config.h>
#include <vcl/dllapi.h>
@@ -123,6 +122,4 @@ inline const SalFrameSet& SalUserEventList::getFrames()
const
return m_aFrames;
}
-#endif // INCLUDED_VCL_INC_SALUSEREVENTLIST_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index daa790bc482e..1f6bb9c201bd 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALVD_HXX
-#define INCLUDED_VCL_INC_SALVD_HXX
+#pragma once
#include "salgeom.hxx"
@@ -53,6 +52,4 @@ public:
}
};
-#endif // INCLUDED_VCL_INC_SALVD_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index d197f17fe47a..8a61dd73562c 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SALWTYPE_HXX
-#define INCLUDED_VCL_INC_SALWTYPE_HXX
+#pragma once
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
@@ -282,6 +281,4 @@ struct SalGestureRotateEvent
typedef void (*SALTIMERPROC)();
-#endif // INCLUDED_VCL_INC_SALWTYPE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/scanlinewriter.hxx b/vcl/inc/scanlinewriter.hxx
index 87a7827b7a47..1e797a87c51c 100644
--- a/vcl/inc/scanlinewriter.hxx
+++ b/vcl/inc/scanlinewriter.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SCANLINEWRITER_HXX
-#define INCLUDED_VCL_INC_SCANLINEWRITER_HXX
+#pragma once
#include <tools/long.hxx>
#include <vcl/BitmapPalette.hxx>
@@ -86,6 +85,4 @@ public:
} // namespace vcl
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/schedulerimpl.hxx b/vcl/inc/schedulerimpl.hxx
index e7968c8f50e3..3589aa5d6ff6 100644
--- a/vcl/inc/schedulerimpl.hxx
+++ b/vcl/inc/schedulerimpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SCHEDULERIMPL_HXX
-#define INCLUDED_VCL_INC_SCHEDULERIMPL_HXX
+#pragma once
#include <vcl/scheduler.hxx>
#include <vcl/task.hxx>
@@ -63,6 +62,4 @@ public:
}
};
-#endif // INCLUDED_VCL_INC_SCHEDULERIMPL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
index 09a5abc28478..96fe5517f1a1 100644
--- a/vcl/inc/scrptrun.h
+++ b/vcl/inc/scrptrun.h
@@ -34,8 +34,7 @@
* created by: Eric R. Mader
*/
-#ifndef INCLUDED_VCL_INC_SCRPTRUN_H
-#define INCLUDED_VCL_INC_SCRPTRUN_H
+#pragma once
#include <config_options.h>
#include <sal/config.h>
@@ -150,5 +149,3 @@ inline void ScriptRun::reset(const UChar chars[], int32_t
start, int32_t length)
reset(start, length);
}
}
-
-#endif
diff --git a/vcl/inc/scrwnd.hxx b/vcl/inc/scrwnd.hxx
index 2f57b31d384e..358b89145eb5 100644
--- a/vcl/inc/scrwnd.hxx
+++ b/vcl/inc/scrwnd.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SCRWND_HXX
-#define INCLUDED_VCL_INC_SCRWND_HXX
+#pragma once
#include <vcl/toolkit/floatwin.hxx>
#include <vcl/bitmap.hxx>
@@ -79,6 +78,4 @@ public:
void ImplSetWheelMode( WheelMode nWheelMode );
};
-#endif // INCLUDED_VCL_INC_SCRWND_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index d262a0787ab6..0423c64af2af 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -37,8 +37,7 @@
*
*/
-#ifndef INCLUDED_VCL_INC_SFT_HXX
-#define INCLUDED_VCL_INC_SFT_HXX
+#pragma once
#include <config_options.h>
#include <rtl/ustring.hxx>
@@ -721,6 +720,4 @@ const sal_uInt8* TrueTypeFont::table(sal_uInt32 ord,
sal_uInt32& size) const
} // namespace vcl
-#endif // INCLUDED_VCL_INC_SFT_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/skia/osx/bitmap.hxx b/vcl/inc/skia/osx/bitmap.hxx
index 0c0b1ee09be3..dc6ed44c58a8 100644
--- a/vcl/inc/skia/osx/bitmap.hxx
+++ b/vcl/inc/skia/osx/bitmap.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_SKIA_OSX_BITMAP_HXX
-#define INCLUDED_VCL_INC_SKIA_OSX_BITMAP_HXX
+#pragma once
#include <vcl/dllapi.h>
@@ -21,6 +20,4 @@ namespace SkiaHelper
VCL_PLUGIN_PUBLIC CGImageRef createCGImage(const Image& rImage);
};
-#endif // INCLUDED_VCL_INC_SKIA_OSX_BITMAP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx
index 08d3ad4da44e..c1db9814692b 100644
--- a/vcl/inc/skia/utils.hxx
+++ b/vcl/inc/skia/utils.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SKIA_UTILS_H
-#define INCLUDED_VCL_INC_SKIA_UTILS_H
+#pragma once
#include <vcl/skia/SkiaHelper.hxx>
@@ -357,6 +356,4 @@ inline std::basic_ostream<charT, traits>&
operator<<(std::basic_ostream<charT, t
return stream << *image;
}
-#endif // INCLUDED_VCL_INC_SKIA_UTILS_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index b37c29198ca8..d8428d395029 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_SKIA_WIN_GDIIMPL_HXX
-#define INCLUDED_VCL_INC_SKIA_WIN_GDIIMPL_HXX
+#pragma once
#include <memory>
#include <systools/win32/comtools.hxx>
@@ -84,6 +83,4 @@ public:
static SkiaControlCacheType& get();
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/skia/zone.hxx b/vcl/inc/skia/zone.hxx
index 73fa477d5249..7e89ec9230fc 100644
--- a/vcl/inc/skia/zone.hxx
+++ b/vcl/inc/skia/zone.hxx
@@ -7,8 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_SKIA_ZONE_H
-#define INCLUDED_VCL_INC_SKIA_ZONE_H
+#pragma once
#include <comphelper/crashzone.hxx>
@@ -29,6 +28,4 @@ private:
SolarMutexGuard g;
};
-#endif // INCLUDED_VCL_INC_SKIA_ZONE_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index c4f173fc0f40..d8363504fb73 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_STRINGS_HRC
-#define INCLUDED_VCL_INC_STRINGS_HRC
+#pragma once
#define NC_(Context, String) TranslateId(Context, u8##String)
@@ -136,6 +135,4 @@
#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL
NC_("RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL", "Horizontal scroll bar")
#define RID_STR_ACC_PANEL_DESCRIPTION
NC_("RID_STR_ACC_PANEL_DESCRIPTION", "Please press enter to go into child
control for more operations")
-#endif // INCLUDED_VCL_INC_STRINGS_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index 1efc174090bb..77f0a66d27df 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
-#define INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
+#pragma once
#include <vcl/seleng.hxx>
#include <vcl/idle.hxx>
@@ -379,6 +378,4 @@ inline void SvImpLBox::TreeInserted( SvTreeListEntry*
pInsTree )
EntryInserted( pInsTree );
}
-#endif // INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 3277c18cf1a2..0bd01b66ca0c 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SVSYS_H
-#define INCLUDED_VCL_INC_SVSYS_H
+#pragma once
#include <config_features.h>
@@ -34,6 +33,4 @@
#include "unx/svsys.h"
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx
index 8412dbaf8a7b..15da4b10c778 100644
--- a/vcl/inc/test/outputdevice.hxx
+++ b/vcl/inc/test/outputdevice.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_VCL_OUTDEVTESTS_HXX
-#define INCLUDED_VCL_OUTDEVTESTS_HXX
+#pragma once
#include <vcl/virdev.hxx>
#include <vcl/test/TestResult.hxx>
@@ -311,6 +310,4 @@ public:
} // end namespace vcl::test
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/toolbarvalue.hxx b/vcl/inc/toolbarvalue.hxx
index b2c2d6dcb162..91f03d6ffac1 100644
--- a/vcl/inc/toolbarvalue.hxx
+++ b/vcl/inc/toolbarvalue.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_TOOLBARVALUE_HXX
-#define INCLUDED_VCL_INC_TOOLBARVALUE_HXX
+#pragma once
#include <tools/gen.hxx>
#include <vcl/salnativewidgets.hxx>
@@ -47,6 +46,4 @@ public:
bool mbIsTopDockingArea;
};
-#endif // INCLUDED_VCL_INC_TOOLBARVALUE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 3510889d42cb..c995c6a4107b 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_TOOLBOX_H
-#define INCLUDED_VCL_INC_TOOLBOX_H
+#pragma once
#include <vcl/ctrl.hxx>
#include <vcl/toolbox.hxx>
@@ -156,6 +155,4 @@ struct ImplToolBoxPrivateData
mbDropDownByKeyboard:1; // tells whether a dropdown was started by
key input
};
-#endif // INCLUDED_VCL_INC_TOOLBOX_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/units.hrc b/vcl/inc/units.hrc
index 516cc12477d6..239b031aeec1 100644
--- a/vcl/inc/units.hrc
+++ b/vcl/inc/units.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_UNITS_HRC
-#define INCLUDED_VCL_INC_UNITS_HRC
+#pragma once
#include <tools/fldunit.hxx>
#include <unotools/resmgr.hxx>
@@ -64,6 +63,4 @@ std::pair<TranslateId, FieldUnit> SV_FUNIT_STRINGS[] =
{ NC_("SV_FUNIT_STRINGS", "ic"), FieldUnit::FONT_CJK_ADVANCE }
};
-#endif // INCLUDED_VCL_INC_UNITS_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h
index 88545ba9cef3..51376804877a 100644
--- a/vcl/inc/vclpluginapi.h
+++ b/vcl/inc/vclpluginapi.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_VCLPLUGINAPI_H
-#define INCLUDED_VCL_INC_VCLPLUGINAPI_H
+#pragma once
#include <sal/config.h>
#include <sal/types.h>
@@ -65,6 +64,4 @@
#define VCLPLUG_WIN_PUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index 7212ee902295..06e0ac226bb9 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALIDS_HRC
-#define INCLUDED_VCL_INC_WIN_SALIDS_HRC
+#pragma once
// Cursor
#define SAL_RESID_POINTER_NULL 10000
@@ -89,6 +88,4 @@
#define SAL_RESID_ICON_DEFAULT 1
-#endif // INCLUDED_VCL_INC_WIN_SALIDS_HRC
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h
index 93f2610867d7..9ac9b76103d8 100644
--- a/vcl/inc/win/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_WIN_SALMENU_H
-#define INCLUDED_VCL_INC_WIN_SALMENU_H
+#pragma once
#include <vcl/bitmap.hxx>
#include <salmenu.hxx>
@@ -63,6 +62,4 @@ public:
WinSalMenu* mpSalMenu; // the menu where this item is inserted
};
-#endif // INCLUDED_VCL_INC_WIN_SALMENU_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
