fixincludeguards.sh: include - the rest

Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9

17 files changed, 46 insertions, 46 deletions

diff --git a/include/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx
index cd9b3b5b69c6..25422355b2e2 100644
--- a/include/formula/ExternalReferenceHelper.hxx
+++ b/include/formula/ExternalReferenceHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_EXTERNALREFERENCEHELPER_HXX
-#define FORMULA_EXTERNALREFERENCEHELPER_HXX
+#ifndef INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX
+#define INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include "formula/formuladllapi.h"
@@ -36,6 +36,6 @@ namespace formula
 // =============================================================================
 } // formula
 // =============================================================================
-#endif //FORMULA_EXTERNALREFERENCEHELPER_HXX
+#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 ae46a6db1f80..4cd4631dcacc 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_COMPILER_HXX_INCLUDED
-#define FORMULA_COMPILER_HXX_INCLUDED
+#ifndef INCLUDED_FORMULA_FORMULACOMPILER_HXX
+#define INCLUDED_FORMULA_FORMULACOMPILER_HXX
 
 #include <formula/formuladllapi.h>
 #include <rtl/ustrbuf.hxx>
@@ -392,7 +392,7 @@ private:
 } // formula
 // =============================================================================
 
-#endif // FORMULA_COMPILER_HXX_INCLUDED
+#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 07945ca27101..2fbdbcf6d8bf 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
-#define FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
+#ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
+#define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
 
 #include "formula/formuladllapi.h"
 #include <cppuhelper/implbase2.hxx>
@@ -79,6 +79,6 @@ private:
 } // formula
 // =============================================================================
 
-#endif // FORMULA_FORMULAOPCODEMAPPER_HXX_INCLUDED
+#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 cc22e45a6088..57cb134172b7 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.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 FORMULA_ICONTROL_REFERENCE_HANDLER_HXX_INCLUDED
-#define FORMULA_ICONTROL_REFERENCE_HANDLER_HXX_INCLUDED
+#ifndef INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX
+#define INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX
 
 #include "formula/formuladllapi.h"
 
@@ -37,6 +37,6 @@ namespace formula
         ~IControlReferenceHandler() {}
     };
 } // formula
-#endif // FORMULA_ICONTROL_REFERENCE_HANDLER_HXX_INCLUDED
+#endif // INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index 1e145e04132b..d178aec680bd 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SC_ERRORCODES_HXX
-#define SC_ERRORCODES_HXX
+#ifndef INCLUDED_FORMULA_ERRORCODES_HXX
+#define INCLUDED_FORMULA_ERRORCODES_HXX
 
 #include <rtl/math.hxx>
 #include <tools/solar.h>
@@ -114,6 +114,6 @@ inline sal_uInt16 GetDoubleErrorValue( double fVal )
 // yes, exceptionally we put a "using namespace" in a header file..
 using namespace ScErrorCodes;
 
-#endif // SC_ERRORCODES_HXX
+#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 536521a0329e..a772823e56fd 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_FORMDATA_HXX
-#define FORMULA_FORMDATA_HXX
+#ifndef INCLUDED_FORMULA_FORMDATA_HXX
+#define INCLUDED_FORMULA_FORMDATA_HXX
 
 #include <formula/formuladllapi.h>
 #include <rtl/ustring.hxx>
@@ -78,6 +78,6 @@ private:
 
 
 } // formula
-#endif // FORMULA_FORMDATA_HXX
+#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 99a8752c7eb3..4bb48473d108 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_FORMULA_HXX
-#define FORMULA_FORMULA_HXX
+#ifndef INCLUDED_FORMULA_FORMULA_HXX
+#define INCLUDED_FORMULA_FORMULA_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <memory>
@@ -136,6 +136,6 @@ protected:
 
 } // formula
 
