vcl/inc/skia/gdiimpl.hxx | 5 +----
vcl/inc/skia/salbmp.hxx | 5 +----
vcl/inc/strhelper.hxx | 5 +----
vcl/inc/strings.hxx | 5 +----
xmloff/source/chart/ColorPropertySet.hxx | 6 ++----
5 files changed, 6 insertions(+), 20 deletions(-)
New commits:
commit 3d8e32a195203e4b540274b9024ced2bc364afb0
Author: anish.deshpande <anishmdeshpa...@gmail.com>
AuthorDate: Thu Feb 22 14:56:47 2024 +0530
Commit: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Mon Feb 26 06:45:07 2024 +0100
tdf#143148 Use pragma once instead of include guards in vcl and xmloff
Change-Id: I317da0a6f626e8ddb3f090099347b130e99ff2a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163856
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index b879872a8bca..71f5cce8aae6 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_SKIA_GDIIMPL_HXX
-#define INCLUDED_VCL_SKIA_GDIIMPL_HXX
+#pragma once
#include <vcl/dllapi.h>
@@ -436,6 +435,4 @@ inline SkPaint
SkiaSalGraphicsImpl::makePixelPaint(std::optional<Color> color) c
return paint;
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index c42aa30f4654..639436346d61 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_INC_SKIA_SALBMP_H
-#define INCLUDED_VCL_INC_SKIA_SALBMP_H
+#pragma once
#include <salbmp.hxx>
#include <vcl/bitmap.hxx>
@@ -226,6 +225,4 @@ private:
#endif
};
-#endif // INCLUDED_VCL_INC_SKIA_SALBMP_H
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/strhelper.hxx b/vcl/inc/strhelper.hxx
index 7793418334e1..e8f085864139 100644
--- a/vcl/inc/strhelper.hxx
+++ b/vcl/inc/strhelper.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_STRHELPER_HXX
-#define INCLUDED_VCL_STRHELPER_HXX
+#pragma once
#include <rtl/math.hxx>
#include <rtl/ustring.hxx>
@@ -49,6 +48,4 @@ namespace psp
} // namespace
-#endif // INCLUDED_VCL_STRHELPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/strings.hxx b/vcl/inc/strings.hxx
index 45e9b2af4310..b4cf785ffc49 100644
--- a/vcl/inc/strings.hxx
+++ b/vcl/inc/strings.hxx
@@ -7,11 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_VCL_INC_STRINGS_HXX
-#define INCLUDED_VCL_INC_STRINGS_HXX
+#pragma once
#define SV_APP_VCLBACKEND "VCL: "
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/xmloff/source/chart/ColorPropertySet.hxx
b/xmloff/source/chart/ColorPropertySet.hxx
index d73bf48be0d9..e623c39afde8 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.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 XMLOFF_COLORPROPERTYSET_HXX
-#define XMLOFF_COLORPROPERTYSET_HXX
+
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <tools/color.hxx>
@@ -76,7 +76,5 @@ private:
} // namespace xmloff::chart
-// XMLOFF_COLORPROPERTYSET_HXX
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
