include/filter/msfilter/countryid.hxx | 5 +---- include/filter/msfilter/dffpropset.hxx | 4 +--- include/filter/msfilter/dffrecordheader.hxx | 4 +--- include/filter/msfilter/escherex.hxx | 5 +---- include/filter/msfilter/mscodec.hxx | 5 +---- include/filter/msfilter/msdffimp.hxx | 5 +---- include/filter/msfilter/msfilterdllapi.h | 5 +---- include/filter/msfilter/msocximex.hxx | 5 +---- include/filter/msfilter/msoleexp.hxx | 5 +---- include/filter/msfilter/mstoolbar.hxx | 5 +---- include/filter/msfilter/msvbahelper.hxx | 5 +---- include/filter/msfilter/rtfutil.hxx | 5 +---- include/filter/msfilter/svdfppt.hxx | 5 +---- include/filter/msfilter/svxmsbas.hxx | 5 +---- include/filter/msfilter/util.hxx | 5 +---- 15 files changed, 15 insertions(+), 58 deletions(-)
New commits: commit 91fdab8b42bbea39766d113fbc3e2f7da6f22526 Author: Simon Chenery <[email protected]> AuthorDate: Wed Oct 8 21:19:10 2025 +0200 Commit: David Gilbert <[email protected]> CommitDate: Thu Oct 16 17:08:52 2025 +0200 tdf#143148 replace include guards with pragma once in include/filter/msfilter Change-Id: I47a5b5a6594d71939e3e5ee5f53d0ff4a938342a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192078 Reviewed-by: David Gilbert <[email protected]> Tested-by: Jenkins diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx index b55e1d9cfb70..2676f117989e 100644 --- a/include/filter/msfilter/countryid.hxx +++ b/include/filter/msfilter/countryid.hxx @@ -18,8 +18,7 @@ */ -#ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX -#define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX +#pragma once #include <filter/msfilter/msfilterdllapi.h> #include <i18nlangtag/lang.h> @@ -302,6 +301,4 @@ MSFILTER_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry ); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index 6e7ca4a415a6..ee1535afdc7f 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.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_FILTER_MSFILTER_DFFPROPSET_HXX -#define INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX +#pragma once #include <vector> @@ -70,5 +69,4 @@ class MSFILTER_DLLPUBLIC DffPropSet friend SvStream& operator|=( SvStream& rIn, DffPropSet& rPropSet ); }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx index acd0d2539889..765e8544da34 100644 --- a/include/filter/msfilter/dffrecordheader.hxx +++ b/include/filter/msfilter/dffrecordheader.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX -#define INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX +#pragma once #include <filter/msfilter/msfilterdllapi.h> #include <svx/msdffdef.hxx> @@ -60,5 +59,4 @@ public: MSFILTER_DLLPUBLIC friend bool ReadDffRecordHeader(SvStream& rIn, DffRecordHeader& rRec); }; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 6849f7e0611c..52b93fb99415 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_ESCHEREX_HXX -#define INCLUDED_FILTER_MSFILTER_ESCHEREX_HXX +#pragma once #include <memory> #include <utility> @@ -1222,6 +1221,4 @@ private: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index 90c39a8cc6b5..b642ec39caf1 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_MSCODEC_HXX -#define INCLUDED_FILTER_MSFILTER_MSCODEC_HXX +#pragma once #include <com/sun/star/uno/Sequence.hxx> #include <filter/msfilter/msfilterdllapi.h> @@ -494,6 +493,4 @@ struct MSFILTER_DLLPUBLIC RC4EncryptionInfo } // namespace msfilter -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index d311d1fe1783..ef6e7ec661f4 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX -#define INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX +#pragma once #include <cstring> #include <map> @@ -809,6 +808,4 @@ struct CompareSvxMSDffShapeTxBxSort class MSFILTER_DLLPUBLIC SvxMSDffShapeTxBxSort : public std::set<SvxMSDffShapeOrder*,CompareSvxMSDffShapeTxBxSort> {}; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msfilterdllapi.h b/include/filter/msfilter/msfilterdllapi.h index 10532d165c0f..4bf41fb81e61 100644 --- a/include/filter/msfilter/msfilterdllapi.h +++ b/include/filter/msfilter/msfilterdllapi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_MSFILTERDLLAPI_H -#define INCLUDED_FILTER_MSFILTER_MSFILTERDLLAPI_H +#pragma once #include <sal/types.h> @@ -30,6 +29,4 @@ #define MSFILTER_DLLPRIVATE SAL_DLLPRIVATE -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx index 18bf41569f5b..27a43d837986 100644 --- a/include/filter/msfilter/msocximex.hxx +++ b/include/filter/msfilter/msocximex.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_FILTER_MSFILTER_MSOCXIMEX_HXX -#define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <filter/msfilter/msfilterdllapi.h> @@ -79,6 +78,4 @@ protected: virtual void GetDrawPage(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx index 77b2cc3b4608..4030f4e42311 100644 --- a/include/filter/msfilter/msoleexp.hxx +++ b/include/filter/msfilter/msoleexp.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_FILTER_MSFILTER_MSOLEEXP_HXX -#define INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX +#pragma once #include <com/sun/star/uno/Reference.hxx> #include <filter/msfilter/msfilterdllapi.h> @@ -51,6 +50,4 @@ public: }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index c70e45989883..1d03c2918d23 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -6,8 +6,7 @@ * 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_FILTER_MSFILTER_MSTOOLBAR_HXX -#define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX +#pragma once #include <memory> #include <string_view> @@ -350,6 +349,4 @@ public: #endif }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 7a2d9e88584d..69e0c9a48899 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.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_FILTER_MSFILTER_MSVBAHELPER_HXX -#define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX +#pragma once #include <sal/config.h> @@ -112,6 +111,4 @@ private: } // namespace ooo::vba -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx index 44ed15c70857..fd384633db8f 100644 --- a/include/filter/msfilter/rtfutil.hxx +++ b/include/filter/msfilter/rtfutil.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FILTER_MSFILTER_RTFUTIL_HXX -#define INCLUDED_FILTER_MSFILTER_RTFUTIL_HXX +#pragma once #include <filter/msfilter/msfilterdllapi.h> #include <rtl/string.hxx> @@ -72,6 +71,4 @@ MSFILTER_DLLPUBLIC bool ExtractOLE2FromObjdata(const OString& rObjdata, SvStream MSFILTER_DLLPUBLIC bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 981d2fd3512e..af1b34a2e3d8 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX -#define INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX +#pragma once #include <algorithm> #include <cstddef> @@ -1472,6 +1471,4 @@ enum class PptPlaceholder : sal_uInt8 MEDIACLIP = 24 // 25 Media Clip }; -#endif // INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx index 7d4578e98037..32bee733d6f5 100644 --- a/include/filter/msfilter/svxmsbas.hxx +++ b/include/filter/msfilter/svxmsbas.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX -#define INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX +#pragma once #include <filter/msfilter/msfilterdllapi.h> #include <rtl/ustring.hxx> @@ -68,6 +67,4 @@ private: SfxObjectShell& rDocSh; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 6157af1b3175..1182097b80f4 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FILTER_MSFILTER_UTIL_HXX -#define INCLUDED_FILTER_MSFILTER_UTIL_HXX +#pragma once #include <filter/msfilter/msfilterdllapi.h> #include <svx/msdffdef.hxx> @@ -136,6 +135,4 @@ MSFILTER_DLLPUBLIC sal_uInt8 TransColToIco( const Color& rCol ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