-#endif // FORMULA_FORMULA_HXX
+#endif // INCLUDED_FORMULA_FORMULA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/formuladllapi.h b/include/formula/formuladllapi.h
index b2f4b06bd1a8..e633fd2a1076 100644
--- a/include/formula/formuladllapi.h
+++ b/include/formula/formuladllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FORMULADLLAPI_H
-#define INCLUDED_FORMULADLLAPI_H
+#ifndef INCLUDED_FORMULA_FORMULADLLAPI_H
+#define INCLUDED_FORMULA_FORMULADLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define FORMULA_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_FORMULADLLAPI_H */
+#endif // INCLUDED_FORMULA_FORMULADLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index 41095da99364..737550d055f8 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_FORMULA_HELPER_HXX
-#define FORMULA_FORMULA_HELPER_HXX
+#ifndef INCLUDED_FORMULA_FORMULAHELPER_HXX
+#define INCLUDED_FORMULA_FORMULAHELPER_HXX
 
 #include <formula/IFunctionDescription.hxx>
 #include <formula/formuladllapi.h>
@@ -75,6 +75,6 @@ namespace formula
 } // formula
 // =============================================================================
 
-#endif //FORMULA_FORMULA_HELPER_HXX
+#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 b34d56b85ee1..5163da5c65e3 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_FUNCUTL_HXX
-#define FORMULA_FUNCUTL_HXX
+#ifndef INCLUDED_FORMULA_FUNCUTL_HXX
+#define INCLUDED_FORMULA_FUNCUTL_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
@@ -104,6 +104,6 @@ public:
 
 } // formula
 
-#endif // FORMULA_FUNCUTL_HXX
+#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 610cf4664a3a..130a5a3fb617 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_GRAMMAR_HXX
-#define FORMULA_GRAMMAR_HXX
+#ifndef INCLUDED_FORMULA_GRAMMAR_HXX
+#define INCLUDED_FORMULA_GRAMMAR_HXX
 
 #include "com/sun/star/sheet/FormulaLanguage.hpp"
 #include "formula/formuladllapi.h"
@@ -243,6 +243,6 @@ public:
 } // formula
 // =============================================================================
 
-#endif // FORMULA_GRAMMAR_HXX
+#endif // INCLUDED_FORMULA_GRAMMAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/formula/omoduleclient.hxx b/include/formula/omoduleclient.hxx
index 76fcee97fb57..94211e8898cb 100644
--- a/include/formula/omoduleclient.hxx
+++ b/include/formula/omoduleclient.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FORMULA_MODULECLIENT_HXX
-#define INCLUDED_FORMULA_MODULECLIENT_HXX
+#ifndef INCLUDED_FORMULA_OMODULECLIENT_HXX
+#define INCLUDED_FORMULA_OMODULECLIENT_HXX
 
 #include "sal/config.h"
 
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 384bd0d5d798..9ebd9d57db1a 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_OPCODE_HXX
-#define FORMULA_OPCODE_HXX
+#ifndef INCLUDED_FORMULA_OPCODE_HXX
+#define INCLUDED_FORMULA_OPCODE_HXX
 
 #include "formula/compiler.hrc"
 #include <tools/solar.h>
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 905be7b5ef90..8fa8708b5133 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_TOKEN_HXX
-#define FORMULA_TOKEN_HXX
+#ifndef INCLUDED_FORMULA_TOKEN_HXX
+#define INCLUDED_FORMULA_TOKEN_HXX
 
 #include <memory>
 #include <string.h>
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 45c0db0aa244..120a3bb550ff 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_TOKENARRAY_HXX
-#define FORMULA_TOKENARRAY_HXX
+#ifndef INCLUDED_FORMULA_TOKENARRAY_HXX
+#define INCLUDED_FORMULA_TOKENARRAY_HXX
 
 #include <limits.h>
 #include "formula/token.hxx"
@@ -282,6 +282,6 @@ private:
 // =============================================================================
 
 
-#endif // FORMULA_TOKENARRAY_HXX
+#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 33ead51620a6..c9e29929b9c5 100644
--- a/include/formula/types.hxx
+++ b/include/formula/types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FORMULA_TYPES_HXX
-#define FORMULA_TYPES_HXX
+#ifndef INCLUDED_FORMULA_TYPES_HXX
+#define INCLUDED_FORMULA_TYPES_HXX
 
 #include <boost/intrusive_ptr.hpp>
 
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 0d3cbf767229..d02f9c5690e3 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef FORMULA_VECTORTOKEN_HXX
-#define FORMULA_VECTORTOKEN_HXX
+#ifndef INCLUDED_FORMULA_VECTORTOKEN_HXX
+#define INCLUDED_FORMULA_VECTORTOKEN_HXX
 
 #include "formula/token.hxx"