simplify include guards

Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f

accessibility/inc/accessibility/extended/textwindowaccessibility.hxx

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
+#ifndef INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
 #define INCLUDED_ACCESSIBILITY_TEXTWINDOWACCESSIBILITY_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>

bridges/source/jni_uno/jni_base.h

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_JNI_BASE_H
+#ifndef INCLUDED_JNI_BASE_H
 #define INCLUDED_JNI_BASE_H
 
 #if defined (__SUNPRO_CC) || defined (__SUNPRO_C)

bridges/source/jni_uno/jni_bridge.h

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_JNI_BRIDGE_H
+#ifndef INCLUDED_JNI_BRIDGE_H
 #define INCLUDED_JNI_BRIDGE_H
 
 #include "jni_base.h"

bridges/source/jni_uno/jni_helper.h

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_JNI_HELPER_H
+#ifndef INCLUDED_JNI_HELPER_H
 #define INCLUDED_JNI_HELPER_H
 
 #include "jni_base.h"

bridges/source/jni_uno/jni_info.h

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_JNI_INFO_H
+#ifndef INCLUDED_JNI_INFO_H
 #define INCLUDED_JNI_INFO_H
 
 #include <boost/unordered_map.hpp>

chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx

@@ -23,7 +23,7 @@
 #include "ServiceMacros.hxx"
 #include "DiagramHelper.hxx"
 
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
 #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13
 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 13
 #include "comphelper/implbase_var.hxx"

chart2/source/model/main/ChartModel.hxx

@@ -65,7 +65,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
 #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 22
 #include "comphelper/implbase_var.hxx"

cli_ure/source/uno_bridge/cli_base.h

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_CLI_BASE_H
+#ifndef INCLUDED_CLI_BASE_H
 #define INCLUDED_CLI_BASE_H
 
 #pragma unmanaged

cli_ure/source/uno_bridge/cli_bridge.h

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_CLI_BRIDGE_H
+#ifndef INCLUDED_CLI_BRIDGE_H
 #define INCLUDED_CLI_BRIDGE_H
 #include <vcclr.h>
 #include "osl/interlck.h"

cli_ure/source/uno_bridge/cli_environment.h

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_CLI_ENVIRONMENT_H
+#ifndef INCLUDED_CLI_ENVIRONMENT_H
 #define INCLUDED_CLI_ENVIRONMENT_H
 
 #include "cli_base.h"

comphelper/inc/comphelper/anytostring.hxx

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined(INCLUDED_COMPHELPER_ANYTOSTRING_HXX)
+#ifndef INCLUDED_COMPHELPER_ANYTOSTRING_HXX
 #define INCLUDED_COMPHELPER_ANYTOSTRING_HXX
 
 #include "rtl/ustring.hxx"

comphelper/inc/comphelper/implbase_var.hxx

@@ -38,7 +38,7 @@
     include guards.  Please use the following external include guard rule
     where <N> is the number of interface types:
 
-    #if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>)
+    #ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
     #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
     #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER <N>
     #include "comphelper/implbase_var.hxx"
@@ -53,7 +53,7 @@
     The default is a maximum of 6 arguments.
 */
 
-#if ! defined(COMPHELPER_IMPLBASE_INTERFACE_NUMBER)
+#ifndef COMPHELPER_IMPLBASE_INTERFACE_NUMBER
 #error "you have to define COMPHELPER_IMPLBASE_INTERFACE_NUMBER prior to including comphelper/implbase_var.hxx!"
 #endif // ! defined(COMPHELPER_IMPLBASE_INTERFACE_NUMBER)
 
@@ -61,19 +61,13 @@
 #error "include proper header file: cppuhelper/implbase<N>.hxx or cppuhelper/compbase<N>.hxx!"
 #endif
 
-#if ! defined(COMPHELPER_IMPLBASE_MAX_CTOR_ARGS)
+#ifndef COMPHELPER_IMPLBASE_MAX_CTOR_ARGS
 #define COMPHELPER_IMPLBASE_MAX_CTOR_ARGS 6 // default
 #endif
 
-#if ! defined(_CPPUHELPER_IMPLBASE_EX_HXX_)
 #include "cppuhelper/implbase_ex.hxx"
-#endif
-#if ! defined(INCLUDED_RTL_INSTANCE_HXX)
 #include "rtl/instance.hxx"
-#endif
-#if ! defined(_CPPUHELPER_COMPBASE_EX_HXX_)
 #include "cppuhelper/compbase_ex.hxx"
-#endif
 
 #include "boost/preprocessor/cat.hpp"
 #include "boost/preprocessor/repetition.hpp"

comphelper/inc/comphelper/make_shared_from_uno.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_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX)
+#ifndef INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
 #define INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
 
 #include "boost/shared_ptr.hpp"

