diff options
46 files changed, 0 insertions, 144 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/hash.cxx index 37f53da11141..4afbf27a4b81 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 0d1c49a23c11..feb1336dbc17 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 index b57cd405c82b..b57cd405c82b 100755..100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 96faf2272231..b4d6848a0ad9 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 27b94f6a4c34..e61670afc498 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 index 13c09c8d1c94..13c09c8d1c94 100755..100644 --- a/cpputools/source/regcomplazy/regcomplazy.cxx +++ b/cpputools/source/regcomplazy/regcomplazy.cxx diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx index 3934cfb67e19..d6d61e50a842 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 4d1e182320e0..232b14bb191a 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 913ebaed42c4..160278419cd7 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 index 3b73f88f7963..3b73f88f7963 100755..100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx diff --git a/rdbmaker/source/codemaker/global.cxx b/rdbmaker/source/codemaker/global.cxx index 2e6d2a586444..dfc049da40d5 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 5a4bd498cca2..d2bb970ecf9d 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 0300970567d4..68cc23ace444 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 2d3322c25b13..c5c1124eb20e 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 index 21c392ba1793..21c392ba1793 100755..100644 --- a/sal/osl/all/utility.cxx +++ b/sal/osl/all/utility.cxx diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx index 2e668d23d638..6b493e08c40a 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 e3b5fbf00c48..b270c6332fb4 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 27b12bbe0f6a..116295f57079 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 e712b6748e7f..6c450911f490 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 index 3bd5ac4cd6d1..3bd5ac4cd6d1 100755..100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 4b1b078785d3..4b1b078785d3 100755..100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 6371ad3b5250..78785be18517 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 794fcc82f9c9..f1015f4198c6 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 index cc125eefada2..cc125eefada2 100755..100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 4a981bc7faa9..ad21298ab928 100755..100644 --- 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 index b6ed4d53eb91..b6ed4d53eb91 100755..100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 64033b7b8ca9..64033b7b8ca9 100755..100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 716a37df0281..3514f6ac96d4 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 1f2958fb706f..886dac40789b 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 6ab1aa0f87c5..0e4e28616ad6 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 ef04f3f60c38..5c1c45b00219 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 56d5e5d5d68e..1bc115354ee9 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 index f88f09887595..f88f09887595 100755..100644 --- a/sal/rtl/source/memory_fini.cxx +++ b/sal/rtl/source/memory_fini.cxx diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx index 14887dd9021c..a34773c60e10 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 index 1e7ac29d3aa9..1e7ac29d3aa9 100755..100644 --- a/salhelper/source/simplereferenceobject.cxx +++ b/salhelper/source/simplereferenceobject.cxx diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 5c201ad52421..9155c859a484 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 b56e47698c02..2948860808ca 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 df63bfbfaee1..a3733f39eb0f 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 74bdc3fe1359..18164eec9a6f 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 d50f209718ed..26899e5d7bd1 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 26ced6e8e973..e82aa70c821a 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 97eb82b6b997..05abc44ea018 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 4ae9875bdab1..13dc574ae038 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 390881bb0d1d..e2a48d3e26f5 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 a0ef275565e0..b73376bf8c99 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 0b3f16da3cfb..b9344234a4f7 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; |