diff options
57 files changed, 20 insertions, 366 deletions
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 42748d9effc0..408d26c4e434 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -23,9 +23,7 @@ #include "connectivity/ConnectionWrapper.hxx" #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/sdbc/XDriver.hpp> -#ifndef __com_sun_star_sdb_application_XTableUIProvider_hpp__ #include <com/sun/star/sdb/application/XTableUIProvider.hpp> -#endif #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <cppuhelper/compbase2.hxx> #include <comphelper/uno3.hxx> diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 0bb7c316e1a4..14a89d5c64a0 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -22,63 +22,26 @@ #include <string.h> #include "parse/sqlbison_exports.hxx" -#ifndef _CONNECTIVITY_SQLNODE_HXX #include <connectivity/sqlnode.hxx> -#endif -#ifndef _CONNECTIVITY_SQLPARSE_HXX #include <connectivity/sqlparse.hxx> -#endif -#ifndef _CONNECTIVITY_SQLINTERNALNODE_HXX #include <internalnode.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include <com/sun/star/lang/Locale.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include <com/sun/star/sdbc/DataType.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_DATE_HPP_ #include <com/sun/star/util/Date.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_DATETIME_HPP_ #include <com/sun/star/util/DateTime.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_TIME_HPP_ #include <com/sun/star/util/Time.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include <com/sun/star/util/XNumberFormatter.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATS_HPP_ #include <com/sun/star/util/XNumberFormats.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_NUMBERFORMAT_HPP_ #include <com/sun/star/util/NumberFormat.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_ #include <com/sun/star/util/XNumberFormatTypes.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_I18N_KPARSETYPE_HPP_ #include <com/sun/star/i18n/KParseType.hpp> -#endif -#ifndef _COM_SUN_STAR_I18N_KPARSETOKENS_HPP_ #include <com/sun/star/i18n/KParseTokens.hpp> -#endif -#ifndef _CONNECTIVITY_SQLSCAN_HXX + #include "sqlscan.hxx" -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _DBHELPER_DBCONVERSION_HXX_ #include "connectivity/dbconversion.hxx" -#endif #include <rtl/ustrbuf.hxx> #include <sal/macros.h> diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h index 6e935f3f1936..774f900a8b26 100644 --- a/cppuhelper/inc/cppuhelper/interfacecontainer.h +++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h @@ -24,13 +24,9 @@ #include <rtl/alloc.h> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XInterface.hpp> -#ifndef _COM_SUN_STAR_LANG_EVENTOBJECT_HXX_ #include <com/sun/star/lang/EventObject.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HXX_ #include "com/sun/star/lang/DisposedException.hpp" -#endif #include "cppuhelperdllapi.h" /** */ //for docpp diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 673522d5185c..aff4e9613ca2 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -20,9 +20,7 @@ #ifndef INCLUDED_DBACCESSDLLAPI_H #define INCLUDED_DBACCESSDLLAPI_H -#ifndef _SAL_TYPES_H_ #include "sal/types.h" -#endif #if defined(DBACCESS_DLLIMPLEMENTATION) #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h index 9322aef7bab7..7c876a61741a 100644 --- a/embedserv/source/inc/embservconst.h +++ b/embedserv/source/inc/embservconst.h @@ -22,9 +22,7 @@ #include <guiddef.h> -#ifndef _COMPHELPER_CLASSIDS_HXX #include <comphelper/classids.hxx> -#endif #if defined __MINGW32__ #pragma GCC diagnostic warning "-Wmissing-braces" diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 40318e289e3c..563a874a77b8 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -20,13 +20,8 @@ #ifndef IMPSVGDIALOG_HXX #define IMPSVGDIALOG_HXX -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ #include <com/sun/star/uno/Sequence.h> -#endif - -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vcl/dialog.hxx> #include <vcl/button.hxx> diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 928d9a9b0358..02a61b55f166 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -20,12 +20,8 @@ #ifndef SVGDIALOG_HXX #define SVGDIALOG_HXX -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYACCESS_HPP_ #include <com/sun/star/beans/XPropertyAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include <com/sun/star/document/XExporter.hpp> -#endif #include <svtools/genericunodialog.hxx> #include <memory> diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.mm index 79d25b986374..34385b6ebe64 100644 --- a/fpicker/source/aqua/AquaFilePickerDelegate.mm +++ b/fpicker/source/aqua/AquaFilePickerDelegate.mm @@ -19,14 +19,8 @@ #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/uno/Any.hxx> -#ifndef _SALAQUAFILEPICKER_HXX_ #include "SalAquaFilePicker.hxx" -#endif - -#ifndef _FILTERHELPER_HXX_ #include "FilterHelper.hxx" -#endif - #include "AquaFilePickerDelegate.hxx" @implementation AquaFilePickerDelegate diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm index e722d70e4850..66391a9e158b 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.mm +++ b/fpicker/source/aqua/NSString_OOoAdditions.mm @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _CFSTRINGUTILITIES_HXX_ #include "CFStringUtilities.hxx" -#endif - #include "NSString_OOoAdditions.hxx" #define CLASS_NAME "NSString" diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm index d7cd854341cd..c4567ebce99b 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.mm +++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _NSSTRING_OOOADDITIONS_HXX_ #include "NSString_OOoAdditions.hxx" -#endif - #include "NSURL_OOoAdditions.hxx" #include "sal/log.hxx" diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 9fe0fe5744ce..c4521d1aaa76 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -45,9 +45,7 @@ #include <rtl/ustring.hxx> #ifdef ENABLE_GENERATEFILTERCACHE - #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> - #endif #endif namespace framework{ diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx index b8282bc0b99f..a296231a07ea 100644 --- a/framework/inc/framework/toolboxconfiguration.hxx +++ b/framework/inc/framework/toolboxconfiguration.hxx @@ -22,9 +22,7 @@ #include <framework/fwedllapi.h> #include <vcl/bitmap.hxx> #include <com/sun/star/io/XInputStream.hpp> -#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_ #include <com/sun/star/io/XOutputStream.hpp> -#endif #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index 28988ec5d3d1..9e890070d4fe 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -22,13 +22,8 @@ #if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS ) - #ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> - #endif - - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif #endif diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx index 72865cf87a53..4a7a05f05508 100644 --- a/framework/inc/macros/debug/event.hxx +++ b/framework/inc/macros/debug/event.hxx @@ -26,9 +26,7 @@ #ifdef ENABLE_EVENTDEBUG - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_EVENTDEBUG diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx index ffcc4413097c..05790dba03ba 100644 --- a/framework/inc/macros/debug/filterdbg.hxx +++ b/framework/inc/macros/debug/filterdbg.hxx @@ -28,9 +28,7 @@ #ifdef ENABLE_FILTERDBG - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_FILTERDBG diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx index 59c177a5ddad..dd3be0f1a596 100644 --- a/framework/inc/macros/debug/logmechanism.hxx +++ b/framework/inc/macros/debug/logmechanism.hxx @@ -26,10 +26,7 @@ #ifdef ENABLE_LOGMECHANISM - #ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> - #endif - #include <stdio.h> /*_____________________________________________________________________________________________________________ diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx index e212f99416e6..b7c1b7d5409e 100644 --- a/framework/inc/macros/debug/mutex.hxx +++ b/framework/inc/macros/debug/mutex.hxx @@ -26,9 +26,7 @@ #ifdef ENABLE_MUTEXDEBUG - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_MUTEX diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx index afef0c97f4b1..f4cfb0a5e833 100644 --- a/framework/inc/macros/debug/plugin.hxx +++ b/framework/inc/macros/debug/plugin.hxx @@ -26,13 +26,8 @@ #ifdef ENABLE_PLUGINDEBUG - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif - - #ifndef _RTL_STRING_HXX_ #include <rtl/string.hxx> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_PLUGIN diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx index 0b936dd4ab99..1d6fc24cd815 100644 --- a/framework/inc/macros/debug/registration.hxx +++ b/framework/inc/macros/debug/registration.hxx @@ -26,9 +26,7 @@ #ifdef ENABLE_REGISTRATIONDEBUG - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_ASSERTIONS diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx index 1e8b54afa411..0c168985a560 100644 --- a/framework/inc/macros/debug/targeting.hxx +++ b/framework/inc/macros/debug/targeting.hxx @@ -26,9 +26,7 @@ #ifdef ENABLE_TARGETINGDEBUG - #ifndef _RTL_STRBUF_HXX_ #include <rtl/strbuf.hxx> - #endif /*_____________________________________________________________________________________________________________ LOGFILE_TARGETING diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 7cb7bfd9948c..c73f0ebb7031 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -26,9 +26,7 @@ #include <general.h> -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif #include <comphelper/sequenceasvector.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 3da099ce8b7a..8729a63ade7e 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -23,69 +23,28 @@ %{ #include <string.h> -#ifndef _IDLC_IDLC_HXX_ #include <idlc/idlc.hxx> -#endif -#ifndef _IDLC_ERRORHANDLER_HXX_ #include <idlc/errorhandler.hxx> -#endif -#ifndef _IDLC_FEHELPER_HXX_ #include <idlc/fehelper.hxx> -#endif -#ifndef _IDLC_EXPRESSION_HXX_ #include <idlc/astexpression.hxx> -#endif -#ifndef _IDLC_ASTCONSTANTS_HXX_ #include <idlc/astconstants.hxx> -#endif -#ifndef _IDLC_ASTCONSTANT_HXX_ #include <idlc/astconstant.hxx> -#endif -#ifndef _IDLC_ASTARRAY_HXX_ #include <idlc/astarray.hxx> -#endif -#ifndef _IDLC_ASTBASETYPE_HXX_ #include <idlc/astbasetype.hxx> -#endif -#ifndef _IDLC_ASTTYPEDEF_HXX_ #include <idlc/asttypedef.hxx> -#endif -#ifndef _IDLC_ASTEXCEPTION_HXX_ #include <idlc/astexception.hxx> -#endif -#ifndef _IDLC_ASTMEMBER_HXX_ #include <idlc/astmember.hxx> -#endif -#ifndef _IDLC_ASTENUM_HXX_ #include <idlc/astenum.hxx> -#endif -#ifndef _IDLC_ASTSEQUENCE_HXX_ #include <idlc/astsequence.hxx> -#endif -#ifndef _IDLC_ASTATTRIBUTE_HXX_ #include <idlc/astattribute.hxx> -#endif -#ifndef _IDLC_ASTOPERATION_HXX_ #include <idlc/astoperation.hxx> -#endif -#ifndef _IDLC_ASTPARAMETER_HXX_ #include <idlc/astparameter.hxx> -#endif -#ifndef _IDLC_ASTINTERFACEMEMBER_HXX_ #include <idlc/astinterfacemember.hxx> -#endif -#ifndef _IDLC_ASTSERVICEMEMBER_HXX_ #include <idlc/astservicemember.hxx> -#endif -#ifndef _IDLC_ASTOBSERVES_HXX_ #include <idlc/astobserves.hxx> -#endif -#ifndef _IDLC_ASTNEEDS_HXX_ #include <idlc/astneeds.hxx> -#endif -#ifndef _IDLC_ASTUNION_HXX_ #include <idlc/astunion.hxx> -#endif + #include "idlc/aststructinstance.hxx" #include "attributeexceptions.hxx" diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l index 166c281fefd1..aed48cf08402 100644 --- a/idlc/source/scanner.l +++ b/idlc/source/scanner.l @@ -29,15 +29,9 @@ #include <stdlib.h> #include <string.h> -#ifndef _IDLC_IDLC_HXX_ #include <idlc/idlc.hxx> -#endif -#ifndef _IDLC_ERRORHANDLER_HXX_ #include <idlc/errorhandler.hxx> -#endif -#ifndef _IDLC_FEHELPER_HXX_ #include <idlc/fehelper.hxx> -#endif #include "attributeexceptions.hxx" diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index 60dea4fffb90..e7241e09cf1d 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -66,19 +66,13 @@ #define _LWPFOUNDRY_HXX #include "lwpheader.hxx" - -#ifndef _LWPOBJECTID_HXX #include "lwpobjid.hxx" -#endif - -#ifndef _LWPOBJECTSTREAM_HXX #include "lwpobjstrm.hxx" -#endif - #include "lwpcolor.hxx" #include "lwpbasetype.hxx" #include "lwpfont.hxx" #include "lwpdropcapmgr.hxx" + class LwpDocument; class LwpBookMark; diff --git a/lotuswordpro/source/filter/xfilter/xfglobal.hxx b/lotuswordpro/source/filter/xfilter/xfglobal.hxx index 53957ae94369..496c77f9fb71 100644 --- a/lotuswordpro/source/filter/xfilter/xfglobal.hxx +++ b/lotuswordpro/source/filter/xfilter/xfglobal.hxx @@ -63,33 +63,16 @@ #include <cassert> -#ifndef _SAL_TYPES_H #include "sal/types.h" -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _IXFOBJECT_HXX #include "ixfobject.hxx" -#endif - -#ifndef _IXFSTREAM_HXX #include "ixfstream.hxx" -#endif - -#ifndef _IXFATTRLIST_HXX #include "ixfattrlist.hxx" -#endif -#ifndef _XFUTIL_HXX #include "xfutil.hxx" -#endif - -#ifndef _XFDEFS_HXX #include "xfdefs.hxx" -#endif #define PI 3.1415926 #define FLOAT_MIN 0.001 diff --git a/rsc/inc/rscerror.h b/rsc/inc/rscerror.h index 56e0d29e83a9..28b701624eee 100644 --- a/rsc/inc/rscerror.h +++ b/rsc/inc/rscerror.h @@ -19,9 +19,7 @@ #ifndef _RSCERROR_H #define _RSCERROR_H -#ifndef _TOOLS_SOLAR_H #include <tools/solar.h> -#endif /****************** D E F I N I T I O N S ********************************/ /******************* R e t u r n E r r o r s *******************/ diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 33f4970857a5..e27a64d81246 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -302,17 +302,9 @@ void InitCpp6(); #define HELLO() fprintf( stderr, "[Hello at %s, %d] ", __FILE__, __LINE__ ) -#ifndef _STDIO_H #include <stdio.h> -#endif - -#ifndef _STDLIB_H #include <stdlib.h> -#endif - -#ifndef _STRING_H #include <string.h> -#endif /* cpp1.c */ void output( int c ); diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 48b5d1dafec9..df5a2c7acf70 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -26,9 +26,7 @@ #include "time.h" /* BP */ -#ifndef _STRING_H #include <string.h> -#endif #ifndef _NO_PROTO int AddInclude( char *pIncStr ); /* BP, 11.09.91, Forward-Deklaration */ diff --git a/sal/inc/rtl/textenc.h b/sal/inc/rtl/textenc.h index 436ffbec2516..676f8c23186a 100644 --- a/sal/inc/rtl/textenc.h +++ b/sal/inc/rtl/textenc.h @@ -26,9 +26,7 @@ #else /* !_SOLAR_RSC_INVOKED */ -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif /** The various supported text encodings. diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index e990e35ca770..ee230fe49d69 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -24,10 +24,7 @@ #include "config_global.h" #endif -#ifndef INCLUDED_STDLIB_H #include <stdlib.h> -#define INCLUDED_STDLIB_H -#endif #ifdef WIN32 #define SAL_W32 diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index 8648e38752ab..634b57cac534 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -69,10 +69,7 @@ int SAL_CALL main(int argc, char ** argv) \ #ifdef SAL_W32 -#ifndef INCLUDED_STDLIB_H #include <stdlib.h> -#define INCLUDED_STDLIB_H -#endif /* Sorry but this is neccessary cause HINSTANCE is a typedef that differs (C++ causes an error) */ diff --git a/sal/osl/unx/file_path_helper.h b/sal/osl/unx/file_path_helper.h index 61f64e7733e6..28a96c173533 100644 --- a/sal/osl/unx/file_path_helper.h +++ b/sal/osl/unx/file_path_helper.h @@ -20,15 +20,8 @@ #ifndef _OSL_FILE_PATH_HELPER_H_ #define _OSL_FILE_PATH_HELPER_H_ - - #ifndef _SAL_TYPES_H_ #include <sal/types.h> - #endif - - #ifndef _RTL_USTRING_H_ #include <rtl/ustring.h> - #endif - #ifdef __cplusplus extern "C" diff --git a/sal/osl/unx/tempfile.c b/sal/osl/unx/tempfile.c index 0f57e04b229a..3d60477c7752 100644 --- a/sal/osl/unx/tempfile.c +++ b/sal/osl/unx/tempfile.c @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/*****************************************************************/ -/* Includes */ -/*****************************************************************/ - #include <stdio.h> #include <stdlib.h> #include <sys/types.h> @@ -33,9 +29,7 @@ #include <osl/diagnose.h> #include <sal/macros.h> -#ifndef _FILE_URL_H_ #include "file_url.h" -#endif oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir ) { diff --git a/sal/osl/unx/uunxapi.h b/sal/osl/unx/uunxapi.h index d13e20e5b061..f6bc1f2c2d6e 100644 --- a/sal/osl/unx/uunxapi.h +++ b/sal/osl/unx/uunxapi.h @@ -20,26 +20,11 @@ #ifndef _OSL_UUNXAPI_H_ #define _OSL_UUNXAPI_H_ - #ifndef _UNISTD_H #include <unistd.h> - #endif - - #ifndef _STDLIB_H #include <stdlib.h> - #endif - - #ifndef _TYPES_H #include <sys/types.h> - #endif - - #ifndef _STAT_H #include <sys/stat.h> - #endif - - #ifndef _RTL_USTRING_H_ #include <rtl/ustring.h> - #endif - #ifdef __cplusplus extern "C" diff --git a/sal/osl/unx/uunxapi.hxx b/sal/osl/unx/uunxapi.hxx index 066e45eae150..0419ebe31b71 100644 --- a/sal/osl/unx/uunxapi.hxx +++ b/sal/osl/unx/uunxapi.hxx @@ -20,13 +20,9 @@ #ifndef _OSL_UUNXAPI_HXX_ #define _OSL_UUNXAPI_HXX_ -#ifndef _OSL_UUNXAPI_H_ #include "uunxapi.h" -#endif -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif namespace osl { diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index 62248d58e219..d07d7e92f3ee 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -20,23 +20,12 @@ #ifndef _RTL_STRING_CONST_H_ #define _RTL_STRING_CONST_H_ -#ifndef _RTL_STRING_UTILS_HXX_ - #include <rtl_String_Utils.hxx> -#endif +#include <rtl_String_Utils.hxx> #include <limits.h> - -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_TEXTENC_H - #include <rtl/textenc.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif +#include <sal/types.h> +#include <rtl/textenc.h> +#include <rtl/ustring.h> #ifdef __cplusplus extern "C" diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index f0501cbc1f49..a824ef9f5270 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -25,17 +25,9 @@ #include <math.h> #include <stdlib.h> -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif - -#ifndef _RTL_STRING_HXX_ - #include <rtl/string.hxx> -#endif +#include <sal/types.h> +#include <rtl/ustring.h> +#include <rtl/string.hxx> sal_Char* cpystr( sal_Char* dst, const sal_Char* src ); sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h index 8e8d9453cafd..e855199455b9 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h @@ -20,9 +20,7 @@ #ifndef _RTL_STRING_UTILS_CONST_H_ #define _RTL_STRING_UTILS_CONST_H_ -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif +#include <sal/types.h> #ifdef __cplusplus extern "C" diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index 6101914fa9a6..04b6d1390091 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -22,16 +22,10 @@ #include <sal/types.h> #include <rtl/ustring.hxx> - -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <osl/mutex.hxx> #include <osl/pipe.hxx> - -#ifndef _OSL_CONDITION_HXX_ #include <osl/conditn.hxx> -#endif #include <osl/time.h> #ifdef UNX diff --git a/sal/qa/osl/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h index 717431fc4fd1..133f1f02e231 100644 --- a/sal/qa/osl/mutex/osl_Mutex_Const.h +++ b/sal/qa/osl/mutex/osl_Mutex_Const.h @@ -22,14 +22,8 @@ #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 #include <osl/time.h> #ifdef UNX diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 88ac501d4e3e..c992fe7fc1a6 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -24,23 +24,11 @@ #include <rtl/textenc.h> #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> const char * pTestString1 = "test socket"; diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index c3d87c142b4b..ce63ed8fd603 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -24,23 +24,11 @@ #include <rtl/textenc.h> #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> const char * pTestString1 = "test socket"; diff --git a/sal/qa/rtl_strings/rtl_String_Const.h b/sal/qa/rtl_strings/rtl_String_Const.h index e66a063a371f..bc1fbe8c7545 100644 --- a/sal/qa/rtl_strings/rtl_String_Const.h +++ b/sal/qa/rtl_strings/rtl_String_Const.h @@ -20,23 +20,13 @@ #ifndef _RTL_STRING_CONST_H_ #define _RTL_STRING_CONST_H_ -#ifndef _RTL_STRING_UTILS_HXX_ - #include <rtl_String_Utils.hxx> -#endif +#include <rtl_String_Utils.hxx> #include <limits.h> -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_TEXTENC_H - #include <rtl/textenc.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif +#include <sal/types.h> +#include <rtl/textenc.h> +#include <rtl/ustring.h> #ifdef __cplusplus extern "C" diff --git a/sal/qa/rtl_strings/rtl_String_Utils.hxx b/sal/qa/rtl_strings/rtl_String_Utils.hxx index ca498af8b608..811386f3966c 100644 --- a/sal/qa/rtl_strings/rtl_String_Utils.hxx +++ b/sal/qa/rtl_strings/rtl_String_Utils.hxx @@ -25,17 +25,9 @@ #include <math.h> #include <stdlib.h> -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif - -#ifndef _RTL_USTRING_H_ - #include <rtl/ustring.h> -#endif - -#ifndef _RTL_STRING_HXX_ - #include <rtl/string.hxx> -#endif +#include <sal/types.h> +#include <rtl/ustring.h> +#include <rtl/string.hxx> sal_Char* cpystr( sal_Char* dst, const sal_Char* src ); sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); diff --git a/sal/qa/rtl_strings/rtl_String_Utils_Const.h b/sal/qa/rtl_strings/rtl_String_Utils_Const.h index 8e8d9453cafd..e855199455b9 100644 --- a/sal/qa/rtl_strings/rtl_String_Utils_Const.h +++ b/sal/qa/rtl_strings/rtl_String_Utils_Const.h @@ -20,9 +20,7 @@ #ifndef _RTL_STRING_UTILS_CONST_H_ #define _RTL_STRING_UTILS_CONST_H_ -#ifndef _SAL_TYPES_H_ - #include <sal/types.h> -#endif +#include <sal/types.h> #ifdef __cplusplus extern "C" diff --git a/svtools/inc/svtools/htmltokn.h b/svtools/inc/svtools/htmltokn.h index ed2b4ed22ce7..97e73cb4090a 100644 --- a/svtools/inc/svtools/htmltokn.h +++ b/svtools/inc/svtools/htmltokn.h @@ -22,9 +22,7 @@ #include "svtools/svtdllapi.h" #include <sal/types.h> -#ifndef _SOLAR_h #include <tools/solar.h> -#endif class String; diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 998bf6f6d349..6f0bf4067b53 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -20,9 +20,7 @@ #ifndef IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED #define IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED - #ifndef _SAL_TYPES_H_ #include <sal/types.h> - #endif class SwPaM; struct SwPosition; diff --git a/sw/inc/IDocumentLineNumberAccess.hxx b/sw/inc/IDocumentLineNumberAccess.hxx index d1bc64495b86..6f52af1163ad 100644 --- a/sw/inc/IDocumentLineNumberAccess.hxx +++ b/sw/inc/IDocumentLineNumberAccess.hxx @@ -20,9 +20,7 @@ #ifndef IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED #define IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED - #ifndef _SAL_TYPES_H_ #include <sal/types.h> - #endif class SwLineNumberInfo; diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 4575cdce8318..29430cb0e17c 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -20,18 +20,12 @@ #ifndef IDOCUMENTREDLINE_HXX_INCLUDED #define IDOCUMENTREDLINE_HXX_INCLUDED - #ifndef _SAL_TYPES_H_ #include <sal/types.h> - #endif - #ifndef _SOLAR_H #include <tools/solar.h> - #endif #include <limits.h> // USHRT_MAX - #ifndef _COM_SUN_STAR_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> - #endif class SwRedline; class SwRedlineTbl; diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx index c2fde51960db..66df20626d60 100644 --- a/sw/inc/IDocumentStylePoolAccess.hxx +++ b/sw/inc/IDocumentStylePoolAccess.hxx @@ -20,9 +20,7 @@ #ifndef IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED #define IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED - #ifndef _SAL_TYPES_H_ #include <sal/types.h> - #endif class SwTxtFmtColl; class SwCharFmt; diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 0c31ee9ef930..b7186f0d4577 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -26,10 +26,7 @@ included in c-context files, so c++ style stuff will cause problems. #define INCLUDED_SW_CMDID_H #include <sfx2/sfx.hrc> - -#ifndef SW_UNOMID_H #include <unomid.h> -#endif /* Flags that are being used in the slot definitions for the disable-features */ #define SW_DISABLE_ON_PROTECTED_CURSOR 0x00000001 diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 2aeaf80d5503..a666980a9f00 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -109,9 +109,8 @@ #include <rtl/random.h> #include "WW8Sttbf.hxx" #include "WW8FibData.hxx" -#ifndef _NUMRULE_HXX #include "numrule.hxx"//For i120928 -#endif + using namespace sw::util; using namespace sw::types; diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt index 60f8474aadbf..a5836e6dc7d7 100644 --- a/ucb/source/inc/regexpmap.tpt +++ b/ucb/source/inc/regexpmap.tpt @@ -19,19 +19,11 @@ #ifndef _UCB_REGEXPMAP_TPT_ #define _UCB_REGEXPMAP_TPT_ -#ifndef _UCB_REGEXPMAP_HXX_ #include <regexpmap.hxx> -#endif - #include <list> - -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _UCB_REGEXP_HXX_ #include "regexp.hxx" -#endif using namespace ucb_impl; diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h index 29807468fac0..2225e29b587e 100644 --- a/vcl/inc/accel.h +++ b/vcl/inc/accel.h @@ -21,9 +21,7 @@ #define _SV_ACCEL_H #include <tools/solar.h> -#ifndef _SV_KEYCOD_HXX #include <vcl/keycod.hxx> -#endif class Accelerator; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 493863d9a1be..55511918a635 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -24,12 +24,8 @@ #include <tools/solar.h> #include <vcl/outdev.hxx> #include <vcl/timer.hxx> -#ifndef _SV_INPUTCTX_HXX #include <vcl/inputctx.hxx> -#endif -#ifndef _SV_POINTR_HXX #include <vcl/pointr.hxx> -#endif #include <tools/wintypes.hxx> #include <vcl/vclevent.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl index 966182566866..e38e226a1c97 100644 --- a/writerfilter/source/doctok/resources.xsl +++ b/writerfilter/source/doctok/resources.xsl @@ -48,29 +48,13 @@ #include <vector> #include <boost/shared_ptr.hpp> -#ifndef INCLUDED_OUTPUT_WITH_DEPTH_HXX #include <resourcemodel/OutputWithDepth.hxx> -#endif -#ifndef INCLUDED_RESOURCESIDS_HXX #include <doctok/resourceids.hxx> -#endif - -#ifndef INCLUDED_WW8_STRUCT_BASE_HXX #include <doctok/WW8StructBase.hxx> -#endif - -#ifndef INCLUDED_WW8_RESOURCE_MODEL_IMPL_HXX #include <doctok/WW8ResourceModelImpl.hxx> -#endif - -#ifndef INCLUDED_WW8_PROPERTY_SET_IMPL_HXX #include <doctok/WW8PropertySetImpl.hxx> -#endif - -#ifndef INCLUDED_DFF_HXX #include <doctok/Dff.hxx> -#endif namespace writerfilter { namespace doctok { diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index f20911101f3d..1c0e4f28cfdd 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -26,9 +26,7 @@ #include <vector> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef __com_sun_star_beans_PropertyValues_hpp__ #include <com/sun/star/beans/PropertyValues.hpp> -#endif #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp> |