mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify include guards

Browse Source 
Change-Id: Id4210229b20a1d54b680ff1a2ccbcdd3684ecf5f
This commit is contained in:
Thomas Arnhold 2012-07-14 05:37:24 +02:00
parent 5a7e8389f0
commit 1340890ccd
144 changed files with 155 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
View File

@ -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>

2
bridges/source/jni_uno/jni_base.h
View File

@ -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)

2
bridges/source/jni_uno/jni_bridge.h
View File

@ -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"

2
bridges/source/jni_uno/jni_helper.h
View File

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

2
bridges/source/jni_uno/jni_info.h
View File

@ -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>

2
chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
View File

@ -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"

2
chart2/source/model/main/ChartModel.hxx
View File

@ -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"

2
cli_ure/source/uno_bridge/cli_base.h
View File

@ -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

2
cli_ure/source/uno_bridge/cli_bridge.h
View File

@ -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"

2
cli_ure/source/uno_bridge/cli_environment.h
View File

@ -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"

2
comphelper/inc/comphelper/anytostring.hxx
View File

@ -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"

12
comphelper/inc/comphelper/implbase_var.hxx
View File

@ -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"

2
comphelper/inc/comphelper/make_shared_from_uno.hxx
View File

@ -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"

4
comphelper/inc/comphelper/makesequence.hxx
View File

@ -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

4
comphelper/inc/comphelper/optional.hxx
View File

