include/formula/ExternalReferenceHelper.hxx | 5 +---- include/formula/FormulaCompiler.hxx | 7 +------ include/formula/FormulaOpCodeMapperObj.hxx | 6 +----- include/formula/IControlReferenceHandler.hxx | 4 +--- include/formula/IFunctionDescription.hxx | 4 +--- include/formula/compiler.hxx | 5 +---- include/formula/errorcodes.hxx | 5 +---- include/formula/formdata.hxx | 4 +--- include/formula/formula.hxx | 5 +---- include/formula/formulahelper.hxx | 6 +----- include/formula/funcutl.hxx | 5 +---- include/formula/grammar.hxx | 6 +----- include/formula/opcode.hxx | 5 +---- include/formula/paramclass.hxx | 5 +---- include/formula/token.hxx | 6 +----- include/formula/tokenarray.hxx | 5 +---- include/formula/types.hxx | 5 +---- include/formula/vectortoken.hxx | 5 +---- 18 files changed, 18 insertions(+), 75 deletions(-)
New commits: commit 63b5081fd89140762ed375a04cccfd01c65638a6 Author: Daniel Lee <[email protected]> AuthorDate: Sun Oct 26 20:31:19 2025 -0500 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Fri Oct 31 11:24:22 2025 +0100 tdf#143148: Use pragma once instead of include guards Replace include guards with pragma once in include/formula Change-Id: I54346cb2f400cf3da9dadbe2eb73cdb25991229c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193011 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/include/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx index 364307f637a8..3e9b9ee28e09 100644 --- a/include/formula/ExternalReferenceHelper.hxx +++ b/include/formula/ExternalReferenceHelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX -#define INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX +#pragma once #include <cstddef> @@ -39,6 +38,4 @@ namespace formula } // formula -#endif // INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 793a87245cf0..9065523b96ad 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_FORMULACOMPILER_HXX -#define INCLUDED_FORMULA_FORMULACOMPILER_HXX +#pragma once #include <memory> #include <unordered_map> @@ -516,8 +515,4 @@ private: } // formula - -#endif // INCLUDED_FORMULA_FORMULACOMPILER_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 24496aa21469..3244ee15e61d 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX -#define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX +#pragma once #include <memory> @@ -66,7 +65,4 @@ private: } // formula - -#endif // INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx index e1096c47ae38..57fd49f8604e 100644 --- a/include/formula/IControlReferenceHandler.hxx +++ b/include/formula/IControlReferenceHandler.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_FORMULA_ICONTROLREFERENCEHANDLER_HXX -#define INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX +#pragma once #include <formula/formuladllapi.h> #include <rtl/ustring.hxx> @@ -39,6 +38,5 @@ namespace formula ~IControlReferenceHandler() {} }; } // formula -#endif // INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index 3f9d63948b87..c5300b70c96a 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX -#define INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX +#pragma once #include <memory> #include <vector> @@ -168,6 +167,5 @@ namespace formula }; } -#endif // INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/compiler.hxx b/include/formula/compiler.hxx index 64f6c1fad97a..920df5d2d28a 100644 --- a/include/formula/compiler.hxx +++ b/include/formula/compiler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef FORMULA_COMPILER_HXX -#define FORMULA_COMPILER_HXX +#pragma once /* Central definition of OpCodes for spreadsheet functions */ @@ -548,6 +547,4 @@ #define SC_OPCODE_NONE 0xFFFF -#endif /* FORMULA_COMPILER_HRC */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx index 3e929bff49e8..80ba58fff488 100644 --- a/include/formula/errorcodes.hxx +++ b/include/formula/errorcodes.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_ERRORCODES_HXX -#define INCLUDED_FORMULA_ERRORCODES_HXX +#pragma once #include <sal/mathconf.h> #include <sal/types.h> @@ -185,6 +184,4 @@ inline bool isPublishedFormulaError( FormulaError nErr ) return false; } -#endif // INCLUDED_FORMULA_ERRORCODES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx index 1df42c2e9508..3fd4842dbe4e 100644 --- a/include/formula/formdata.hxx +++ b/include/formula/formdata.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_FORMDATA_HXX -#define INCLUDED_FORMULA_FORMDATA_HXX +#pragma once #include <formula/formuladllapi.h> #include <rtl/ustring.hxx> @@ -66,6 +65,5 @@ private: } // formula -#endif // INCLUDED_FORMULA_FORMDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index fdea0ef371e8..116ea782907c 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_FORMULA_HXX -#define INCLUDED_FORMULA_FORMULA_HXX +#pragma once #include <config_options.h> #include <memory> @@ -122,6 +121,4 @@ protected: } // formula -#endif // INCLUDED_FORMULA_FORMULA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index e584af565ca2..ed746509a465 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_FORMULAHELPER_HXX -#define INCLUDED_FORMULA_FORMULAHELPER_HXX +#pragma once #include <vector> @@ -81,7 +80,4 @@ namespace formula } // formula - -#endif // INCLUDED_FORMULA_FORMULAHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 2329e556a44c..04816b94b445 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_FUNCUTL_HXX -#define INCLUDED_FORMULA_FUNCUTL_HXX +#pragma once #include <formula/formuladllapi.h> #include <rtl/ustring.hxx> @@ -176,6 +175,4 @@ public: } // formula -#endif // INCLUDED_FORMULA_FUNCUTL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 677087d19934..8f0b29bff167 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_GRAMMAR_HXX -#define INCLUDED_FORMULA_GRAMMAR_HXX +#pragma once #include <com/sun/star/sheet/FormulaLanguage.hpp> #include <formula/formuladllapi.h> @@ -241,7 +240,4 @@ public: } // formula - -#endif // INCLUDED_FORMULA_GRAMMAR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 5119b024f0d0..d83a89c1f516 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_OPCODE_HXX -#define INCLUDED_FORMULA_OPCODE_HXX +#pragma once #include <sstream> @@ -1038,6 +1037,4 @@ inline std::string OpCodeEnumToString(OpCode eCode) return os.str(); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/paramclass.hxx b/include/formula/paramclass.hxx index 30773c35e016..6d3d3f00e76d 100644 --- a/include/formula/paramclass.hxx +++ b/include/formula/paramclass.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FORMULA_PARAMCLASS_HXX -#define INCLUDED_FORMULA_PARAMCLASS_HXX +#pragma once #include <sal/config.h> #include <sal/types.h> @@ -76,6 +75,4 @@ namespace formula }; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/formula/token.hxx b/include/formula/token.hxx index d497f8e5d3f7..7ffa64b194b5 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_TOKEN_HXX -#define INCLUDED_FORMULA_TOKEN_HXX +#pragma once #include <sal/config.h> @@ -528,7 +527,4 @@ public: } // formula - -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 320937844bfa..269585eca9cd 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_TOKENARRAY_HXX -#define INCLUDED_FORMULA_TOKENARRAY_HXX +#pragma once #include <climits> #include <memory> @@ -676,6 +675,4 @@ public: } // formula -#endif // INCLUDED_FORMULA_TOKENARRAY_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/types.hxx b/include/formula/types.hxx index c0c8b64c2498..983b64127acb 100644 --- a/include/formula/types.hxx +++ b/include/formula/types.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMULA_TYPES_HXX -#define INCLUDED_FORMULA_TYPES_HXX +#pragma once #include <boost/intrusive_ptr.hpp> @@ -29,6 +28,4 @@ typedef ::boost::intrusive_ptr<FormulaToken> FormulaTokenRef; typedef ::boost::intrusive_ptr<const FormulaToken> FormulaConstTokenRef; } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index 046d71faf3ee..edd8164ad396 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FORMULA_VECTORTOKEN_HXX -#define INCLUDED_FORMULA_VECTORTOKEN_HXX +#pragma once #include <cstddef> #include <vector> @@ -105,6 +104,4 @@ public: } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
