include/basegfx/basegfxdllapi.h | 6 +----- include/canvas/canvastoolsdllapi.h | 6 +----- include/comphelper/accessibleeventnotifier.hxx | 6 +----- include/comphelper/accessiblekeybindinghelper.hxx | 7 +------ include/comphelper/accessibleselectionhelper.hxx | 6 +----- include/comphelper/accessibletexthelper.hxx | 6 +----- include/i18nutil/casefolding.hxx | 5 +---- include/i18nutil/i18nutildllapi.h | 6 +----- include/i18nutil/oneToOneMapping.hxx | 5 +---- include/i18nutil/paper.hxx | 6 +----- include/i18nutil/scripttypedetector.hxx | 5 +---- include/i18nutil/searchopt.hxx | 5 +---- include/i18nutil/transliteration.hxx | 6 +----- include/i18nutil/unicode.hxx | 5 +---- include/i18nutil/widthfolding.hxx | 5 +---- 15 files changed, 15 insertions(+), 70 deletions(-)
New commits: commit 4ee8477bdda30bc77423d72e97118530f0f1d37e Author: Ethan Garcia <[email protected]> AuthorDate: Mon Mar 9 20:54:37 2026 -0700 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Tue Mar 10 14:16:53 2026 +0100 tdf#143148 use pragma once in comphelper, basegfx, canvas Change-Id: I45e21da3976cf215fe17c565633928281fdbccb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201314 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/include/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h index b1ef1709bc5e..20ea5c55c5e8 100644 --- a/include/basegfx/basegfxdllapi.h +++ b/include/basegfx/basegfxdllapi.h @@ -16,9 +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_BASEGFX_BASEGFXDLLAPI_H -#define INCLUDED_BASEGFX_BASEGFXDLLAPI_H +#pragma once #include <sal/types.h> @@ -38,6 +36,4 @@ #endif /*BASEGFX_STATICLIBRARY*/ -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/canvas/canvastoolsdllapi.h b/include/canvas/canvastoolsdllapi.h index a3748371a9e2..7f1ace67d633 100644 --- a/include/canvas/canvastoolsdllapi.h +++ b/include/canvas/canvastoolsdllapi.h @@ -16,9 +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_CANVAS_CANVASTOOLSDLLAPI_H -#define INCLUDED_CANVAS_CANVASTOOLSDLLAPI_H +#pragma once #include <sal/config.h> #include <sal/types.h> @@ -30,6 +28,4 @@ #endif #define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessibleeventnotifier.hxx b/include/comphelper/accessibleeventnotifier.hxx index 77be52fb90d9..a5fa6f177638 100644 --- a/include/comphelper/accessibleeventnotifier.hxx +++ b/include/comphelper/accessibleeventnotifier.hxx @@ -16,9 +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_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX -#define INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX +#pragma once #include <comphelper/comphelperdllapi.h> @@ -114,6 +112,4 @@ public: } // namespace comphelper -#endif // INCLUDED_COMPHELPER_ACCESSIBLEEVENTNOTIFIER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx index c1b8782be0e4..141388aeaf8b 100644 --- a/include/comphelper/accessiblekeybindinghelper.hxx +++ b/include/comphelper/accessiblekeybindinghelper.hxx @@ -16,9 +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_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX -#define INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX +#pragma once #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp> #include <comphelper/comphelperdllapi.h> @@ -63,7 +61,4 @@ namespace comphelper } // namespace comphelper - -#endif // INCLUDED_COMPHELPER_ACCESSIBLEKEYBINDINGHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 4bcc235693ae..56e277efc0c0 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -16,9 +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_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX -#define INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX +#pragma once #include <config_options.h> #include <comphelper/OAccessible.hxx> @@ -117,6 +115,4 @@ public: } // namespace comphelper -#endif // INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 509313b2a860..677b2d14a4a1 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -16,9 +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_COMPHELPER_ACCESSIBLETEXTHELPER_HXX -#define INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX +#pragma once #include <config_options.h> #include <com/sun/star/accessibility/XAccessibleText.hpp> @@ -169,6 +167,4 @@ namespace comphelper // setSelection // copyText -#endif // INCLUDED_COMPHELPER_ACCESSIBLETEXTHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 8c4accaaf17aed7c720d55553a46036efd1c5b14 Author: Ethan Garcia <[email protected]> AuthorDate: Mon Mar 9 20:36:11 2026 -0700 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Tue Mar 10 14:16:43 2026 +0100 tdf#143148 replace include guards with pragma once in include/i18nutil Change-Id: Ib1322f685c5cdb3dcf28d23d594f6f4542f5f8d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201313 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx index b15a51ae8d04..9e9db6276523 100644 --- a/include/i18nutil/casefolding.hxx +++ b/include/i18nutil/casefolding.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_I18NUTIL_CASEFOLDING_HXX -#define INCLUDED_I18NUTIL_CASEFOLDING_HXX +#pragma once #include <sal/types.h> #include <i18nutil/i18nutildllapi.h> @@ -86,6 +85,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/i18nutildllapi.h b/include/i18nutil/i18nutildllapi.h index 9797e87a3613..99b3e20092f1 100644 --- a/include/i18nutil/i18nutildllapi.h +++ b/include/i18nutil/i18nutildllapi.h @@ -16,9 +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_I18NUTIL_I18NUTILDLLAPI_H -#define INCLUDED_I18NUTIL_I18NUTILDLLAPI_H +#pragma once #include <sal/types.h> @@ -29,6 +27,4 @@ #endif #define I18NUTIL_DLLPRIVATE SAL_DLLPRIVATE -#endif // INCLUDED_I18NUTIL_I18NUTILDLLAPI_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx index bc659b30a727..f36b8c0ed645 100644 --- a/include/i18nutil/oneToOneMapping.hxx +++ b/include/i18nutil/oneToOneMapping.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_I18NUTIL_ONETOONEMAPPING_HXX -#define INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX +#pragma once #include <i18nutil/i18nutildllapi.h> #include <memory> @@ -85,6 +84,4 @@ private: } -#endif // _I18N_TRANSLITERATION_ONETOONEMAPPING_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx index 84be74be1ee3..f5eba497b7e4 100644 --- a/include/i18nutil/paper.hxx +++ b/include/i18nutil/paper.hxx @@ -16,9 +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_I18NUTIL_PAPER_HXX -#define INCLUDED_I18NUTIL_PAPER_HXX +#pragma once #include <i18nutil/i18nutildllapi.h> #include <rtl/string.hxx> @@ -153,6 +151,4 @@ public: static tools::Long sloppyFitPageDimension(tools::Long nDimension); }; -#endif // INCLUDED_I18NUTIL_PAPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/scripttypedetector.hxx b/include/i18nutil/scripttypedetector.hxx index 8e92f46b5f8a..29a0214b41d7 100644 --- a/include/i18nutil/scripttypedetector.hxx +++ b/include/i18nutil/scripttypedetector.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_I18NUTIL_SCRIPTTYPEDETECTOR_HXX -#define INCLUDED_I18NUTIL_SCRIPTTYPEDETECTOR_HXX +#pragma once #include <i18nutil/i18nutildllapi.h> @@ -31,6 +30,4 @@ public: static sal_Int16 getScriptDirection( std::u16string_view Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/searchopt.hxx b/include/i18nutil/searchopt.hxx index 0fd5f98676d4..3ca5441f4eec 100644 --- a/include/i18nutil/searchopt.hxx +++ b/include/i18nutil/searchopt.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_I18NUTIL_SEARCHOPT_HXX -#define INCLUDED_I18NUTIL_SEARCHOPT_HXX +#pragma once #include <sal/types.h> #include <com/sun/star/lang/Locale.hpp> @@ -134,6 +133,4 @@ struct SAL_WARN_UNUSED SearchOptions2 { }; // namespace -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/transliteration.hxx b/include/i18nutil/transliteration.hxx index 7de57599954c..0962c6fe1b86 100644 --- a/include/i18nutil/transliteration.hxx +++ b/include/i18nutil/transliteration.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_I18NUTIL_TRANSLITERATION_HXX -#define INCLUDED_I18NUTIL_TRANSLITERATION_HXX +#pragma once #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> @@ -127,7 +126,4 @@ namespace o3tl { template<> struct typed_flags<TransliterationFlags> : is_typed_flags<TransliterationFlags, 0x7fffffff> {}; } - -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index 3c8c59b08db2..599e523d7e88 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.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_I18NUTIL_UNICODE_HXX -#define INCLUDED_I18NUTIL_UNICODE_HXX +#pragma once #include <com/sun/star/i18n/UnicodeScript.hpp> #include <sal/types.h> @@ -125,6 +124,4 @@ public: OUString ReplacementString(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/i18nutil/widthfolding.hxx b/include/i18nutil/widthfolding.hxx index 87b909b9169f..3c7adea416f6 100644 --- a/include/i18nutil/widthfolding.hxx +++ b/include/i18nutil/widthfolding.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_I18NUTIL_WIDTHFOLDING_HXX -#define INCLUDED_I18NUTIL_WIDTHFOLDING_HXX +#pragma once #include <sal/types.h> #include <rtl/ustring.hxx> @@ -52,6 +51,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
