simplify include guards

Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f

14 files changed, 21 insertions, 18 deletions

diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 26f4f393b1d3..17e4766add0f 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -19,7 +19,7 @@
 
 /** @HTML */
 
-#if !defined INCLUDED_JVMFWK_FRAMEWORK_H
+#ifndef INCLUDED_JVMFWK_FRAMEWORK_H
 #define INCLUDED_JVMFWK_FRAMEWORK_H
 
 #include "jvmfwkdllapi.h"
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index b0017c995164..11fc6aaffc6e 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -18,7 +18,7 @@
  */
 
 /** @HTML */
-#if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
+#ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
 #define INCLUDED_JVMFWK_VENDORPLUGIN_H
 
 #include "jvmfwkplugindllapi.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index 11174b8fbaad..950021ed7f96 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_JFW_PLUGIN_GNUJRE_HXX
-#define  INCLUDED_JFW_PLUGIN_GNUJRE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_GNUJRE_HXX
+#define INCLUDED_JFW_PLUGIN_GNUJRE_HXX
 
 #include "vendorbase.hxx"
 #include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 0681652339bb..88ae1d935288 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
-#define  INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
+#define INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
 
 #include "vendorbase.hxx"
 #include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index 9532e2e832a6..21ce38946972 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_JFW_PLUGIN_SUNJRE_HXX
-#define  INCLUDED_JFW_PLUGIN_SUNJRE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_SUNJRE_HXX
+#define INCLUDED_JFW_PLUGIN_SUNJRE_HXX
 
 #include "vendorbase.hxx"
 #include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 8d06f3a944df..e67d8e5f39cd 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_JVMACCESS_SUNVERSION_HXX
+#ifndef INCLUDED_JVMACCESS_SUNVERSION_HXX
 #define INCLUDED_JVMACCESS_SUNVERSION_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 965b1c91029b..5bd22fdce046 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -16,7 +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 .
  */
-#if !defined INCLUDED_JFW_PLUGIN_UTIL_HXX
+#ifndef INCLUDED_JFW_PLUGIN_UTIL_HXX
 #define INCLUDED_JFW_PLUGIN_UTIL_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
index 51d4b71a2cec..f9f4a968cf3b 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
+#ifndef INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
 #define INCLUDED_JFW_PLUGIN_VENDORBASE_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 3a66dc34b24a..d91a9a1ec5cf 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -16,7 +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 .
  */
-#if !defined INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
+#ifndef INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
 #define INCLUDED_JFW_PLUGIN_VENDORLIST_HXX
 
 #include "rtl/ref.hxx"
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index 542eacec5482..c35d624c900e 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -16,7 +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 .
  */
-#if !defined INCLUDED_JVMFWK_ELEMENTS_HXX
+#ifndef INCLUDED_JVMFWK_ELEMENTS_HXX
 #define INCLUDED_JVMFWK_ELEMENTS_HXX
 
 #include <vector>
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 3f8891bca541..4ac6c63af78b 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+#ifndef INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
 #define INCLUDED_JVMFWK_LOCAL_FRAMEWORK_HXX
+
 #include "rtl/ustring.hxx"
 #include "rtl/byteseq.hxx"
 #include "jvmfwk/framework.h"
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index c4b1464e11d0..51bd4bb0d5f5 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -16,10 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_FWKBASE_HXX
+#ifndef INCLUDED_JVMFWK_FWKBASE_HXX
 #define INCLUDED_JVMFWK_FWKBASE_HXX
+
 #include "rtl/ustring.hxx"
 #include "libxmlutil.hxx"
+
 namespace jfw
 {
 
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 26be25e8b7e0..1509fb74e89d 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -16,7 +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 .
  */
-#if !defined INCLUDED_JVMFWK_FWKUTIL_HXX
+#ifndef INCLUDED_JVMFWK_FWKUTIL_HXX
 #define INCLUDED_JVMFWK_FWKUTIL_HXX
 
 #include "sal/config.h"
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index c27f8d03f8c1..7035f2ed9698 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -16,13 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#if !defined INCLUDED_JVMFWK_LIBXMLUTIL_HXX
+#ifndef INCLUDED_JVMFWK_LIBXMLUTIL_HXX
 #define INCLUDED_JVMFWK_LIBXMLUTIL_HXX
 
-
 #include "libxml/parser.h"
 #include "libxml/xpath.h"
 #include "rtl/ustring.hxx"
+
 namespace jfw
 {
 class CXPathObjectPtr