@ -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 {

4
comphelper/inc/comphelper/scopeguard.hxx
View File

@ -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"

4
comphelper/inc/comphelper/servicedecl.hxx
View File

@ -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

8
comphelper/inc/comphelper/unwrapargs.hxx
View File

@ -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

2
cppu/inc/uno/dispatcher.hxx
View File

@ -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"

2
cppuhelper/inc/cppuhelper/unourl.hxx
View File

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

2
cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
View File

@ -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>

2
dbaccess/source/core/dataaccess/connection.hxx
View File

@ -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>

2
dbaccess/source/core/dataaccess/databasedocument.hxx
View File

@ -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>

2
desktop/inc/deployment.hrc
View File

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

2
desktop/source/deployment/gui/dp_gui.h
View File

@ -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"

2
desktop/source/deployment/gui/dp_gui.hrc
View File

@ -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"

2
desktop/source/deployment/gui/dp_gui_shared.hxx
View File

@ -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"

2
desktop/source/deployment/gui/dp_gui_updatedata.hxx
View File

@ -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"

2
desktop/source/deployment/inc/dp_interact.h
View File

@ -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"

2
desktop/source/deployment/inc/dp_misc.h
View File

@ -26,7 +26,7 @@
*
************************************************************************/
#if ! defined INCLUDED_DP_MISC_H
#ifndef INCLUDED_DP_MISC_H
#define INCLUDED_DP_MISC_H
#include "rtl/ustrbuf.hxx"

2
desktop/source/deployment/inc/dp_persmap.h
View File

@ -26,7 +26,7 @@
*
************************************************************************/
#if ! defined INCLUDED_DP_PERSMAP_H
#ifndef INCLUDED_DP_PERSMAP_H
#define INCLUDED_DP_PERSMAP_H
#include "rtl/ustring.hxx"

2
desktop/source/deployment/inc/dp_platform.hxx
View File

@ -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

2
desktop/source/deployment/inc/dp_resource.h
View File

@ -26,7 +26,7 @@
*
************************************************************************/
#if ! defined INCLUDED_DP_RESOURCE_H
#ifndef INCLUDED_DP_RESOURCE_H
#define INCLUDED_DP_RESOURCE_H
#include "tools/string.hxx"

2
desktop/source/deployment/inc/dp_ucb.h
View File

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

2
desktop/source/deployment/inc/dp_update.hxx
View File

@ -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

2
desktop/source/deployment/inc/dp_xml.h
View File

@ -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"

2
desktop/source/deployment/manager/dp_commandenvironments.hxx
View File

@ -26,7 +26,7 @@
*
************************************************************************/
#if ! defined INCLUDED_DP_COMMANDENVIRONMENTS_HXX
#ifndef INCLUDED_DP_COMMANDENVIRONMENTS_HXX
#define INCLUDED_DP_COMMANDENVIRONMENTS_HXX
#include "cppuhelper/compbase3.hxx"

2
desktop/source/deployment/manager/dp_extensionmanager.hxx
View File

@ -26,7 +26,7 @@
*
************************************************************************/
#if ! defined INCLUDED_DP_EXTENSIONMANAGER_H
#ifndef INCLUDED_DP_EXTENSIONMANAGER_H
#define INCLUDED_DP_EXTENSIONMANAGER_H
#include "dp_manager.hrc"

2
desktop/source/deployment/manager/dp_manager.h
View File

@ -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"

2
desktop/source/deployment/manager/dp_manager.hrc
View File

@ -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"

2
desktop/source/deployment/manager/dp_properties.hxx
View File

@ -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

2
desktop/source/deployment/registry/component/dp_compbackenddb.hxx
View File

@ -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"

2
desktop/source/deployment/registry/component/dp_component.hrc
View File

@ -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"

2
desktop/source/deployment/registry/configuration/dp_configuration.hrc
View File

@ -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"

2
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
View File

@ -26,7 +26,7 @@
*
************************************************************************/
#if ! defined INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
#ifndef INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
#define INCLUDED_DP_CONFIGURATIONBACKENDDB_HXX
#include "rtl/ustring.hxx"

2
desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
View File

@ -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"

2
desktop/source/deployment/registry/help/dp_help.hrc
View File

@ -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"

2
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
View File

@ -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"

2
desktop/source/deployment/registry/inc/dp_backend.h
View File

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

2
desktop/source/deployment/registry/inc/dp_backenddb.hxx
View File

@ -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"

2
desktop/source/deployment/registry/inc/dp_registry.hrc
View File

@ -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"

2
desktop/source/deployment/registry/package/dp_extbackenddb.hxx
View File

@ -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>

2
desktop/source/deployment/registry/package/dp_package.hrc
View File

@ -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"

2
desktop/source/deployment/registry/script/dp_lib_container.h
View File

@ -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>

2
desktop/source/deployment/registry/script/dp_script.hrc
View File

@ -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"

2
desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
View File

@ -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"

2
desktop/source/deployment/registry/sfwk/dp_sfwk.hrc
View File

@ -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"

2
desktop/source/inc/helpid.hrc
View File

@ -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"

2
extensions/source/activex/SOActionsApproval.h
View File

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

2
extensions/source/activex/SOComWindowPeer.h
View File

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

2
extensions/source/activex/SODispatchInterceptor.h
View File

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

2
jvmaccess/inc/jvmaccess/virtualmachine.hxx
View File

@ -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"

2
jvmfwk/inc/jvmfwk/framework.h
View File

@ -19,7 +19,7 @@
/** @HTML */
#if !defined INCLUDED_JVMFWK_FRAMEWORK_H
#ifndef INCLUDED_JVMFWK_FRAMEWORK_H
#define INCLUDED_JVMFWK_FRAMEWORK_H
#include "jvmfwkdllapi.h"

2
jvmfwk/inc/jvmfwk/vendorplugin.h
View File

@ -18,7 +18,7 @@
*/
/** @HTML */
#if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
#ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
#define INCLUDED_JVMFWK_VENDORPLUGIN_H
#include "jvmfwkplugindllapi.h"

4
jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
View File

@ -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"

4
jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
View File

@ -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"

4
jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
View File

@ -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"

2
jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
View File

@ -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"

2
jvmfwk/plugins/sunmajor/pluginlib/util.hxx
View File

@ -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"

2
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
View File

@ -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"

2
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
View File

@ -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"

2
jvmfwk/source/elements.hxx
View File

@ -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>

3
jvmfwk/source/framework.hxx
View File

@ -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"

4
jvmfwk/source/fwkbase.hxx
View File

@ -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
{

2
jvmfwk/source/fwkutil.hxx
View File

@ -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"

4
jvmfwk/source/libxmlutil.hxx
View File

@ -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

2
odk/examples/OLE/activex/SOComWindowPeer.h
View File

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

2
offapi/com/sun/star/deployment/DeploymentException.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/ExtensionManager.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/LicenseException.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/PackageRegistryBackend.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/PlatformException.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/XExtensionManager.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/XPackage.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/XPackageManager.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/XPackageManagerFactory.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/XPackageRegistry.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/XPackageTypeInfo.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/thePackageManagerFactory.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/ui/LicenseDialog.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/ui/PackageManagerDialog.idl
View File

@ -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>

2
offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl
View File

@ -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>

2
offapi/com/sun/star/rendering/CanvasFactory.idl
View File

@ -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>

2
offapi/com/sun/star/security/CertificateContainer.idl
View File

@ -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>

2
offapi/com/sun/star/security/XCertificateContainer.idl
View File

@ -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>

2
offapi/com/sun/star/task/XAbortChannel.idl
View File

@ -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>

2
offapi/com/sun/star/ucb/ExpandContentProvider.idl
View File

@ -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>

2
offapi/com/sun/star/xml/input/SaxDocumentHandler.idl
View File

@ -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>

2
offapi/com/sun/star/xml/input/XAttributes.idl
View File

@ -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>

2
offapi/com/sun/star/xml/input/XElement.idl
View File

@ -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>

Some files were not shown because too many files have changed in this diff Show More