diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-14 05:37:24 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-14 05:44:15 +0200 |
| commit | 1340890ccdff010c827a8e98eb2eaf1a2ec49a2d (patch) | |
| tree | 92cf2ad652a6a8366317b02129e510d0dc874c82 | |
| parent | hrc cleanup: Remove include guards from src files (diff) | |
| download | core-1340890ccdff010c827a8e98eb2eaf1a2ec49a2d.tar.gz core-1340890ccdff010c827a8e98eb2eaf1a2ec49a2d.zip | |
simplify include guards
Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f
144 files changed, 155 insertions, 173 deletions
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 6fc675ba5b15..f1557e16ec02 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/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> diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index e9345a32aacf..cb88d6212f35 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/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) diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h index a38c586faa13..4ab4d9681a9e 100644 --- a/bridges/source/jni_uno/jni_bridge.h +++ b/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" diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h index f124dd37b594..9110c20794fd 100644 --- a/bridges/source/jni_uno/jni_helper.h +++ b/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" diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index f890e49f898d..c4c154292bab 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/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> diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 1c34336cf96b..ee3a69017618 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/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" diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index 2febb5b472ce..30d0c315c215 100644 --- a/chart2/source/model/main/ChartModel.hxx +++ b/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" diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h index f734f2ea286a..e678f8e52855 100644 --- a/cli_ure/source/uno_bridge/cli_base.h +++ b/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 diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h index e8f78c875d07..7c451695d10b 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.h +++ b/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" diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h index e6601f539b80..683ad84a6081 100644 --- a/cli_ure/source/uno_bridge/cli_environment.h +++ b/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" diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx index 0fdedadfec05..ff34c02f18f3 100644 --- a/comphelper/inc/comphelper/anytostring.hxx +++ b/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" diff --git a/comphelper/inc/comphelper/implbase_var.hxx b/comphelper/inc/comphelper/implbase_var.hxx index 97e330b517cf..fee9eb695c08 100644 --- a/comphelper/inc/comphelper/implbase_var.hxx +++ b/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" diff --git a/comphelper/inc/comphelper/make_shared_from_uno.hxx b/comphelper/inc/comphelper/make_shared_from_uno.hxx index 290665fa4151..2a70094a3f94 100644 --- a/comphelper/inc/comphelper/make_shared_from_uno.hxx +++ b/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" diff --git a/comphelper/inc/comphelper/makesequence.hxx b/comphelper/inc/comphelper/makesequence.hxx index 36a1acf22326..bc35657db9a8 100644 --- a/comphelper/inc/comphelper/makesequence.hxx +++ b/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 diff --git a/comphelper/inc/comphelper/optional.hxx b/comphelper/inc/comphelper/optional.hxx index 197826d522f5..031a30328340 100644 --- a/comphelper/inc/comphelper/optional.hxx +++ b/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 { diff --git a/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx index dd77700f4580..5bc2aafaa781 100644 --- a/comphelper/inc/comphelper/scopeguard.hxx +++ b/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" diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx index ff2aaae8d9a4..442bf9f592f7 100644 --- a/comphelper/inc/comphelper/servicedecl.hxx +++ b/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 diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx index 30db738712ac..bdd8d769de4a 100644 --- a/comphelper/inc/comphelper/unwrapargs.hxx +++ b/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 diff --git a/cppu/inc/uno/dispatcher.hxx b/cppu/inc/uno/dispatcher.hxx index df5504f15438..4fb7cced4626 100644 --- a/cppu/inc/uno/dispatcher.hxx +++ b/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" diff --git a/cppuhelper/inc/cppuhelper/unourl.hxx b/cppuhelper/inc/cppuhelper/unourl.hxx index 3e3a61559598..6a9ccec5c4c9 100644 --- a/cppuhelper/inc/cppuhelper/unourl.hxx +++ b/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> diff --git a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl b/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl index 677de2d5759c..9238bc679d47 100644 --- a/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl +++ b/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> diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 90e17b23602d..8a2efc5b16cc 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/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> diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 552d348fab8a..5ffbb1876e10 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/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> 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" diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index a5570312864d..ab756e58c8c9 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -3,7 +3,7 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined __SODOCUMENTEVENTLISTENER_H_ +#ifndef __SODOCUMENTEVENTLISTENER_H_ #define __SODOCUMENTEVENTLISTENER_H_ #if _MSC_VER > 1000 diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index c819e17a81ea..c67e2811a0e4 100644 --- a/extensions/source/activex/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h @@ -3,7 +3,7 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined __SOCOMWINDOWPEER_H_ +#ifndef __SOCOMWINDOWPEER_H_ #define __SOCOMWINDOWPEER_H_ #if _MSC_VER > 1000 diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h index 538b12f24d2e..0a6cbd78353f 100644 --- a/extensions/source/activex/SODispatchInterceptor.h +++ b/extensions/source/activex/SODispatchInterceptor.h @@ -3,7 +3,7 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined __SODISPATCHINTERCEPTOR_H_ +#ifndef __SODISPATCHINTERCEPTOR_H_ #define __SODISPATCHINTERCEPTOR_H_ #if _MSC_VER > 1000 diff --git a/jvmaccess/inc/jvmaccess/virtualmachine.hxx b/jvmaccess/inc/jvmaccess/virtualmachine.hxx index 42891244046f..f425daed6a2a 100644 --- a/jvmaccess/inc/jvmaccess/virtualmachine.hxx +++ b/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" 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 diff --git a/odk/examples/OLE/activex/SOComWindowPeer.h b/odk/examples/OLE/activex/SOComWindowPeer.h index dfd39b5b1859..55c9dd3a5e14 100644 --- a/odk/examples/OLE/activex/SOComWindowPeer.h +++ b/odk/examples/OLE/activex/SOComWindowPeer.h @@ -37,7 +37,7 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined __SOCOMWINDOWPEER_H_ +#ifndef __SOCOMWINDOWPEER_H_ #define __SOCOMWINDOWPEER_H_ #if _MSC_VER > 1000 diff --git a/offapi/com/sun/star/deployment/DeploymentException.idl b/offapi/com/sun/star/deployment/DeploymentException.idl index b585362f8677..efdb7fc82528 100644 --- a/offapi/com/sun/star/deployment/DeploymentException.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/ExtensionManager.idl b/offapi/com/sun/star/deployment/ExtensionManager.idl index ff1e7b89b26b..b709de9441b1 100644 --- a/offapi/com/sun/star/deployment/ExtensionManager.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/LicenseException.idl b/offapi/com/sun/star/deployment/LicenseException.idl index 34aaae729996..a12fd1097476 100644 --- a/offapi/com/sun/star/deployment/LicenseException.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl b/offapi/com/sun/star/deployment/PackageRegistryBackend.idl index 329d8a2e08b1..176ece7f6e70 100644 --- a/offapi/com/sun/star/deployment/PackageRegistryBackend.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/PlatformException.idl b/offapi/com/sun/star/deployment/PlatformException.idl index 5aa16848f3ee..56d7c171a02b 100644 --- a/offapi/com/sun/star/deployment/PlatformException.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl index b4e41c0e368d..7744ea6d839e 100644 --- a/offapi/com/sun/star/deployment/XExtensionManager.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/XPackage.idl b/offapi/com/sun/star/deployment/XPackage.idl index 2489ad09af44..46bccc6fee2d 100644 --- a/offapi/com/sun/star/deployment/XPackage.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl index 12e7e0eac80c..65cb24a6ac0f 100644 --- a/offapi/com/sun/star/deployment/XPackageManager.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl b/offapi/com/sun/star/deployment/XPackageManagerFactory.idl index cafbcb168cce..358c1d4769ee 100644 --- a/offapi/com/sun/star/deployment/XPackageManagerFactory.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl index ca5926bd8884..5d1137926859 100644 --- a/offapi/com/sun/star/deployment/XPackageRegistry.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl b/offapi/com/sun/star/deployment/XPackageTypeInfo.idl index ade66264d563..218da4197f4d 100644 --- a/offapi/com/sun/star/deployment/XPackageTypeInfo.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl b/offapi/com/sun/star/deployment/thePackageManagerFactory.idl index f66a17484200..6df88db058aa 100644 --- a/offapi/com/sun/star/deployment/thePackageManagerFactory.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl b/offapi/com/sun/star/deployment/ui/LicenseDialog.idl index a7757f60a79d..347f1f4394f9 100644 --- a/offapi/com/sun/star/deployment/ui/LicenseDialog.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl b/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl index c09d9b5ea217..94e944da79f2 100644 --- a/offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl +++ b/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> diff --git a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl b/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl index 286f41d249e8..526860a01572 100644 --- a/offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl +++ b/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> diff --git a/offapi/com/sun/star/rendering/CanvasFactory.idl b/offapi/com/sun/star/rendering/CanvasFactory.idl index 15e497535afe..742a517419f8 100644 --- a/offapi/com/sun/star/rendering/CanvasFactory.idl +++ b/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> diff --git a/offapi/com/sun/star/security/CertificateContainer.idl b/offapi/com/sun/star/security/CertificateContainer.idl index a252acf303a7..6fede996fe7c 100644 --- a/offapi/com/sun/star/security/CertificateContainer.idl +++ b/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> diff --git a/offapi/com/sun/star/security/XCertificateContainer.idl b/offapi/com/sun/star/security/XCertificateContainer.idl index c05c01acb9c5..ca9a10480fae 100644 --- a/offapi/com/sun/star/security/XCertificateContainer.idl +++ b/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> diff --git a/offapi/com/sun/star/task/XAbortChannel.idl b/offapi/com/sun/star/task/XAbortChannel.idl index 2fdb7cae53b7..921ae63ce59f 100644 --- a/offapi/com/sun/star/task/XAbortChannel.idl +++ b/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> diff --git a/offapi/com/sun/star/ucb/ExpandContentProvider.idl b/offapi/com/sun/star/ucb/ExpandContentProvider.idl index 24da146809ef..9b881360cca3 100644 --- a/offapi/com/sun/star/ucb/ExpandContentProvider.idl +++ b/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> diff --git a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl b/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl index 7f368fbc7a28..a39c970b1ac0 100644 --- a/offapi/com/sun/star/xml/input/SaxDocumentHandler.idl +++ b/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> diff --git a/offapi/com/sun/star/xml/input/XAttributes.idl b/offapi/com/sun/star/xml/input/XAttributes.idl index 96900e87c490..b5c78cbf0f5c 100644 --- a/offapi/com/sun/star/xml/input/XAttributes.idl +++ b/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> diff --git a/offapi/com/sun/star/xml/input/XElement.idl b/offapi/com/sun/star/xml/input/XElement.idl index 92966535d214..f7f1517b2527 100644 --- a/offapi/com/sun/star/xml/input/XElement.idl +++ b/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> diff --git a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl index a23ee29be2a3..ad15ac4348d6 100644 --- a/offapi/com/sun/star/xml/input/XNamespaceMapping.idl +++ b/offapi/com/sun/star/xml/input/XNamespaceMapping.idl @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_com_sun_star_sax_input_XUidMapping_idl +#ifndef INCLUDED_com_sun_star_sax_input_XUidMapping_idl #define INCLUDED_com_sun_star_sax_input_XUidMapping_idl #include <com/sun/star/container/NoSuchElementException.idl> diff --git a/offapi/com/sun/star/xml/input/XRoot.idl b/offapi/com/sun/star/xml/input/XRoot.idl index 3b4a814c1579..cbda471531cf 100644 --- a/offapi/com/sun/star/xml/input/XRoot.idl +++ b/offapi/com/sun/star/xml/input/XRoot.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_XRoot_idl__ +#ifndef INCLUDED__com_sun_star_xml_input_XRoot_idl__ #define INCLUDED__com_sun_star_xml_input_XRoot_idl__ #include <com/sun/star/xml/input/XNamespaceMapping.idl> diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index deedb7d0eb2b..3d5126464fa3 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -52,7 +52,7 @@ #include <cppuhelper/propertysetmixin.hxx> #include <svx/unomod.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> diff --git a/sal/inc/osl/doublecheckedlocking.h b/sal/inc/osl/doublecheckedlocking.h index 7dbabf792bb2..64b07d46cd6c 100644 --- a/sal/inc/osl/doublecheckedlocking.h +++ b/sal/inc/osl/doublecheckedlocking.h @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined INCLUDED_OSL_DOUBLECHECKEDLOCKING_H +#ifndef INCLUDED_OSL_DOUBLECHECKEDLOCKING_H #define INCLUDED_OSL_DOUBLECHECKEDLOCKING_H #if defined __cplusplus diff --git a/sal/inc/osl/getglobalmutex.hxx b/sal/inc/osl/getglobalmutex.hxx index 0dcedecbbe9d..4fbd32a3e4b5 100644 --- a/sal/inc/osl/getglobalmutex.hxx +++ b/sal/inc/osl/getglobalmutex.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined INCLUDED_OSL_GETGLOBALMUTEX_HXX +#ifndef INCLUDED_OSL_GETGLOBALMUTEX_HXX #define INCLUDED_OSL_GETGLOBALMUTEX_HXX #include "osl/mutex.hxx" diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx index 36bbd0036685..2aa9e2a68c5d 100644 --- a/sal/inc/rtl/allocator.hxx +++ b/sal/inc/rtl/allocator.hxx @@ -25,16 +25,11 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#if !defined INCLUDED_RTL_ALLOCATOR_HXX +#ifndef INCLUDED_RTL_ALLOCATOR_HXX #define INCLUDED_RTL_ALLOCATOR_HXX -#if ! defined(_SAL_TYPES_H_) #include "sal/types.h" -#endif -#if ! defined(_RTL_ALLOC_H_) #include "rtl/alloc.h" -#endif - #include <cstddef> /// @cond INTERNAL diff --git a/sal/inc/rtl/instance.hxx b/sal/inc/rtl/instance.hxx index 9520dacfd16a..85d7306ac80d 100644 --- a/sal/inc/rtl/instance.hxx +++ b/sal/inc/rtl/instance.hxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#if !defined INCLUDED_RTL_INSTANCE_HXX +#ifndef INCLUDED_RTL_INSTANCE_HXX #define INCLUDED_RTL_INSTANCE_HXX #include "osl/doublecheckedlocking.h" diff --git a/sal/inc/rtl/math.h b/sal/inc/rtl/math.h index 77f29b129b23..4b34b13ac5f3 100644 --- a/sal/inc/rtl/math.h +++ b/sal/inc/rtl/math.h @@ -26,7 +26,7 @@ * ************************************************************************/ -#if !defined INCLUDED_RTL_MATH_H +#ifndef INCLUDED_RTL_MATH_H #define INCLUDED_RTL_MATH_H #include "rtl/ustring.h" diff --git a/sal/inc/rtl/math.hxx b/sal/inc/rtl/math.hxx index 40eba502ef9a..47814bfdfea6 100644 --- a/sal/inc/rtl/math.hxx +++ b/sal/inc/rtl/math.hxx @@ -26,7 +26,7 @@ * ************************************************************************/ -#if !defined INCLUDED_RTL_MATH_HXX +#ifndef INCLUDED_RTL_MATH_HXX #define INCLUDED_RTL_MATH_HXX #include "rtl/math.h" diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h index 35d7bff2011d..9a046c5f0f3e 100644 --- a/sal/inc/sal/mathconf.h +++ b/sal/inc/sal/mathconf.h @@ -26,7 +26,7 @@ * ************************************************************************/ -#if !defined INCLUDED_SAL_MATHCONF_H +#ifndef INCLUDED_SAL_MATHCONF_H #define INCLUDED_SAL_MATHCONF_H #include "osl/endian.h" diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 0120b134f874..bdb5d6a5c7b7 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -87,7 +87,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> //________________________________________________________________________________________________________ -#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32) +#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32 #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32 #include <comphelper/implbase_var.hxx> diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index bae70af8f9c2..5aee577fcc54 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX +#ifndef INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX #define INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX #include "com/sun/star/beans/XPropertyChangeListener.hpp" diff --git a/slideshow/source/engine/transitions/barndoorwipe.hxx b/slideshow/source/engine/transitions/barndoorwipe.hxx index 8ec1fa8beda7..95f4fda234e8 100644 --- a/slideshow/source/engine/transitions/barndoorwipe.hxx +++ b/slideshow/source/engine/transitions/barndoorwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX #define INCLUDED_SLIDESHOW_BARNDOORWIPE_HXX #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.hxx b/slideshow/source/engine/transitions/barwipepolypolygon.hxx index ad55485befde..450885b9a444 100644 --- a/slideshow/source/engine/transitions/barwipepolypolygon.hxx +++ b/slideshow/source/engine/transitions/barwipepolypolygon.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX +#ifndef INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX #define INCLUDED_SLIDESHOW_BARWIPEPOLYPOLYGON_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/boxwipe.hxx b/slideshow/source/engine/transitions/boxwipe.hxx index 4f1e8b3a39f4..bbc37ed67182 100644 --- a/slideshow/source/engine/transitions/boxwipe.hxx +++ b/slideshow/source/engine/transitions/boxwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_BOXWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_BOXWIPE_HXX #define INCLUDED_SLIDESHOW_BOXWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/checkerboardwipe.hxx b/slideshow/source/engine/transitions/checkerboardwipe.hxx index f442622d3f6c..b2e01083c1f4 100644 --- a/slideshow/source/engine/transitions/checkerboardwipe.hxx +++ b/slideshow/source/engine/transitions/checkerboardwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX #define INCLUDED_SLIDESHOW_CHECKERBOARDWIPE_HXX #include <osl/diagnose.h> diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx index abfdf9a6c52d..ceba88aad277 100644 --- a/slideshow/source/engine/transitions/clippingfunctor.hxx +++ b/slideshow/source/engine/transitions/clippingfunctor.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_CLIPPINGFUNCTOR_HXX +#ifndef INCLUDED_SLIDESHOW_CLIPPINGFUNCTOR_HXX #define INCLUDED_SLIDESHOW_CLIPPINGFUNCTOR_HXX #include <basegfx/numeric/ftools.hxx> diff --git a/slideshow/source/engine/transitions/clockwipe.hxx b/slideshow/source/engine/transitions/clockwipe.hxx index 717ffab941ac..5ca00f87439a 100644 --- a/slideshow/source/engine/transitions/clockwipe.hxx +++ b/slideshow/source/engine/transitions/clockwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_CLOCKWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_CLOCKWIPE_HXX #define INCLUDED_SLIDESHOW_CLOCKWIPE_HXX #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx index 151a4b1643e4..50b551f8ba60 100644 --- a/slideshow/source/engine/transitions/doublediamondwipe.hxx +++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX #define INCLUDED_SLIDESHOW_DOUBLEDIAMONDWIPE_HXX #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/slideshow/source/engine/transitions/ellipsewipe.hxx b/slideshow/source/engine/transitions/ellipsewipe.hxx index b64969184927..de84696c815e 100644 --- a/slideshow/source/engine/transitions/ellipsewipe.hxx +++ b/slideshow/source/engine/transitions/ellipsewipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX #define INCLUDED_SLIDESHOW_ELLIPSEWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/fanwipe.hxx b/slideshow/source/engine/transitions/fanwipe.hxx index 49f9381e70b4..880900143bea 100644 --- a/slideshow/source/engine/transitions/fanwipe.hxx +++ b/slideshow/source/engine/transitions/fanwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_FANWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_FANWIPE_HXX #define INCLUDED_SLIDESHOW_FANWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/figurewipe.hxx b/slideshow/source/engine/transitions/figurewipe.hxx index f24e10f3f187..7d6810237eea 100644 --- a/slideshow/source/engine/transitions/figurewipe.hxx +++ b/slideshow/source/engine/transitions/figurewipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_FIGUREWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_FIGUREWIPE_HXX #define INCLUDED_SLIDESHOW_FIGUREWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/fourboxwipe.hxx b/slideshow/source/engine/transitions/fourboxwipe.hxx index 4c8bff478de1..10bbdb598d56 100644 --- a/slideshow/source/engine/transitions/fourboxwipe.hxx +++ b/slideshow/source/engine/transitions/fourboxwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX #define INCLUDED_SLIDESHOW_FOURBOXWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/iriswipe.hxx b/slideshow/source/engine/transitions/iriswipe.hxx index 932c48cabbec..6dbdd328d044 100644 --- a/slideshow/source/engine/transitions/iriswipe.hxx +++ b/slideshow/source/engine/transitions/iriswipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_IRISWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_IRISWIPE_HXX #define INCLUDED_SLIDESHOW_IRISWIPE_HXX #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx index 4aad8ad41469..bc7784a05db0 100644 --- a/slideshow/source/engine/transitions/pinwheelwipe.hxx +++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX #define INCLUDED_SLIDESHOW_PINWHEELWIPE_HXX #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx index 54e4e209d7db..f4b7d30f52c2 100644 --- a/slideshow/source/engine/transitions/randomwipe.hxx +++ b/slideshow/source/engine/transitions/randomwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_RANDOMWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_RANDOMWIPE_HXX #define INCLUDED_SLIDESHOW_RANDOMWIPE_HXX #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx index 6d39d98c6913..56e354069421 100644 --- a/slideshow/source/engine/transitions/snakewipe.hxx +++ b/slideshow/source/engine/transitions/snakewipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_SNAKEWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_SNAKEWIPE_HXX #define INCLUDED_SLIDESHOW_SNAKEWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx index 5ca67b35c4d2..9263b4b6c098 100644 --- a/slideshow/source/engine/transitions/spiralwipe.hxx +++ b/slideshow/source/engine/transitions/spiralwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_SPIRALWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_SPIRALWIPE_HXX #define INCLUDED_SLIDESHOW_SPIRALWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/sweepwipe.hxx b/slideshow/source/engine/transitions/sweepwipe.hxx index e18201441bda..90990ce15542 100644 --- a/slideshow/source/engine/transitions/sweepwipe.hxx +++ b/slideshow/source/engine/transitions/sweepwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_SWEEPWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_SWEEPWIPE_HXX #define INCLUDED_SLIDESHOW_SWEEPWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx index ad09cc3b2594..62fc7ab7ed15 100644 --- a/slideshow/source/engine/transitions/veewipe.hxx +++ b/slideshow/source/engine/transitions/veewipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_VEEWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_VEEWIPE_HXX #define INCLUDED_SLIDESHOW_VEEWIPE_HXX #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/slideshow/source/engine/transitions/waterfallwipe.hxx b/slideshow/source/engine/transitions/waterfallwipe.hxx index 10077d082d37..ae1fbbe01a65 100644 --- a/slideshow/source/engine/transitions/waterfallwipe.hxx +++ b/slideshow/source/engine/transitions/waterfallwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX #define INCLUDED_SLIDESHOW_WATERFALLWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/transitions/zigzagwipe.hxx b/slideshow/source/engine/transitions/zigzagwipe.hxx index 15e2efe0f81b..b051d6dc9b73 100644 --- a/slideshow/source/engine/transitions/zigzagwipe.hxx +++ b/slideshow/source/engine/transitions/zigzagwipe.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX +#ifndef INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX #define INCLUDED_SLIDESHOW_ZIGZAGWIPE_HXX #include "parametricpolypolygon.hxx" diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx index 636ead6c663e..d1d477857ea2 100644 --- a/slideshow/source/engine/waitsymbol.hxx +++ b/slideshow/source/engine/waitsymbol.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined(WAITSYMBOL_HXX_INCLUDED) +#ifndef WAITSYMBOL_HXX_INCLUDED #define WAITSYMBOL_HXX_INCLUDED #include <com/sun/star/rendering/XBitmap.hpp> diff --git a/slideshow/source/inc/transitioninfo.hxx b/slideshow/source/inc/transitioninfo.hxx index 54965c8c0e77..486462f36a1c 100644 --- a/slideshow/source/inc/transitioninfo.hxx +++ b/slideshow/source/inc/transitioninfo.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_SLIDESHOW_TRANSITIONINFO_HXX +#ifndef INCLUDED_SLIDESHOW_TRANSITIONINFO_HXX #define INCLUDED_SLIDESHOW_TRANSITIONINFO_HXX #include <sal/types.h> diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx index 794d1273d5de..ed1f4e343dbb 100644 --- a/stoc/source/javavm/interact.hxx +++ b/stoc/source/javavm/interact.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined INCLUDED_STOC_JAVAVM_INTERACT_HXX +#ifndef INCLUDED_STOC_JAVAVM_INTERACT_HXX #define INCLUDED_STOC_JAVAVM_INTERACT_HXX #include "com/sun/star/task/XInteractionRequest.hpp" diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index 19768bf0d67e..913106aa42c7 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined INCLUDED_STOC_JAVAVM_JAVAVM_HXX +#ifndef INCLUDED_STOC_JAVAVM_JAVAVM_HXX #define INCLUDED_STOC_JAVAVM_JAVAVM_HXX #include "jvmargs.hxx" diff --git a/svtools/inc/svtools/textwindowpeer.hxx b/svtools/inc/svtools/textwindowpeer.hxx index 46c08a9eb5a0..21de95eaa89c 100644 --- a/svtools/inc/svtools/textwindowpeer.hxx +++ b/svtools/inc/svtools/textwindowpeer.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if !defined INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX +#ifndef INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX #define INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX #include "svtools/svtdllapi.h" diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 1cf98bae02e3..042c16a3aebe 100644 --- a/svx/inc/svx/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -56,7 +56,7 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase10.hxx> -#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19) +#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19 #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_19 #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 19 #include <comphelper/implbase_var.hxx> diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 9d1bef749393..8e96357ed8bc 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -84,7 +84,7 @@ #include <cppuhelper/propshlp.hxx> #include <vcl/timer.hxx> -#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> diff --git a/vcl/inc/vcl/threadex.hxx b/vcl/inc/vcl/threadex.hxx index c5333d847fa1..7523c6def94f 100644 --- a/vcl/inc/vcl/threadex.hxx +++ b/vcl/inc/vcl/threadex.hxx @@ -31,9 +31,7 @@ #include <tools/link.hxx> #include <vcl/dllapi.h> -#if ! defined(_CPPUHELPER_EXC_HLP_HXX_) #include "cppuhelper/exc_hlp.hxx" -#endif #include "boost/optional.hpp" #include <memory> diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx index 267cec5b53de..6c04f4b8775c 100644 --- a/xmlscript/source/inc/misc.hxx +++ b/xmlscript/source/inc/misc.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_XMLSCRIPT_MISC_HXX +#ifndef INCLUDED_XMLSCRIPT_MISC_HXX #define INCLUDED_XMLSCRIPT_MISC_HXX #include "com/sun/star/uno/Any.hxx" diff --git a/xmlscript/source/inc/xml_import.hxx b/xmlscript/source/inc/xml_import.hxx index 96e7bfc48abc..a0373bc433f6 100644 --- a/xmlscript/source/inc/xml_import.hxx +++ b/xmlscript/source/inc/xml_import.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 _XMLSCRIPT_XML_IMPORT_HXX_ +#ifndef _XMLSCRIPT_XML_IMPORT_HXX_ #define _XMLSCRIPT_XML_IMPORT_HXX_ #include <osl/mutex.hxx> diff --git a/xmlscript/source/xmldlg_imexp/common.hxx b/xmlscript/source/xmldlg_imexp/common.hxx index 07de3238b633..2c73caa6233d 100644 --- a/xmlscript/source/xmldlg_imexp/common.hxx +++ b/xmlscript/source/xmldlg_imexp/common.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_COMMON_HXX +#ifndef INCLUDED_COMMON_HXX #define INCLUDED_COMMON_HXX #include "sal/types.h" diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc index 32147b11a9e3..cafa66eb0792 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if ! defined INCLUDED_DIGITALSIGNATURESDIALOG_HRC +#ifndef INCLUDED_DIGITALSIGNATURESDIALOG_HRC #define INCLUDED_DIGITALSIGNATURESDIALOG_HRC //global.hrc in xmlsecurity/inc starts at 1000 |