comphelper/inc/comphelper/makesequence.hxx

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined(COMPHELPER_MAKESEQUENCE_HXX_INCLUDED)
+#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
 #define COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
 
 #include "com/sun/star/uno/Sequence.hxx"
@@ -62,7 +62,7 @@ inline ::com::sun::star::uno::Sequence<T> makeSequence( \
     return seq; \
 }
 
-#if ! defined(COMPHELPER_MAKESEQUENCE_MAX_ARGS)
+#ifndef COMPHELPER_MAKESEQUENCE_MAX_ARGS
 #define COMPHELPER_MAKESEQUENCE_MAX_ARGS 12
 #endif
 

comphelper/inc/comphelper/optional.hxx

@@ -16,12 +16,10 @@
  *   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_COMPHELPER_OPTIONAL_HXX)
+#ifndef INCLUDED_COMPHELPER_OPTIONAL_HXX
 #define INCLUDED_COMPHELPER_OPTIONAL_HXX
 
-#if ! defined(_COM_SUN_STAR_BEANS_OPTIONAL_HPP_)
 #include "com/sun/star/beans/Optional.hpp"
-#endif
 #include "boost/optional.hpp"
 
 namespace comphelper {

comphelper/inc/comphelper/scopeguard.hxx

@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined(INCLUDED_COMPHELPER_SCOPEGUARD_HXX)
+#ifndef INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 #define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 
-#if ! defined(INCLUDED_COMPHELPERDLLAPI_H)
 #include "comphelper/comphelperdllapi.h"
-#endif
 #include "boost/function.hpp"
 #include "boost/noncopyable.hpp"
 #include "boost/bind.hpp"

comphelper/inc/comphelper/servicedecl.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(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
+#ifndef COMPHELPER_SERVICEDECL_HXX_INCLUDED
 #define COMPHELPER_SERVICEDECL_HXX_INCLUDED
 
 #include <comphelper/comphelperdllapi.h>
@@ -335,7 +335,7 @@ inline void * component_getFactoryHelper( \
     return pRet; \
 }
 
-#if ! defined(COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS)
+#ifndef COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS
 #define COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS 8
 #endif
 

comphelper/inc/comphelper/unwrapargs.hxx

@@ -17,16 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined(COMPHELPER_UNWRAPARGS_HXX_INCLUDED)
+#ifndef COMPHELPER_UNWRAPARGS_HXX_INCLUDED
 #define COMPHELPER_UNWRAPARGS_HXX_INCLUDED
 
-#if ! defined(_RTL_USTRBUF_HXX_)
 #include "rtl/ustrbuf.hxx"
-#endif
 #include "com/sun/star/uno/Sequence.hxx"
-#if ! defined(_COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_)
 #include "com/sun/star/lang/IllegalArgumentException.hpp"
-#endif
 #include "boost/optional.hpp"
 #include "boost/preprocessor/cat.hpp"
 #include "boost/preprocessor/repetition.hpp"
@@ -125,7 +121,7 @@ inline void unwrapArgs( \
     BOOST_PP_REPEAT(BOOST_PP_ADD(n_, 1), COMPHELPER_UNWRAPARGS_extract, ~) \
 }
 
-#if ! defined(COMPHELPER_UNWRAPARGS_MAX_ARGS)
+#ifndef COMPHELPER_UNWRAPARGS_MAX_ARGS
 #define COMPHELPER_UNWRAPARGS_MAX_ARGS 12
 #endif
 

cppu/inc/uno/dispatcher.hxx

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_UNO_DISPATCHER_HXX
+#ifndef INCLUDED_UNO_DISPATCHER_HXX
 #define INCLUDED_UNO_DISPATCHER_HXX
 
 #include "uno/dispatcher.h"

cppuhelper/inc/cppuhelper/unourl.hxx

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if !defined INCLUDED_CPPUHELPER_UNOURL_HXX
+#ifndef INCLUDED_CPPUHELPER_UNOURL_HXX
 #define INCLUDED_CPPUHELPER_UNOURL_HXX
 
 #include <memory>

cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl

@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_cppuhelper_detail_XExceptionThrower_idl
+#ifndef INCLUDED_cppuhelper_detail_XExceptionThrower_idl
 #define INCLUDED_cppuhelper_detail_XExceptionThrower_idl
 
 #include <com/sun/star/uno/Exception.idl>

dbaccess/source/core/dataaccess/connection.hxx

@@ -38,7 +38,7 @@
 #include <com/sun/star/sdb/tools/XConnectionTools.hpp>
 #include <com/sun/star/sdb/application/XTableUIProvider.hpp>
 
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14
 #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_14
 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 14
 #include <comphelper/implbase_var.hxx>

dbaccess/source/core/dataaccess/databasedocument.hxx

@@ -50,7 +50,7 @@
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 #include <com/sun/star/document/XDocumentRecovery.hpp>
 
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17)
+#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17
 #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_17
 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 17
 #include <comphelper/implbase_var.hxx>

desktop/inc/deployment.hrc

@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_DEPLOYMENT_HRC
+#ifndef INCLUDED_DEPLOYMENT_HRC
 #define INCLUDED_DEPLOYMENT_HRC
 
 #define MASKCOLOR MaskColor = \

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"

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"

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"

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"

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"

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"

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"

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
 
 

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"

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>

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
 
 

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"

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"

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"

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"

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"

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
 
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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>

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"

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>

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"

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"

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"

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"

extensions/source/activex/SOActionsApproval.h

@@ -3,7 +3,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined __SODOCUMENTEVENTLISTENER_H_
+#ifndef __SODOCUMENTEVENTLISTENER_H_
 #define __SODOCUMENTEVENTLISTENER_H_
 
 #if _MSC_VER > 1000

extensions/source/activex/SOComWindowPeer.h

@@ -3,7 +3,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined __SOCOMWINDOWPEER_H_
+#ifndef __SOCOMWINDOWPEER_H_
 #define __SOCOMWINDOWPEER_H_
 
 #if _MSC_VER > 1000

extensions/source/activex/SODispatchInterceptor.h

@@ -3,7 +3,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined __SODISPATCHINTERCEPTOR_H_
+#ifndef __SODISPATCHINTERCEPTOR_H_
 #define __SODISPATCHINTERCEPTOR_H_
 
 #if _MSC_VER > 1000

jvmaccess/inc/jvmaccess/virtualmachine.hxx

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if !defined INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
+#ifndef INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
 #define INCLUDED_JVMACCESS_VIRTUALMACHINE_HXX
 
 #include "jvmaccessdllapi.h"

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"

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"

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
+#ifndef INCLUDED_JFW_PLUGIN_GNUJRE_HXX
-#define  INCLUDED_JFW_PLUGIN_GNUJRE_HXX
+#define INCLUDED_JFW_PLUGIN_GNUJRE_HXX
 
 #include "vendorbase.hxx"
 #include "vendorlist.hxx"

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
+#ifndef INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
-#define  INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
+#define INCLUDED_JFW_PLUGIN_OTHERJRE_HXX
 
 #include "vendorbase.hxx"
 #include "vendorlist.hxx"

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
+#ifndef INCLUDED_JFW_PLUGIN_SUNJRE_HXX
-#define  INCLUDED_JFW_PLUGIN_SUNJRE_HXX
+#define INCLUDED_JFW_PLUGIN_SUNJRE_HXX
 
 #include "vendorbase.hxx"
 #include "vendorlist.hxx"

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"

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"

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"

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"

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>

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"

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
 {
 

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"

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

odk/examples/OLE/activex/SOComWindowPeer.h

@@ -37,7 +37,7 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined __SOCOMWINDOWPEER_H_
+#ifndef __SOCOMWINDOWPEER_H_
 #define __SOCOMWINDOWPEER_H_
 
 #if _MSC_VER > 1000

offapi/com/sun/star/deployment/DeploymentException.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_deployment_DeploymentException_idl
+#ifndef INCLUDED_com_sun_star_deployment_DeploymentException_idl
 #define INCLUDED_com_sun_star_deployment_DeploymentException_idl
 
 #include <com/sun/star/uno/Exception.idl>

offapi/com/sun/star/deployment/ExtensionManager.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
+#ifndef INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
 #define INCLUDED_com_sun_star_deployment_ExtensionManagerFactory_idl
 
 #include <com/sun/star/deployment/XExtensionManager.idl>

offapi/com/sun/star/deployment/LicenseException.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_LicenseException_idl
+#ifndef INCLUDED_com_sun_star_deployment_LicenseException_idl
 #define INCLUDED_com_sun_star_deployment_LicenseException_idl
 
 #include <com/sun/star/uno/Exception.idl>

offapi/com/sun/star/deployment/PackageRegistryBackend.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
+#ifndef INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
 #define INCLUDED_com_sun_star_deployment_PackageRegistryBackend_idl
 
 #include <com/sun/star/deployment/XPackageRegistry.idl>

offapi/com/sun/star/deployment/PlatformException.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_PlatformException_idl
+#ifndef INCLUDED_com_sun_star_deployment_PlatformException_idl
 #define INCLUDED_com_sun_star_deployment_PlatformException_idl
 
 #include <com/sun/star/uno/Exception.idl>

offapi/com/sun/star/deployment/XExtensionManager.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_deployment_XExtensionManager_idl
+#ifndef INCLUDED_com_sun_star_deployment_XExtensionManager_idl
 #define INCLUDED_com_sun_star_deployment_XExtensionManager_idl
 
 #include <com/sun/star/lang/XComponent.idl>

offapi/com/sun/star/deployment/XPackage.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_deployment_XPackage_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackage_idl
 #define INCLUDED_com_sun_star_deployment_XPackage_idl
 
 #include <com/sun/star/beans/Optional.idl>

offapi/com/sun/star/deployment/XPackageManager.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageManager_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageManager_idl
 #define INCLUDED_com_sun_star_deployment_XPackageManager_idl
 
 #include <com/sun/star/lang/XComponent.idl>

offapi/com/sun/star/deployment/XPackageManagerFactory.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
 #define INCLUDED_com_sun_star_deployment_XPackageManagerFactory_idl
 
 #include <com/sun/star/lang/IllegalArgumentException.idl>

offapi/com/sun/star/deployment/XPackageRegistry.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
 #define INCLUDED_com_sun_star_deployment_XPackageRegistry_idl
 
 #include <com/sun/star/deployment/XPackage.idl>

offapi/com/sun/star/deployment/XPackageTypeInfo.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
+#ifndef INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
 #define INCLUDED_com_sun_star_deployment_XPackageTypeInfo_idl
 
 #include <com/sun/star/uno/XInterface.idl>

offapi/com/sun/star/deployment/thePackageManagerFactory.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
+#ifndef INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
 #define INCLUDED_com_sun_star_deployment_thePackageManagerFactory_idl
 
 #include <com/sun/star/deployment/XPackageManagerFactory.idl>

offapi/com/sun/star/deployment/ui/LicenseDialog.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
+#ifndef INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
 #define INCLUDED_com_sun_star_deployment_ui_LicenseDialog_idl
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>

offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
+#ifndef INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
 #define INCLUDED_com_sun_star_deployment_ui_PackageManagerDialog_idl
 
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl>

offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
+#ifndef INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
 #define INCLUDED_com_sun_star_deployment_ui_UpdateRequiredDialog_idl
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.idl>

offapi/com/sun/star/rendering/CanvasFactory.idl

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#if ! defined INCLUDED_com_sun_star_rendering_CanvasFactory_idl
+#ifndef INCLUDED_com_sun_star_rendering_CanvasFactory_idl
 #define INCLUDED_com_sun_star_rendering_CanvasFactory_idl
 
 #include <com/sun/star/lang/XMultiComponentFactory.idl>

offapi/com/sun/star/security/CertificateContainer.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_security_CertificateContainer_idl
+#ifndef INCLUDED_com_sun_star_security_CertificateContainer_idl
 #define INCLUDED_com_sun_star_security_CertificateContainer_idl
 
 #include <com/sun/star/security/XCertificateContainer.idl>

offapi/com/sun/star/security/XCertificateContainer.idl

@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#if ! defined INCLUDED_com_sun_star_security_XCertificateContainer_idl
+#ifndef INCLUDED_com_sun_star_security_XCertificateContainer_idl
 #define INCLUDED_com_sun_star_security_XCertificateContainer_idl
 
 #include <com/sun/star/uno/XInterface.idl>

offapi/com/sun/star/task/XAbortChannel.idl

@@ -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_com_sun_star_task_XAbortChannel_idl
+#ifndef INCLUDED_com_sun_star_task_XAbortChannel_idl
 #define INCLUDED_com_sun_star_task_XAbortChannel_idl
 
 #include <com/sun/star/uno/XInterface.idl>

offapi/com/sun/star/ucb/ExpandContentProvider.idl

@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#if ! defined INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
+#ifndef INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
 #define INCLUDED_com_sun_star_ucb_ExpandContentProvider_idl
 
 #include <com/sun/star/ucb/ContentProvider.idl>

offapi/com/sun/star/xml/input/SaxDocumentHandler.idl

@@ -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__com_sun_star_xml_input_SaxDocumentHandler_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
 #define INCLUDED__com_sun_star_xml_input_SaxDocumentHandler_idl__
 
 #include <com/sun/star/xml/input/XRoot.idl>

offapi/com/sun/star/xml/input/XAttributes.idl

@@ -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__com_sun_star_xml_input_XAttributes_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_XAttributes_idl__
 #define INCLUDED__com_sun_star_xml_input_XAttributes_idl__
 
 #include <com/sun/star/uno/XInterface.idl>

offapi/com/sun/star/xml/input/XElement.idl

@@ -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__com_sun_star_xml_input_XElement_idl__
+#ifndef INCLUDED__com_sun_star_xml_input_XElement_idl__
 #define INCLUDED__com_sun_star_xml_input_XElement_idl__
 
 #include <com/sun/star/xml/input/XAttributes.idl>