[ooo-build-commit] .: 2 commits - bridges/inc bridges/source cppuhelper/inc cppuhelper/source cppu/inc cppu/source cpputools/source idlc/inc idlc/source jvmfwk/plugins rdbmaker/inc rdbmaker/source registry/source salhelper/inc salhelper/source sal/inc sal/osl sal/qa sal/rtl sal/workben stoc/source stoc/test store/source
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Oct 5 10:13:29 PDT 2010
bridges/inc/bridges/cpp_uno/bridge.hxx | 2 --
bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx | 2 --
bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx | 2 --
bridges/source/remote/urp/urp_bridgeimpl.hxx | 6 ------
bridges/source/remote/urp/urp_property.hxx | 2 --
bridges/source/remote/urp/urp_propertyobject.hxx | 4 ----
bridges/source/remote/urp/urp_unmarshal.hxx | 2 --
cppu/inc/com/sun/star/uno/Reference.hxx | 2 --
cppu/inc/typelib/typedescription.hxx | 2 --
cppu/source/uno/prim.hxx | 6 ------
cppuhelper/inc/cppuhelper/component.hxx | 2 --
cppuhelper/inc/cppuhelper/factory.hxx | 2 --
cppuhelper/inc/cppuhelper/weak.hxx | 2 --
cppuhelper/source/factory.cxx | 2 --
cppuhelper/source/weak.cxx | 4 ----
idlc/inc/idlc/options.hxx | 2 --
idlc/source/astdump.cxx | 2 --
idlc/source/astscope.cxx | 2 --
idlc/source/aststruct.cxx | 2 --
rdbmaker/inc/codemaker/dependency.hxx | 2 --
rdbmaker/source/codemaker/global.cxx | 2 --
rdbmaker/source/rdbmaker/rdbmaker.cxx | 2 --
rdbmaker/source/rdbmaker/typeblop.cxx | 2 --
registry/source/regimpl.cxx | 4 ----
sal/inc/rtl/string.hxx | 2 --
sal/inc/rtl/ustrbuf.hxx | 2 --
sal/inc/rtl/ustring.hxx | 2 --
sal/osl/os2/file.cxx | 8 --------
sal/osl/os2/file_path_helper.hxx | 2 --
sal/osl/os2/file_url.cxx | 16 ----------------
sal/osl/os2/process_impl.cxx | 4 ----
sal/osl/unx/file_path_helper.hxx | 2 --
sal/osl/unx/process_impl.cxx | 4 ----
sal/qa/osl/pipe/osl_Pipe.cxx | 6 ------
sal/qa/osl/process/osl_Thread.cxx | 8 --------
sal/qa/osl/socket/osl_Socket.cxx | 2 --
sal/qa/osl/socket/sockethelper.hxx | 8 --------
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 4 ----
sal/qa/rtl_strings/rtl_old_testostring.cxx | 2 --
sal/qa/rtl_strings/rtl_old_testowstring.cxx | 4 ----
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx | 4 ----
sal/rtl/source/logfile.cxx | 4 ----
sal/workben/clipboardwben/testcopy/XTDataObject.cxx | 2 --
salhelper/inc/salhelper/queue.hxx | 2 --
stoc/source/corereflection/crefl.cxx | 2 --
stoc/source/defaultregistry/defaultregistry.cxx | 4 ----
stoc/source/implementationregistration/implreg.cxx | 4 ----
stoc/source/invocation/invocation.cxx | 4 ----
stoc/source/loader/dllcomponentloader.cxx | 2 --
stoc/source/namingservice/namingservice.cxx | 2 --
stoc/source/registry_tdprovider/base.hxx | 2 --
stoc/source/servicemanager/servicemanager.cxx | 4 ----
stoc/source/simpleregistry/simpleregistry.cxx | 4 ----
stoc/source/tdmanager/tdmgr.cxx | 4 ----
stoc/test/testloader.cxx | 2 --
store/source/lockbyte.hxx | 10 ----------
store/source/object.hxx | 6 ------
store/source/stordir.cxx | 18 ------------------
store/source/stordir.hxx | 14 --------------
59 files changed, 232 deletions(-)
New commits:
commit d508c714b83228b8326fed75bb103ddd9c36f45a
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 15:55:27 2010 +0200
more removed include guards using fixguard.py
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index d8f92d2..71c8f2a 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -27,9 +27,7 @@
#ifndef _BRIDGES_CPP_UNO_BRIDGE_HXX_
#define _BRIDGES_CPP_UNO_BRIDGE_HXX_
-#ifndef _BRIDGES_CPP_UNO_BRIDGE_H_
#include <bridges/cpp_uno/bridge.h>
-#endif
#include <osl/mutex.hxx>
#include <rtl/process.h>
#include <rtl/ustrbuf.hxx>
diff --git a/bridges/source/remote/urp/urp_bridgeimpl.hxx b/bridges/source/remote/urp/urp_bridgeimpl.hxx
index 16d9b18..6b749c4 100644
--- a/bridges/source/remote/urp/urp_bridgeimpl.hxx
+++ b/bridges/source/remote/urp/urp_bridgeimpl.hxx
@@ -33,19 +33,13 @@
#include <rtl/ustring.hxx>
#include <rtl/byteseq.hxx>
-#ifndef _UNO_THREADPOOL_H_
#include <uno/threadpool.h>
-#endif
#include <bridges/remote/bridgeimpl.hxx>
-#ifndef _URP_CACHE_HXX_
#include "urp_cache.hxx"
-#endif
#include "urp_marshal_decl.hxx"
-#ifndef _URP_REPLYCONTAINER_HXX_
#include "urp_replycontainer.hxx"
-#endif
#include "urp_property.hxx"
diff --git a/bridges/source/remote/urp/urp_property.hxx b/bridges/source/remote/urp/urp_property.hxx
index 779f76f..1eda5c6 100644
--- a/bridges/source/remote/urp/urp_property.hxx
+++ b/bridges/source/remote/urp/urp_property.hxx
@@ -26,9 +26,7 @@
************************************************************************/
#ifndef _URP_PROPERTY_HXX_
#define _URP_PROPERTY_HXX_
-#ifndef _BRIDGES_REMOTE_REMOTE_H_
#include <bridges/remote/remote.h>
-#endif
#include <rtl/ustring.hxx>
#include <rtl/byteseq.hxx>
diff --git a/bridges/source/remote/urp/urp_propertyobject.hxx b/bridges/source/remote/urp/urp_propertyobject.hxx
index 96825b5..8b74002 100644
--- a/bridges/source/remote/urp/urp_propertyobject.hxx
+++ b/bridges/source/remote/urp/urp_propertyobject.hxx
@@ -28,15 +28,11 @@
#include <osl/interlck.h>
#include <osl/mutex.hxx>
-#ifndef _OSL_CONDITN_H_
#include <osl/conditn.h>
-#endif
#include <rtl/string.hxx>
#include <uno/sequence2.h>
-#ifndef _BRIDGES_REMOTE_REMOTE_H_
#include <bridges/remote/remote.h>
-#endif
#include "urp_property.hxx"
namespace bridges_urp {
diff --git a/bridges/source/remote/urp/urp_unmarshal.hxx b/bridges/source/remote/urp/urp_unmarshal.hxx
index f7f99a9..193cfe3 100644
--- a/bridges/source/remote/urp/urp_unmarshal.hxx
+++ b/bridges/source/remote/urp/urp_unmarshal.hxx
@@ -33,9 +33,7 @@
#include <rtl/ustrbuf.hxx>
#include <bridges/remote/context.h>
-#ifndef _BRIDGES_REMOTE_HELPER_HXX_
#include <bridges/remote/helper.hxx>
-#endif
#include <com/sun/star/uno/Type.hxx>
#include "urp_bridgeimpl.hxx"
diff --git a/cppu/inc/com/sun/star/uno/Reference.hxx b/cppu/inc/com/sun/star/uno/Reference.hxx
index 9f1cc5a..679155d 100644
--- a/cppu/inc/com/sun/star/uno/Reference.hxx
+++ b/cppu/inc/com/sun/star/uno/Reference.hxx
@@ -29,9 +29,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/RuntimeException.hpp>
-#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HDL_
#include <com/sun/star/uno/XInterface.hdl>
-#endif
#include <com/sun/star/uno/genfunc.hxx>
namespace com
diff --git a/cppu/inc/typelib/typedescription.hxx b/cppu/inc/typelib/typedescription.hxx
index 5efbcc0..35ece54 100644
--- a/cppu/inc/typelib/typedescription.hxx
+++ b/cppu/inc/typelib/typedescription.hxx
@@ -30,9 +30,7 @@
#include <rtl/alloc.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Type.h>
-#ifndef _TYPELIB_TYPEDESCRIPTION_H
#include <typelib/typedescription.h>
-#endif
namespace com
diff --git a/cppu/source/uno/prim.hxx b/cppu/source/uno/prim.hxx
index f85b1fd..d322860 100644
--- a/cppu/source/uno/prim.hxx
+++ b/cppu/source/uno/prim.hxx
@@ -28,22 +28,16 @@
#define PRIM_HXX
#include "typelib/typedescription.h"
-#ifndef _typelib_TypeClass_H_
#include "typelib/typeclass.h"
-#endif
#include "uno/sequence2.h"
#include "uno/any2.h"
#include "uno/data.h"
#include "uno/mapping.h"
#include "uno/dispatcher.h"
-#ifndef _OSL_INTERLCK_H
#include "osl/interlck.h"
-#endif
#include "osl/diagnose.h"
-#ifndef _RTL_USTRING_HXX
#include "rtl/ustring.hxx"
-#endif
#include "rtl/alloc.h"
#if OSL_DEBUG_LEVEL > 1
diff --git a/cppuhelper/inc/cppuhelper/access_control.hxx b/cppuhelper/inc/cppuhelper/access_control.hxx
old mode 100755
new mode 100644
diff --git a/cppuhelper/inc/cppuhelper/component.hxx b/cppuhelper/inc/cppuhelper/component.hxx
index aab6845..c0738b9 100644
--- a/cppuhelper/inc/cppuhelper/component.hxx
+++ b/cppuhelper/inc/cppuhelper/component.hxx
@@ -31,9 +31,7 @@
#include <cppuhelper/weakagg.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
diff --git a/cppuhelper/inc/cppuhelper/factory.hxx b/cppuhelper/inc/cppuhelper/factory.hxx
index 4320acb..9337eaf 100644
--- a/cppuhelper/inc/cppuhelper/factory.hxx
+++ b/cppuhelper/inc/cppuhelper/factory.hxx
@@ -27,9 +27,7 @@
#ifndef _CPPUHELPER_FACTORY_HXX_
#define _CPPUHELPER_FACTORY_HXX_
-#ifndef _RTL_STRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <uno/dispatcher.h>
#include <rtl/unload.h>
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx b/cppuhelper/inc/cppuhelper/weak.hxx
index ddb327c..f343810 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -31,9 +31,7 @@
#include <rtl/alloc.h>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/queryinterface.hxx>
-#ifndef _COM_SUN_STAR_UNO_WEAK_HPP_
#include <com/sun/star/uno/XWeak.hpp>
-#endif
namespace cppu
diff --git a/idlc/inc/idlc/options.hxx b/idlc/inc/idlc/options.hxx
index d6ef3aa..9221dad 100644
--- a/idlc/inc/idlc/options.hxx
+++ b/idlc/inc/idlc/options.hxx
@@ -28,9 +28,7 @@
#ifndef _IDLC_OPTIONS_HXX_
#define _IDLC_OPTIONS_HXX_
-#ifndef _IDLC_IDLCTYPEs_HXX_
#include <idlc/idlctypes.hxx>
-#endif
typedef ::std::hash_map< ::rtl::OString,
::rtl::OString,
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index 5b6d524..8f2d69f 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -30,9 +30,7 @@
#include <hash_map>
#include <registry/registry.hxx>
-#ifndef __REGISTRY_REFLREAD_HXX__
#include <registry/reflread.hxx>
-#endif
#include <codemaker/typemanager.hxx>
#include <codemaker/global.hxx>
#include <osl/diagnose.h>
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 81da2cf..9add6ea 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -30,9 +30,7 @@
#ifdef __cplusplus
-#ifndef _RTL_DIAGNOSE_H_
#include <osl/diagnose.h>
-#endif
#include <rtl/memory.h>
#include <rtl/textenc.h>
#include <rtl/string.h>
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 29f1090..235638a 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -30,9 +30,7 @@
#include <osl/diagnose.h>
#include <rtl/ustrbuf.h>
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
#ifdef __cplusplus
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index df6fb8a..2754836 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -30,9 +30,7 @@
#ifdef __cplusplus
-#ifndef _RTL_DIAGNOSE_H_
#include "osl/diagnose.h"
-#endif
#include <rtl/ustring.h>
#include <rtl/string.hxx>
#include <rtl/memory.h>
diff --git a/sal/osl/os2/file_path_helper.hxx b/sal/osl/os2/file_path_helper.hxx
index 4cde261..144391c 100644
--- a/sal/osl/os2/file_path_helper.hxx
+++ b/sal/osl/os2/file_path_helper.hxx
@@ -29,9 +29,7 @@
#define _OSL_FILE_PATH_HELPER_HXX_
-#ifndef _OSL_FILE_PATH_HELPER_H_
#include "file_path_helper.h"
-#endif
#include <rtl/ustring.hxx>
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index a5283b8..b93bdcb 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -29,9 +29,7 @@
#define _OSL_FILE_PATH_HELPER_HXX_
-#ifndef _OSL_FILE_PATH_HELPER_H_
#include "file_path_helper.h"
-#endif
#include <rtl/ustring.hxx>
diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx
index 1840597..993e31d 100644
--- a/sal/qa/osl/socket/sockethelper.hxx
+++ b/sal/qa/osl/socket/sockethelper.hxx
@@ -37,22 +37,14 @@
#include <rtl/ustring.hxx>
#include <rtl/ustring.h>
-#ifndef _OSL_SOCLET_HXX_
#include <osl/socket.hxx>
-#endif
#include <osl/socket.h>
-#ifndef _OSL_THREAD_HXX
#include <osl/thread.hxx>
-#endif
-#ifndef _OSL_FILE_HXX
#include <osl/file.hxx>
-#endif
-#ifndef _OSL_MUTEX_HXX
#include <osl/mutex.hxx>
-#endif
#include <osl/time.h>
#ifdef __cplusplus
diff --git a/salhelper/inc/salhelper/queue.hxx b/salhelper/inc/salhelper/queue.hxx
index a2ded2d..709f45d 100644
--- a/salhelper/inc/salhelper/queue.hxx
+++ b/salhelper/inc/salhelper/queue.hxx
@@ -31,9 +31,7 @@
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
-#ifndef _OSL_SEMAPHOR_HXX_
#include <osl/semaphor.hxx>
-#endif
#ifndef __LIST__
#include <list>
diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx
old mode 100755
new mode 100644
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index eea0267..3854b41 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -33,9 +33,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include "registry/refltype.hxx"
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index 24e36c0..f955175 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -28,23 +28,13 @@
#ifndef _STORE_LOCKBYTE_HXX_
#define _STORE_LOCKBYTE_HXX_ "$Revision: 1.1.2.1 $"
-#ifndef _SAL_TYPES_H_
#include "sal/types.h"
-#endif
-#ifndef _RTL_REF_HXX_
#include "rtl/ref.hxx"
-#endif
-#ifndef _RTL_USTRING_H_
#include "rtl/ustring.h"
-#endif
-#ifndef _STORE_TYPES_H_
#include "store/types.h"
-#endif
-#ifndef _STORE_STORBASE_HXX_
#include "storbase.hxx"
-#endif
namespace store
{
diff --git a/store/source/object.hxx b/store/source/object.hxx
index 6a494cf..b47bcfe 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -28,17 +28,11 @@
#ifndef _STORE_OBJECT_HXX_
#define _STORE_OBJECT_HXX_ "$Revision: 1.1.2.1 $"
-#ifndef _SAL_TYPES_H_
#include "sal/types.h"
-#endif
-#ifndef _RTL_REF_HXX_
#include "rtl/ref.hxx"
-#endif
-#ifndef _OSL_INTERLCK_H_
#include "osl/interlck.h"
-#endif
namespace store
{
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index 0a2c64d..446dadb 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -28,29 +28,15 @@
#ifndef _STORE_STORDIR_HXX_
#define _STORE_STORDIR_HXX_ "$Revision: 1.1.2.2 $"
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
-#ifndef _RTL_TEXTCVT_H_
#include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_STRING_H_
#include <rtl/string.h>
-#endif
-#ifndef _RTL_REF_HXX_
#include <rtl/ref.hxx>
-#endif
-#ifndef _STORE_OBJECT_HXX_
#include "object.hxx"
-#endif
-#ifndef _STORE_STORBASE_HXX_
#include "storbase.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
#include "storpage.hxx"
-#endif
namespace store
{
commit de7596f102c304b74e0d406886db1cb006850a12
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 4 17:00:00 2010 +0200
remove include guards using fixguard.py
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
index 5899d1b..1874921 100644
--- a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx
@@ -30,9 +30,7 @@
#ifndef TEST
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
#else
typedef unsigned int sal_uInt32;
#endif
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
index 7e4afce..4ef3f65 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/hash.cxx
@@ -31,9 +31,7 @@
#ifndef TEST
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
#else
typedef unsigned int sal_uInt32;
#endif
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
old mode 100755
new mode 100644
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index df3069d..6d1942e 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -32,9 +32,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/component.hxx>
#include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
#include <cppuhelper/implbase3.hxx>
-#endif
#include <cppuhelper/typeprovider.hxx>
#include <rtl/unload.h>
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1b20ac6..1c24f48 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -28,12 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppuhelper.hxx"
#include <osl/mutex.hxx>
-#ifndef _CPPU_WEAKAGG_HXX_
#include <cppuhelper/weakagg.hxx>
-#endif
-#ifndef _CPPU_HELPER_INTERFACECONTAINER_HXX_
#include <cppuhelper/interfacecontainer.hxx>
-#endif
#include "cppuhelper/exc_hlp.hxx"
using namespace osl;
diff --git a/cpputools/source/regcomplazy/regcomplazy.cxx b/cpputools/source/regcomplazy/regcomplazy.cxx
old mode 100755
new mode 100644
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 7e4e7ab..153091c 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -33,9 +33,7 @@
#include <idlc/astconstant.hxx>
#include <idlc/astattribute.hxx>
#include <idlc/astinterfacemember.hxx>
-#ifndef _IDLC_ASTSERVICEEMEMBER_HXX_
#include <idlc/astservicemember.hxx>
-#endif
#include <idlc/astobserves.hxx>
#include <idlc/astneeds.hxx>
#include <idlc/astsequence.hxx>
diff --git a/idlc/source/astscope.cxx b/idlc/source/astscope.cxx
index 127d509..798923e 100644
--- a/idlc/source/astscope.cxx
+++ b/idlc/source/astscope.cxx
@@ -29,9 +29,7 @@
#include "precompiled_idlc.hxx"
#include <idlc/astscope.hxx>
#include <idlc/astbasetype.hxx>
-#ifndef _IDLC_ASTINERFACE_HXX_
#include <idlc/astinterface.hxx>
-#endif
#include <idlc/errorhandler.hxx>
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index e6a22fd..2de5be6 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_idlc.hxx"
#include <idlc/aststruct.hxx>
-#ifndef _IDLC_ASTMember_HXX_
#include <idlc/astmember.hxx>
-#endif
#include "registry/version.h"
#include "registry/writer.hxx"
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
old mode 100755
new mode 100644
diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx
index 39d5fa2..93a51d2 100644
--- a/rdbmaker/source/codemaker/global.cxx
+++ b/rdbmaker/source/codemaker/global.cxx
@@ -25,9 +25,7 @@
*
************************************************************************/
#include <osl/process.h>
-#ifndef _RTL_OSTRINGBUFFER_HXX_
#include <rtl/strbuf.hxx>
-#endif
#include <rtl/ustring.hxx>
#include <osl/thread.h>
#include <osl/file.hxx>
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index 6b588e7..3314236 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -31,9 +31,7 @@
#include <codemaker/typemanager.hxx>
#include <codemaker/dependency.hxx>
-#ifndef _RTL_OSTRINGBUFFER_HXX_
#include <rtl/strbuf.hxx>
-#endif
#if defined(SAL_W32) || defined(SAL_OS2)
#include <io.h>
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx
index ef774da..c10676a 100644
--- a/rdbmaker/source/rdbmaker/typeblop.cxx
+++ b/rdbmaker/source/rdbmaker/typeblop.cxx
@@ -26,9 +26,7 @@
************************************************************************/
#include <rtl/alloc.h>
-#ifndef __REGISTRY_REFLWRIT_HXX__
#include <registry/reflwrit.hxx>
-#endif
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/reflection/XInterfaceTypeDescription.hpp>
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index db6990b..fa436e5 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -41,13 +41,9 @@
#include <unistd.h>
#endif
-#ifndef __REGISTRY_REFLREAD_HXX__
#include <registry/reflread.hxx>
-#endif
-#ifndef __REGISTRY_REFLWRIT_HXX__
#include <registry/reflwrit.hxx>
-#endif
#include "registry/reader.hxx"
#include "registry/refltype.hxx"
diff --git a/sal/osl/all/utility.cxx b/sal/osl/all/utility.cxx
old mode 100755
new mode 100644
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
index 15c544e..0cebeb2 100644
--- a/sal/osl/os2/file.cxx
+++ b/sal/osl/os2/file.cxx
@@ -54,24 +54,16 @@
#include "file_error_transl.h"
#include <osl/time.h>
-#ifndef _FILE_URL_H_
#include "file_url.h"
-#endif
#include "file_path_helper.hxx"
#include "uunxapi.hxx"
-#ifndef _STRING_H_
#include <string.h>
-#endif
-#ifndef _CTYPE_H_
#include <ctype.h>
-#endif
-#ifndef _WCHAR_H_
#include <wchar.h>
-#endif
#if OSL_DEBUG_LEVEL > 1
extern void debug_ustring(rtl_uString*);
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
index 984d45c..2d13539 100644
--- a/sal/osl/os2/file_url.cxx
+++ b/sal/osl/os2/file_url.cxx
@@ -28,25 +28,15 @@
#include <ctype.h>
#include "system.h"
-#ifndef _LIMITS_H
#include <limits.h>
-#endif
-#ifndef _ERRNO_H
#include <errno.h>
-#endif
-#ifndef _STDLIB_H_
#include <stdlib.h>
-#endif
-#ifndef _STRINGS_H
#include <strings.h>
-#endif
-#ifndef _UNISTD_H
#include <unistd.h>
-#endif
#include <osl/file.h>
#include <osl/security.h>
#include <rtl/uri.h>
@@ -54,22 +44,16 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.h>
-#ifndef _OSL_TREAD_H_
#include <osl/thread.h>
-#endif
#include <osl/file.hxx>
#include <osl/mutex.h>
#include <osl/process.h>
#include "file_error_transl.h"
-#ifndef _FILE_URL_H_
#include "file_url.h"
-#endif
#include "file_path_helper.hxx"
-#ifndef _OSL_UUNXAPI_HXX_
#include "uunxapi.hxx"
-#endif
#include <wchar.h>
#include <wctype.h>
diff --git a/sal/osl/os2/process_impl.cxx b/sal/osl/os2/process_impl.cxx
index c98df9f..122e342 100644
--- a/sal/osl/os2/process_impl.cxx
+++ b/sal/osl/os2/process_impl.cxx
@@ -57,13 +57,9 @@
#include "osl/thread.h"
#include "rtl/ustring.hxx"
-#ifndef _OSL_FILE_PATH_HELPER_H_
#include "file_path_helper.h"
-#endif
-#ifndef _OSL_UUNXAPI_H_
#include "uunxapi.h"
-#endif
/***************************************
osl_bootstrap_getExecutableFile_Impl().
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 3754479..9109666 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -55,13 +55,9 @@
#include "osl/thread.h"
#include "rtl/ustring.hxx"
-#ifndef _OSL_FILE_PATH_HELPER_H_
#include "file_path_helper.h"
-#endif
-#ifndef _OSL_UUNXAPI_H_
#include "uunxapi.h"
-#endif
/***************************************
osl_bootstrap_getExecutableFile_Impl().
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
old mode 100755
new mode 100644
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
old mode 100755
new mode 100644
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 5a6e9af..1ee1319 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -39,17 +39,11 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#ifndef _OSL_THREAD_HXX
#include <osl/thread.hxx>
-#endif
-#ifndef _OSL_MUTEX_HXX
#include <osl/mutex.hxx>
-#endif
-#ifndef _OSL_MUTEX_HXX
#include <osl/pipe.hxx>
-#endif
#include <osl/time.h>
#ifdef UNX
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index bf387bd..e76f6fa 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -32,21 +32,13 @@
//------------------------------------------------------------------------
#include <sal/types.h>
-#ifndef _RTL_USTRING_HXX_
#include <rtl/string.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX_
#include <rtl/strbuf.hxx>
-#endif
-#ifndef _OSL_THREAD_HXX
#include <osl/thread.hxx>
-#endif
-#ifndef _OSL_MUTEX_HXX
#include <osl/mutex.hxx>
-#endif
#include <osl/time.h>
#include <testshl/simpleheader.hxx>
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
old mode 100755
new mode 100644
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
old mode 100755
new mode 100644
index 414fd74..9421e01
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -59,9 +59,7 @@
// include files
//------------------------------------------------------------------------
-#ifndef _OSL_SOCKET_CONST_H_
#include <osl_Socket_Const_orig.h>
-#endif
#include <testshl/simpleheader.hxx>
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
old mode 100755
new mode 100644
diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
old mode 100755
new mode 100644
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index daac56a..6d98cee 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -32,13 +32,9 @@
//------------------------------------------------------------------------
#include <sal/types.h>
-#ifndef _RTL_USTRING_HXX_
#include <rtl/string.hxx>
-#endif
-#ifndef _OSL_THREAD_HXX
#include <osl/thread.hxx>
-#endif
#include <osl/time.h>
#include <rtl/instance.hxx>
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 730ed47..f8b3ce8 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -41,9 +41,7 @@
// #include <osl/diagnose.h>
// #endif
-#ifndef _RTL_STRING_HXX
#include <rtl/string.hxx>
-#endif
#include <testshl/simpleheader.hxx>
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 696c220..6469d9e 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -48,13 +48,9 @@
// #include <osl/diagnose.h>
// #endif
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
-#ifndef _RTL_STRING_HXX
#include <rtl/string.hxx>
-#endif
#include <rtl/locale.hxx>
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index 0bd96a2..974494f 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -42,13 +42,9 @@
// #include <osl/diagnose.h>
// #endif
-#ifndef _RTL_STRBUF_HXX
#include <rtl/strbuf.hxx>
-#endif
-#ifndef _RTL_WSTRBUF_HXX
#include <rtl/ustrbuf.hxx>
-#endif
#include <testshl/simpleheader.hxx>
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index 0f9e143..3c66ed9 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -34,16 +34,12 @@
#include <rtl/logfile.h>
#include <osl/process.h>
-#ifndef _OSL_FILE_H_
#include <osl/time.h>
-#endif
#include <osl/time.h>
#include <osl/mutex.hxx>
#include <rtl/bootstrap.h>
#include <rtl/ustring.hxx>
-#ifndef _RTL_STRBUF_HXX_
#include <rtl/ustrbuf.hxx>
-#endif
#include <rtl/alloc.h>
#include "osl/thread.h"
diff --git a/sal/rtl/source/memory_fini.cxx b/sal/rtl/source/memory_fini.cxx
old mode 100755
new mode 100644
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
index fedfac0..f64e97d 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
@@ -33,9 +33,7 @@
//------------------------------------------------------------------------
#include <osl/diagnose.h>
-#ifndef _TWRAPPERDATAOBJECT_HXX_
#include "XTDataObject.hxx"
-#endif
#include <windows.h>
#include <ole2.h>
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
old mode 100755
new mode 100644
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index c706e23..a8a2624 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -28,9 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
#include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 12ab6d5..2bbbeab 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -28,18 +28,14 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_stoc.hxx"
#include <osl/mutex.hxx>
-#ifndef _OSL_DIAGNOSE_HXX_
#include <osl/diagnose.h>
-#endif
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase3.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <registry/registry.hxx>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index d803bd4..15dd877 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -36,12 +36,8 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/servicefactory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE3_HXX
#include <cppuhelper/implbase3.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <uno/mapping.hxx>
#include <osl/thread.h>
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index b321d97..69e8e5b 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -29,13 +29,9 @@
#include "precompiled_stoc.hxx"
#include <osl/mutex.hxx>
#include <cppuhelper/queryinterface.hxx>
-#ifndef _CPPUHELER_WEAK_HXX_
#include <cppuhelper/weak.hxx>
-#endif
#include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX__
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/implbase2.hxx>
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 92aca6a..56f08de 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -42,9 +42,7 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/shlib.hxx>
#include <cppuhelper/implbase3.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX__
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <cppuhelper/bootstrap.hxx>
#include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 761fccf..58b78ff 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -38,9 +38,7 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/component.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 9ae1af9..b5a4279 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -40,13 +40,9 @@
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/component.hxx>
#include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
#include <cppuhelper/implbase1.hxx>
-#endif
#include <cppuhelper/typeprovider.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <rtl/unload.h>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/bootstrap.hxx>
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 03faa9a..979ae19 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -30,17 +30,13 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <rtl/alloc.h>
-#ifndef _RTL_USTRBUF_H_
#include <rtl/ustrbuf.hxx>
-#endif
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include <registry/registry.hxx>
#include <com/sun/star/registry/XSimpleRegistry.hpp>
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 407e199..4b91b13 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -31,13 +31,9 @@
#include <osl/mutex.hxx>
#include "rtl/ustrbuf.hxx"
#include <cppuhelper/factory.hxx>
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
#include <cppuhelper/compbase5.hxx>
-#endif
#include <cppuhelper/implbase1.hxx>
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include <cppuhelper/implementationentry.hxx>
-#endif
#include "tdmgr_common.hxx"
#include "tdmgr_tdenumeration.hxx"
#include "lrucache.hxx"
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index e333a39..8afa634 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -31,9 +31,7 @@
#include <stdio.h>
#include <sal/main.h>
-#ifndef _OSL_MODULE_H_
#include <osl/module.hxx>
-#endif
#include <osl/diagnose.h>
#include <com/sun/star/loader/XImplementationLoader.hpp>
diff --git a/store/source/stordir.cxx b/store/source/stordir.cxx
index db6de12..81c5144 100644
--- a/store/source/stordir.cxx
+++ b/store/source/stordir.cxx
@@ -30,37 +30,19 @@
#include "stordir.hxx"
-#ifndef _SAL_TYPES_H_
#include <sal/types.h>
-#endif
-#ifndef _RTL_TEXTCVT_H_
#include <rtl/textcvt.h>
-#endif
-#ifndef _RTL_REF_HXX_
#include <rtl/ref.hxx>
-#endif
-#ifndef _OSL_MUTEX_HXX_
#include <osl/mutex.hxx>
-#endif
-#ifndef _STORE_TYPES_H_
#include "store/types.h"
-#endif
-#ifndef _STORE_OBJECT_HXX_
#include "object.hxx"
-#endif
-#ifndef _STORE_STORBASE_HXX_
#include "storbase.hxx"
-#endif
-#ifndef _STORE_STORDATA_HXX_
#include "stordata.hxx"
-#endif
-#ifndef _STORE_STORPAGE_HXX_
#include "storpage.hxx"
-#endif
using namespace store;
More information about the ooo-build-commit
mailing list