simplify include guards

Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f

35 files changed, 35 insertions, 35 deletions

diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc
index b8a232fc1c4e..787c7052843f 100644
--- a/desktop/inc/deployment.hrc
+++ b/desktop/inc/deployment.hrc
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DEPLOYMENT_HRC
+#ifndef INCLUDED_DEPLOYMENT_HRC
 #define INCLUDED_DEPLOYMENT_HRC
 
 #define MASKCOLOR MaskColor = \
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index 277829d5e108..ff4187f4f3b8 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_GUI_H
+#ifndef INCLUDED_DP_GUI_H
 #define INCLUDED_DP_GUI_H
 
 #include "dp_gui_updatedata.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 843b41cd41ed..08c557e6aa78 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_GUI_HRC
+#ifndef INCLUDED_DP_GUI_HRC
 #define INCLUDED_DP_GUI_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx
index b8faa7fa7d54..3ba7b9de807a 100644
--- a/desktop/source/deployment/gui/dp_gui_shared.hxx
+++ b/desktop/source/deployment/gui/dp_gui_shared.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_DP_GUI_SHARED_HXX
+#ifndef INCLUDED_DP_GUI_SHARED_HXX
 #define INCLUDED_DP_GUI_SHARED_HXX
 
 #include "rtl/instance.hxx"
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 25826bdf3a89..870227e1fdb3 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.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_DP_GUI_UPDATEDATA_HXX
+#ifndef INCLUDED_DP_GUI_UPDATEDATA_HXX
 #define INCLUDED_DP_GUI_UPDATEDATA_HXX
 
 #include "sal/config.h"
diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h
index 1ebaf586a371..9f803c757bc9 100644
--- a/desktop/source/deployment/inc/dp_interact.h
+++ b/desktop/source/deployment/inc/dp_interact.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_INTERACT_H
+#ifndef INCLUDED_DP_INTERACT_H
 #define INCLUDED_DP_INTERACT_H
 
 #include "rtl/ref.hxx"
diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
index e9ad4a2b1d24..df358d791a69 100644
--- a/desktop/source/deployment/inc/dp_misc.h
+++ b/desktop/source/deployment/inc/dp_misc.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_MISC_H
+#ifndef INCLUDED_DP_MISC_H
 #define INCLUDED_DP_MISC_H
 
 #include "rtl/ustrbuf.hxx"
diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h
index a81cef5685c1..8ce15b111489 100644
--- a/desktop/source/deployment/inc/dp_persmap.h
+++ b/desktop/source/deployment/inc/dp_persmap.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_PERSMAP_H
+#ifndef INCLUDED_DP_PERSMAP_H
 #define INCLUDED_DP_PERSMAP_H
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx
index 4d551e94d73f..044762e761f8 100644
--- a/desktop/source/deployment/inc/dp_platform.hxx
+++ b/desktop/source/deployment/inc/dp_platform.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_PLATFORM_HXX
+#ifndef INCLUDED_DP_PLATFORM_HXX
 #define INCLUDED_DP_PLATFORM_HXX
 
 
diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h
index d39aa2481493..d71e025eb071 100644
--- a/desktop/source/deployment/inc/dp_resource.h
+++ b/desktop/source/deployment/inc/dp_resource.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_RESOURCE_H
+#ifndef INCLUDED_DP_RESOURCE_H
 #define INCLUDED_DP_RESOURCE_H
 
 #include "tools/string.hxx"
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index befd53906818..cbd77b4ffe34 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_UCB_H
+#ifndef INCLUDED_DP_UCB_H
 #define INCLUDED_DP_UCB_H
 
 #include <list>
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 95595325a497..cbad0bab7fe4 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_UPDATE_HXX
+#ifndef INCLUDED_DP_UPDATE_HXX
 #define INCLUDED_DP_UPDATE_HXX
 
 
diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h
index df4165275a2c..d5fbb523d702 100644
--- a/desktop/source/deployment/inc/dp_xml.h
+++ b/desktop/source/deployment/inc/dp_xml.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_XML_H
+#ifndef INCLUDED_DP_XML_H
 #define INCLUDED_DP_XML_H
 
 #include "rtl/ref.hxx"
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx
index 59349c469af0..1f7408d03a0a 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.hxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_COMMANDENVIRONMENTS_HXX
+#ifndef INCLUDED_DP_COMMANDENVIRONMENTS_HXX
 #define INCLUDED_DP_COMMANDENVIRONMENTS_HXX
 
 #include "cppuhelper/compbase3.hxx"
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index f1a99dbcef4c..800d91f437b6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_EXTENSIONMANAGER_H
+#ifndef INCLUDED_DP_EXTENSIONMANAGER_H
 #define INCLUDED_DP_EXTENSIONMANAGER_H
 
 #include "dp_manager.hrc"
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index 828d808738c3..b88b51111062 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_MANAGER_H
+#ifndef INCLUDED_DP_MANAGER_H
 #define INCLUDED_DP_MANAGER_H
 
 #include "dp_manager.hrc"
diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc
index fea0138e9185..b4610aa1dc99 100644
--- a/desktop/source/deployment/manager/dp_manager.hrc
+++ b/desktop/source/deployment/manager/dp_manager.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_MANAGER_HRC
+#ifndef INCLUDED_DP_MANAGER_HRC
 #define INCLUDED_DP_MANAGER_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index b54412d8ebdd..3e85adf5b7a0 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_PROPERTIES_HXX
+#ifndef INCLUDED_DP_PROPERTIES_HXX
 #define INCLUDED_DP_PROPERTIES_HXX
 
 
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 8acc9f18586e..24a08e88487f 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_COMPBACKENDDB_HXX
+#ifndef INCLUDED_DP_COMPBACKENDDB_HXX
 #define INCLUDED_DP_COMPBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc
index eac407f5eb22..f8073c7630e7 100644
--- a/desktop/source/deployment/registry/component/dp_component.hrc
+++ b/desktop/source/deployment/registry/component/dp_component.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_COMPONENT_HRC
+#ifndef INCLUDED_DP_COMPONENT_HRC
 #define INCLUDED_DP_COMPONENT_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
index 5999ca528e13..e2d325cc8386 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_CONFIGURATION_HRC
+#ifndef INCLUDED_DP_CONFIGURATION_HRC
 #define INCLUDED_DP_CONFIGURATION_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 00a5515b3780..451879c3c261 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
+#ifndef INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
 #define INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index 8ba5940b1d92..4113d072b7d9 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
+#ifndef INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
 #define INCLUDED_DP_EXECUTABLEBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc
index 6cbf988ebfc6..45b9a60b221b 100644
--- a/desktop/source/deployment/registry/help/dp_help.hrc
+++ b/desktop/source/deployment/registry/help/dp_help.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_HELP_HRC
+#ifndef INCLUDED_DP_HELP_HRC
 #define INCLUDED_DP_HELP_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 18ee8c4ceaf6..9a38d0e703bd 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_HELPBACKENDDB_HXX
+#ifndef INCLUDED_DP_HELPBACKENDDB_HXX
 #define INCLUDED_DP_HELPBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 9fb0595270b3..b4dff980aa68 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_REGISTRY_H
+#ifndef INCLUDED_DP_REGISTRY_H
 #define INCLUDED_DP_REGISTRY_H
 
 #include "dp_misc.h"
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index e65e5cbd970b..bb47e3c853b4 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_BACKENDDB_HXX
+#ifndef INCLUDED_DP_BACKENDDB_HXX
 #define INCLUDED_DP_BACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc
index dc5cf28cf797..8bda16e74c87 100644
--- a/desktop/source/deployment/registry/inc/dp_registry.hrc
+++ b/desktop/source/deployment/registry/inc/dp_registry.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_REGISTRY_HRC
+#ifndef INCLUDED_DP_REGISTRY_HRC
 #define INCLUDED_DP_REGISTRY_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 8825fbd67583..59ffacf93205 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_EXTBACKENDDB_HXX
+#ifndef INCLUDED_DP_EXTBACKENDDB_HXX
 #define INCLUDED_DP_EXTBACKENDDB_HXX
 
 #include <utility>
diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc
index 2c3c5ca4d15f..ac9bef8fcfa8 100644
--- a/desktop/source/deployment/registry/package/dp_package.hrc
+++ b/desktop/source/deployment/registry/package/dp_package.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_PACKAGE_HRC
+#ifndef INCLUDED_DP_PACKAGE_HRC
 #define INCLUDED_DP_PACKAGE_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h
index 0cd5cb2cba90..c25b970cbe8c 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.h
+++ b/desktop/source/deployment/registry/script/dp_lib_container.h
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DP_LIB_CONTAINER_H
+#ifndef INCLUDED_DP_LIB_CONTAINER_H
 #define INCLUDED_DP_LIB_CONTAINER_H
 
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc
index d59cf6df2e2e..ac7e7aae9fa6 100644
--- a/desktop/source/deployment/registry/script/dp_script.hrc
+++ b/desktop/source/deployment/registry/script/dp_script.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_SCRIPT_HRC
+#ifndef INCLUDED_DP_SCRIPT_HRC
 #define INCLUDED_DP_SCRIPT_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index 30f4c745aed7..cd7a6d70e08f 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_SCRIPTBACKENDDB_HXX
+#ifndef INCLUDED_DP_SCRIPTBACKENDDB_HXX
 #define INCLUDED_DP_SCRIPTBACKENDDB_HXX
 
 #include "rtl/ustring.hxx"
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
index 57f65d0b35ca..0fdfc9ea9e32 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DP_SFWK_HRC
+#ifndef INCLUDED_DP_SFWK_HRC
 #define INCLUDED_DP_SFWK_HRC
 
 #include "deployment.hrc"
diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc
index fda5a2f6bb93..0054581fc1da 100644
--- a/desktop/source/inc/helpid.hrc
+++ b/desktop/source/inc/helpid.hrc
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_DESKTOP_HELPID_HRC
+#ifndef INCLUDED_DESKTOP_HELPID_HRC
 #define INCLUDED_DESKTOP_HELPID_HRC
 
 #define HID_PACKAGE_MANAGER                                "DESKTOP_HID_PACKAGE_MANAGER"