diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-05 15:55:12 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:11:20 +0200 |
| commit | cf1ae3562efb375a62bf7807bf310556c7dbca70 (patch) | |
| tree | 0a212e780a5a959d7a073d89f8b03a41cc00979e | |
| parent | 5dbc8a81c4329a985a69b306996d96141b35da4b (diff) | |
more removed include guards using fixguard.py
355 files changed, 0 insertions, 932 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx index ee1ffb84ac..c1c108f934 100644 --- a/avmedia/inc/avmedia/mediaitem.hxx +++ b/avmedia/inc/avmedia/mediaitem.hxx @@ -29,9 +29,7 @@ #define _AVMEDIA_MEDIAITEM_HXX #include <tools/rtti.hxx> -#ifndef _POOLITEM_HXX #include <svl/poolitem.hxx> -#endif #include <com/sun/star/media/ZoomLevel.hpp> #define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000)) diff --git a/avmedia/source/gstreamer/gstcommon.hxx b/avmedia/source/gstreamer/gstcommon.hxx index d3e1f2419b..b64acf22b2 100644 --- a/avmedia/source/gstreamer/gstcommon.hxx +++ b/avmedia/source/gstreamer/gstcommon.hxx @@ -30,33 +30,15 @@ #include <gst/gst.h> -#ifndef _OSL_MUTEX_HXX_ #include <osl/mutex.hxx> -#endif -#ifndef _DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef _STREAM_HXX #include <tools/stream.hxx> -#endif -#ifndef _STRING_HXX #include <tools/string.hxx> -#endif -#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index 11f6b6f8b2..b940e1170d 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -30,9 +30,7 @@ #include "gstcommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_ #include "com/sun/star/media/XFrameGrabber.hdl" -#endif namespace avmedia { namespace gstreamer { diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index eebf4edd73..3ba0315fb3 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -30,9 +30,7 @@ #include "gstcommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_ #include "com/sun/star/media/XManager.hdl" -#endif // ----------- // - Manager - diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 778c877edf..69b55ab34a 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -31,9 +31,7 @@ #include <osl/conditn.h> #include "gstcommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_ #include "com/sun/star/media/XPlayer.hdl" -#endif typedef struct _GstXOverlay GstXOverlay; diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index 4a7b84e4bb..a17ee1f351 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -31,9 +31,7 @@ #include "gstcommon.hxx" #include <cppuhelper/interfacecontainer.h> -#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_ #include "com/sun/star/media/XPlayerWindow.hdl" -#endif namespace avmedia { namespace gstreamer { diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx index 6ddee8493c..8092350a95 100644 --- a/avmedia/source/quicktime/framegrabber.hxx +++ b/avmedia/source/quicktime/framegrabber.hxx @@ -30,9 +30,7 @@ #include "quicktimecommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_ #include "com/sun/star/media/XFrameGrabber.hdl" -#endif namespace avmedia { namespace quicktime { diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx index cbb7ab2bd9..871073afe1 100644 --- a/avmedia/source/quicktime/manager.hxx +++ b/avmedia/source/quicktime/manager.hxx @@ -30,9 +30,7 @@ #include "quicktimecommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_ #include "com/sun/star/media/XManager.hdl" -#endif // ----------- // - Manager - diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx index a4d04b32b7..9d530583b0 100644 --- a/avmedia/source/quicktime/player.hxx +++ b/avmedia/source/quicktime/player.hxx @@ -31,9 +31,7 @@ #include <osl/conditn.h> #include "quicktimecommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_ #include "com/sun/star/media/XPlayer.hdl" -#endif namespace avmedia { namespace quicktime { diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx index 95921259f5..7a18481a15 100644 --- a/avmedia/source/quicktime/window.hxx +++ b/avmedia/source/quicktime/window.hxx @@ -31,9 +31,7 @@ #include "quicktimecommon.hxx" #include <cppuhelper/interfacecontainer.h> -#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_ #include "com/sun/star/media/XPlayerWindow.hdl" -#endif namespace avmedia { namespace quicktime { diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 913cd502da..b6e485def8 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -40,12 +40,8 @@ #include <vcl/sysdata.hxx> #endif -#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_ #include <com/sun/star/awt/SystemPointer.hdl> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_ #include <com/sun/star/lang/XComponent.hdl> -#endif #define AVMEDIA_TOOLBOXITEM_PREV 0x0001 #define AVMEDIA_TOOLBOXITEM_PLAY 0x0002 diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index fdfa0b5ae5..85c83d1768 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -33,9 +33,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/media/XManager.hpp> -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HDL_ #include <com/sun/star/lang/XComponent.hdl> -#endif #define MEDIA_TIMER_TIMEOUT 100 diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx index b9e7e63aaf..f42f8a6b8e 100644 --- a/avmedia/source/win/framegrabber.hxx +++ b/avmedia/source/win/framegrabber.hxx @@ -30,9 +30,7 @@ #include "wincommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_ #include "com/sun/star/media/XFrameGrabber.hdl" -#endif struct IMediaDet; diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx index 110b3d2600..38c280b09e 100644 --- a/avmedia/source/win/manager.hxx +++ b/avmedia/source/win/manager.hxx @@ -30,9 +30,7 @@ #include "wincommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_ #include "com/sun/star/media/XManager.hdl" -#endif // ----------- // - Manager - diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index 793da23b09..440f584bcb 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -30,9 +30,7 @@ #include "wincommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_ #include "com/sun/star/media/XPlayer.hdl" -#endif struct IGraphBuilder; struct IBaseFilter; diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx index 758289954e..c4349f8637 100644 --- a/avmedia/source/win/window.hxx +++ b/avmedia/source/win/window.hxx @@ -31,9 +31,7 @@ #include "wincommon.hxx" #include <cppuhelper/interfacecontainer.h> -#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_ #include "com/sun/star/media/XPlayerWindow.hdl" -#endif struct IVideoWindow; diff --git a/avmedia/source/xine/manager.hxx b/avmedia/source/xine/manager.hxx index 9969aef01f..e40a187a1e 100644 --- a/avmedia/source/xine/manager.hxx +++ b/avmedia/source/xine/manager.hxx @@ -30,9 +30,7 @@ #include "xinecommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_ #include "com/sun/star/media/XManager.hdl" -#endif // ----------- // - Manager - diff --git a/avmedia/source/xine/player.hxx b/avmedia/source/xine/player.hxx index 45678d7819..3fc3725fce 100644 --- a/avmedia/source/xine/player.hxx +++ b/avmedia/source/xine/player.hxx @@ -30,9 +30,7 @@ #include "xinecommon.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_ #include "com/sun/star/media/XPlayer.hdl" -#endif namespace avmedia { namespace xine { diff --git a/avmedia/source/xine/window.hxx b/avmedia/source/xine/window.hxx index 75d6b690cc..95c6f33523 100644 --- a/avmedia/source/xine/window.hxx +++ b/avmedia/source/xine/window.hxx @@ -31,9 +31,7 @@ #include "xinecommon.hxx" #include <cppuhelper/interfacecontainer.h> -#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_ #include "com/sun/star/media/XPlayerWindow.hdl" -#endif namespace avmedia { namespace xine { diff --git a/basic/inc/basic/sbstar.hxx b/basic/inc/basic/sbstar.hxx index 299b1e19eb..1e1e0e2121 100644 --- a/basic/inc/basic/sbstar.hxx +++ b/basic/inc/basic/sbstar.hxx @@ -30,9 +30,7 @@ #include <basic/sbx.hxx> #include <basic/sbxobj.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <osl/mutex.hxx> #include <basic/sbdef.hxx> diff --git a/basic/inc/basic/sbstdobj.hxx b/basic/inc/basic/sbstdobj.hxx index b3a3c99fa7..109bcda944 100644 --- a/basic/inc/basic/sbstdobj.hxx +++ b/basic/inc/basic/sbstdobj.hxx @@ -29,9 +29,7 @@ #define _SBSTDOBJ1_HXX #include <basic/sbxobj.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <basic/sbxfac.hxx> class StarBASIC; class SbStdFactory; diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index 4dc2fbd36a..32d8a03d52 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -35,9 +35,7 @@ #include <basic/sbxdef.hxx> #include <basic/sbxform.hxx> -#ifndef __SBX_SBXOBJECT_HXX #include <basic/sbxobj.hxx> -#endif #include <basic/sbxprop.hxx> #include <basic/sbxmeth.hxx> diff --git a/basic/inc/basic/sbxdef.hxx b/basic/inc/basic/sbxdef.hxx index 6cb9a42b65..0d56641b03 100644 --- a/basic/inc/basic/sbxdef.hxx +++ b/basic/inc/basic/sbxdef.hxx @@ -31,9 +31,7 @@ #ifndef __RSC -#ifndef _SOLAR_H #include <tools/solar.h> -#endif #include "tools/errcode.hxx" #ifndef _SBX_CLASS_TYPE diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index 32b3a051da..1daeb4e776 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -29,15 +29,9 @@ #define _BASICAPP_HXX #include <vcl/svapp.hxx> -#ifndef _HELP_HXX //autogen #include <vcl/help.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <vcl/timer.hxx> #include <svl/brdcst.hxx> #include <svl/lstner.hxx> diff --git a/basic/source/app/appbased.hxx b/basic/source/app/appbased.hxx index eb9bf71aa1..ce33105ed9 100644 --- a/basic/source/app/appbased.hxx +++ b/basic/source/app/appbased.hxx @@ -29,12 +29,8 @@ #define _APPBASED_HXX #include <basic/sbmod.hxx> -#ifndef _SB_APPEDIT_HXX #include "appedit.hxx" -#endif -#ifndef _SB_TEXTEDIT_HXX #include "textedit.hxx" -#endif class BasicFrame; class BreakpointWindow; diff --git a/basic/source/app/appedit.hxx b/basic/source/app/appedit.hxx index 92187ff599..f7e74bbb44 100644 --- a/basic/source/app/appedit.hxx +++ b/basic/source/app/appedit.hxx @@ -28,9 +28,7 @@ #ifndef _APPEDIT_HXX #define _APPEDIT_HXX -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif #include "appwin.hxx" #include "textedit.hxx" diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx index 9b681bc87e..2fde62cf8f 100644 --- a/basic/source/app/dialogs.hxx +++ b/basic/source/app/dialogs.hxx @@ -28,26 +28,16 @@ #ifndef _DIALOGS_HXX #define _DIALOGS_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/tabdlg.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> #include <tools/config.hxx> -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/floatwin.hxx> #include <vcl/toolbox.hxx> @@ -56,9 +46,7 @@ class SbxVariable; -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif class AboutDialog : public ModalDialog { FixedText a1,a4,aVersionString; diff --git a/basic/source/app/processw.hxx b/basic/source/app/processw.hxx index 648716fa84..3150641c9e 100644 --- a/basic/source/app/processw.hxx +++ b/basic/source/app/processw.hxx @@ -29,9 +29,7 @@ #define _PROCESSW_HXX #include <basic/sbxfac.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <basic/sbxobj.hxx> #include <basic/process.hxx> diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 7d22f4d64c..614fccf30c 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -30,9 +30,7 @@ #include "namecont.hxx" -#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCESUPPLIER_HPP_ #include <com/sun/star/resource/XStringResourceSupplier.hpp> -#endif #include "com/sun/star/resource/XStringResourcePersistence.hpp" #include <cppuhelper/implbase1.hxx> diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx index 35715b4d38..cb0fddf379 100644 --- a/basic/source/inc/image.hxx +++ b/basic/source/inc/image.hxx @@ -29,9 +29,7 @@ #define _SBIMAGE_HXX #include "sbintern.hxx" -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <filefmt.hxx> // Diese Klasse liest das vom Compiler erzeugte Image ein und verwaltet diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx index 50f7b01dcf..133df89151 100644 --- a/basic/source/inc/iosys.hxx +++ b/basic/source/inc/iosys.hxx @@ -29,9 +29,7 @@ #define _SBIOSYS_HXX #include <tools/stream.hxx> -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif class SvStream; diff --git a/basic/source/inc/object.hxx b/basic/source/inc/object.hxx index 3de6ff8ee8..5b375e576d 100644 --- a/basic/source/inc/object.hxx +++ b/basic/source/inc/object.hxx @@ -29,9 +29,7 @@ #define _SAMPLE_OBJECT_HXX #include <basic/sbxfac.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <basic/sbxobj.hxx> // 1) Properties: diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 4fc67883aa..6af44815be 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -28,21 +28,11 @@ #define _SFX_PROPBAG_HXX #include <svl/svarray.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_ #include <com/sun/star/beans/XPropertySetInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_ #include <com/sun/star/beans/XPropertyAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_ #include <com/sun/star/beans/XPropertyContainer.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx index 96de7e5ce6..9327dc54ee 100644 --- a/basic/source/inc/runtime.hxx +++ b/basic/source/inc/runtime.hxx @@ -28,9 +28,7 @@ #ifndef _SBRUNTIME_HXX #define _SBRUNTIME_HXX -#ifndef _SBX_HXX #include <basic/sbx.hxx> -#endif #include "sb.hxx" diff --git a/basic/source/inc/sbtrace.hxx b/basic/source/inc/sbtrace.hxx index 6d24325c94..6d24325c94 100755..100644 --- a/basic/source/inc/sbtrace.hxx +++ b/basic/source/inc/sbtrace.hxx diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index f2277e99d0..a1274b9f50 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -31,9 +31,7 @@ #include <basic/sbxmeth.hxx> #include <basic/sbxprop.hxx> #include <basic/sbxfac.hxx> -#ifndef __SBX_SBX_HXX //autogen #include <basic/sbx.hxx> -#endif #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/beans/XExactName.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx index 099f9836fb..d97ab1e6cc 100644 --- a/basic/source/inc/scanner.hxx +++ b/basic/source/inc/scanner.hxx @@ -29,9 +29,7 @@ #define _SCANNER_HXX #include <tools/string.hxx> -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif // Der Scanner ist stand-alone, d.h. er kann von ueberallher verwendet // werden. Eine BASIC-Instanz ist fuer Fehlermeldungen notwendig. Ohne diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index 7c3ff75332..4bac670594 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -29,9 +29,7 @@ #define _TOKEN_HXX #include "scanner.hxx" -#ifndef _SBDEF_HXX #include <basic/sbdef.hxx> -#endif #if defined( SHARED ) #define SbiTokenSHAREDTMPUNDEF diff --git a/basic/source/runtime/ddectrl.hxx b/basic/source/runtime/ddectrl.hxx index 66f73d4330..49d17f461e 100644 --- a/basic/source/runtime/ddectrl.hxx +++ b/basic/source/runtime/ddectrl.hxx @@ -29,9 +29,7 @@ #define _DDECTRL_HXX #include <tools/link.hxx> -#ifndef _SBERRORS_HXX #include <basic/sberrors.hxx> -#endif #include <tools/string.hxx> class DdeConnection; diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index fc310c094c..fc310c094c 100755..100644 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.hxx diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index e991084d7a..c1e17f8268 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -28,9 +28,7 @@ #ifndef _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_ #define _CONNECTIVITY_EVOAB_DATABASEMETADATA_HXX_ -#ifndef _CONNECTIVITY_EVOAB_DEBUG_HXX_ #include "NDebug.hxx" -#endif #include "NConnection.hxx" #include "TDatabaseMetaDataBase.hxx" #include "FDatabaseMetaDataResultSet.hxx" diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index 7f31387fee..bff7b08d4d 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -28,9 +28,7 @@ #define CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX #include <cppuhelper/compbase1.hxx> -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/frame/XTerminateListener.hpp> -#endif //........................................................................ namespace connectivity diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index 512ca076dc..184fee0325 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -31,9 +31,7 @@ #include "KConnection.hxx" #include <list> #include "connectivity/sqliterator.hxx" -#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_ #include "connectivity/sqlparse.hxx" -#endif #include <com/sun/star/sdbc/XStatement.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <cppuhelper/compbase4.hxx> diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index ee6a5b14d9..3829fa1ab9 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -28,9 +28,7 @@ #ifndef _CONNECTIVITY_KAB_CONDITION_HXX_ #define _CONNECTIVITY_KAB_CONDITION_HXX_ -#ifndef _COMPHELPER_TYPES_H_ #include <comphelper/types.hxx> -#endif #include <shell/kde_headers.h> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index 3fecf2d1af..3fecf2d1af 100755..100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index 2fe97df124..2fe97df124 100755..100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index b484edcc82..b484edcc82 100755..100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 9654a0035c..9654a0035c 100755..100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 152ff3d1bd..152ff3d1bd 100755..100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 5e83926552..5e83926552 100755..100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 735c9f40a4..735c9f40a4 100755..100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index fd40d3f442..fd40d3f442 100755..100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.hxx diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index f66282199e..f66282199e 100755..100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.hxx diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index be83d81efc..be83d81efc 100755..100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index e3755910e2..e3755910e2 100755..100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 42d941f21e..72b7ee0b0e 100755..100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -32,9 +32,7 @@ #include "MacabHeader.hxx" #include <list> #include "connectivity/sqliterator.hxx" -#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_ #include "connectivity/sqlparse.hxx" -#endif #include <com/sun/star/sdbc/XStatement.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <cppuhelper/compbase4.hxx> diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index f1b3a9b47c..f1b3a9b47c 100755..100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.hxx diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 5e3ea2be9c..5e3ea2be9c 100755..100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 89dda9c787..e0c37165d1 100755..100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -31,9 +31,7 @@ #include "MacabHeader.hxx" #include "MacabRecord.hxx" -#ifndef _COMPHELPER_TYPES_H_ #include <comphelper/types.hxx> -#endif #include <connectivity/dbexception.hxx> namespace connectivity diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index c4bf067839..c4bf067839 100755..100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.hxx diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 72d349590f..b1286669fa 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -27,9 +27,7 @@ #ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX #define CONNECTIVITY_SPREPAREDSTATEMENT_HXX -#ifndef CONNECTIVITY_SRESULTSET_HXX #include "MResultSet.hxx" -#endif #include "MStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index f19668e2f1..c49b23970e 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -43,9 +43,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/broadcasthelper.hxx> #include "connectivity/sqliterator.hxx" -#ifndef _CONNECTIVITY_PARSE_SQLPARSE_HXX_ #include "connectivity/sqlparse.hxx" -#endif #include <connectivity/FValue.hxx> #include "TSortIndex.hxx" #include "MConnection.hxx" diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index 0fee248f39..806e9f65f5 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.hxx @@ -30,9 +30,7 @@ #include "connectivity/TTableHelper.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#ifndef _CONNECTIVITY_MOZAB_BCONNECTION_HXX_ #include "MConnection.hxx" -#endif namespace connectivity { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index 8c3c21bf62..eee8398b8b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -31,9 +31,7 @@ #include <sal/types.h> #include <osl/diagnose.h> #include <osl/conditn.hxx> -#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_ #include <com/sun/star/mozilla/MozillaProductType.hpp> -#endif #include <rtl/ustring.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 0f57d1b940..6175e4257c 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -35,9 +35,7 @@ #include <sal/types.h> #include <osl/diagnose.h> #include <osl/conditn.hxx> -#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_ #include <com/sun/star/mozilla/MozillaProductType.hpp> -#endif #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx index 755a98b426..4e18ea9529 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx @@ -33,9 +33,7 @@ #include <sal/types.h> #include <osl/diagnose.h> #include <osl/conditn.hxx> -#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_ #include <com/sun/star/mozilla/MozillaProductType.hpp> -#endif #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx index 8af30915c2..c314cce3d3 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx @@ -32,9 +32,7 @@ #include <MNSInclude.hxx> #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_ #include <com/sun/star/mozilla/XCodeProxy.hpp> -#endif using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 610d2d2a0a..150fb94ac7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx @@ -33,13 +33,9 @@ #include <comphelper/propertycontainer.hxx> #include "FDatabaseMetaDataResultSet.hxx" -#ifndef _CONNECTIVITY_MAB_CONNECTION_HXX_ #include <MConnection.hxx> -#endif #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_ #include <com/sun/star/mozilla/MozillaProductType.hpp> -#endif namespace connectivity { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index b9a6142172..6020f62c9c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx @@ -31,15 +31,9 @@ #include <osl/thread.hxx> #include <MNSInclude.hxx> -#ifndef _CPPUHELPER_COMPBASE2_HXX_ #include <cppuhelper/compbase1.hxx> -#endif -#ifndef _COM_SUN_STAR_MOZILLA_XCODEPROXY_HDL_ #include <com/sun/star/mozilla/XCodeProxy.hpp> -#endif -#ifndef _COM_SUN_STAR_MOZILLA_XPROXYRUNNER_HDL_ #include "com/sun/star/mozilla/XProxyRunner.hdl" -#endif namespace connectivity { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index c5d3a7bc91..b003d06dac 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -34,9 +34,7 @@ #include <connectivity/FValue.hxx> #include "MNSDeclares.hxx" #include <osl/thread.hxx> -#ifndef _COM_SUN_STAR_MOZILLA_MOZILLPRODUCTTYPE_HPP_ #include <com/sun/star/mozilla/MozillaProductType.hpp> -#endif namespace connectivity { diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index 84d351e75c..e56f4190a0 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -29,9 +29,7 @@ #define CONNECTIVITY_ROWFUNCTIONPARSER_HXX_INCLUDED #include <sal/config.h> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include "FDatabaseMetaDataResultSet.hxx" #include <vector> #include "connectivity/dbtoolsdllapi.hxx" diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx index 1d141a47ac..f2cc66f80d 100644 --- a/connectivity/source/inc/adabas/BStatement.hxx +++ b/connectivity/source/inc/adabas/BStatement.hxx @@ -29,9 +29,7 @@ #include "odbc/OStatement.hxx" #include "adabas/BConnection.hxx" -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include "connectivity/commontools.hxx" -#endif #include <vos/ref.hxx> namespace connectivity diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx index 45b459202e..d7c56b3c5b 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx @@ -39,9 +39,7 @@ #include <com/sun/star/sdbc/XRowUpdate.hpp> #include <cppuhelper/compbase7.hxx> #include <comphelper/proparrhlp.hxx> -#ifndef _CONNECTIVITY_FILE_ASTATEMENT_HXX_ #include "file/FStatement.hxx" -#endif #include "connectivity/CommonTools.hxx" #include <comphelper/propertycontainer.hxx> diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index ebd76a8f7d..9b21b42f3e 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -28,31 +28,15 @@ #ifndef _CONNECTIVITY_FILE_FRESULTSET_HXX_ #define _CONNECTIVITY_FILE_FRESULTSET_HXX_ -#ifndef _COM_SUN_STAR_SQLC_XRESULTSET_HPP_ #include <com/sun/star/sdbc/XResultSet.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XRESULTSETMETADATASUPPLIER_HPP_ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XCLOSEABLE_HPP_ #include <com/sun/star/sdbc/XCloseable.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XCOLUMNLOCATE_HPP_ #include <com/sun/star/sdbc/XColumnLocate.hpp> -#endif #include <com/sun/star/util/XCancellable.hpp> -#ifndef _COM_SUN_STAR_SQLC_XWARNINGSSUPPLIER_HPP_ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XRESULTSETUPDATE_HPP_ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XROWUPDATE_HPP_ #include <com/sun/star/sdbc/XRowUpdate.hpp> -#endif #include <cppuhelper/compbase12.hxx> #include <comphelper/proparrhlp.hxx> #include "file/FStatement.hxx" diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index c58d540164..928f672944 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -31,9 +31,7 @@ #include "connectivity/sdbcx/VTable.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_ #include "file/FConnection.hxx" -#endif #include "file/filedllapi.hxx" #include <tools/stream.hxx> #include "connectivity/FValue.hxx" diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index c54afce3e6..369e645dfd 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include <boost/shared_ptr.hpp> -#endif #include <comphelper/stl_types.hxx> #include <jni.h> //........................................................................ diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index b917c0dd0c..9ed39ce93b 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.h> -#ifndef JNI_H #include <jni.h> -#endif #include "java/sql/SQLException.hxx" #include <comphelper/uno3.hxx> diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 510b16d8e0..442c9eeb23 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -32,9 +32,7 @@ #include <map> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/svapp.hxx> -#ifndef _VCL_TIMER_HXX_ #include <vcl/timer.hxx> -#endif #include <tools/resmgr.hxx> #include <unotools/bootstrap.hxx> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx index ca6424c4d6..556bea1b56 100644 --- a/desktop/source/app/cmdlinehelp.hxx +++ b/desktop/source/app/cmdlinehelp.hxx @@ -1,8 +1,6 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif namespace desktop { diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index fe61c935f9..e53d03443f 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -35,9 +35,7 @@ #include <vos/thread.hxx> #include <vos/signal.hxx> #include <rtl/ustring.hxx> -#ifndef _CPPUHELPER_WEAKBASE2_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include <osl/conditn.hxx> #include "boost/optional.hpp" diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 3d982cd250..dca2a51516 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -32,9 +32,7 @@ #include <vector> #include "tools/gen.hxx" -#ifndef _SV_BUTTON_HXX #include "vcl/button.hxx" -#endif #include "vcl/dialog.hxx" #include "vcl/fixed.hxx" #include "vcl/lstbox.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index b188586e6d..b188586e6d 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 90eb0dab07..90eb0dab07 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 08d1120ecb..08d1120ecb 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 4baa797d63..4baa797d63 100755..100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index ddc9cc5b77..dc1ed8f5c7 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -40,9 +40,7 @@ #include "svx/checklbx.hxx" #include "tools/link.hxx" #include "tools/solar.h" -#ifndef _SV_BUTTON_HXX #include "vcl/button.hxx" -#endif #include "vcl/dialog.hxx" #include "vcl/fixed.hxx" #include <svtools/fixedhyper.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 73041853d3..e7dd414e18 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -29,9 +29,7 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_INSTALLDIALOG_HXX #include "sal/config.h" -#ifndef _SV_BUTTON_HXX #include "vcl/button.hxx" -#endif #include "vcl/fixed.hxx" #include "vcl/dialog.hxx" #include "svtools/prgsbar.hxx" diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx index 5ef5fe080d..0686829e2e 100644 --- a/desktop/source/deployment/inc/dp_platform.hxx +++ b/desktop/source/deployment/inc/dp_platform.hxx @@ -29,9 +29,7 @@ #define INCLUDED_DP_PLATFORM_HXX -#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_MISC_API_HXX #include "dp_misc_api.hxx" -#endif #include "com/sun/star/uno/Sequence.hxx" #include "rtl/ustring.hxx" diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index 28ca18bd52..28ca18bd52 100755..100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx diff --git a/editeng/inc/editeng/AccessibleImageBullet.hxx b/editeng/inc/editeng/AccessibleImageBullet.hxx index a8c2b9d08f..b7221a7e3b 100644 --- a/editeng/inc/editeng/AccessibleImageBullet.hxx +++ b/editeng/inc/editeng/AccessibleImageBullet.hxx @@ -32,9 +32,7 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase5.hxx> -#ifndef _CPPUHELPER_INTERFACECONTAINER_H_ #include <cppuhelper/interfacecontainer.hxx> -#endif #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index 7bf5df646d..dd6fa3b8db 100755..100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -87,9 +87,7 @@ typedef std::vector<SpellPortion> SpellPortions; namespace basegfx { class B2DPolyPolygon; } #include <rsc/rscsfx.hxx> -#ifndef _EDITDATA_HXX #include <editeng/editdata.hxx> -#endif #include <i18npool/lang.h> #include "editeng/editengdllapi.h" diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx index 8450c441c0..5d7deddd2a 100644 --- a/editeng/inc/editeng/editview.hxx +++ b/editeng/inc/editeng/editview.hxx @@ -58,9 +58,7 @@ class SfxStyleSheet; class Font; class FontList; -#ifndef _EDITDATA_HXX #include <editeng/editdata.hxx> -#endif #include <com/sun/star/uno/Reference.h> #include "editeng/editengdllapi.h" diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx b/editeng/inc/editeng/forbiddencharacterstable.hxx index 07a3b37595..f342ad543b 100644 --- a/editeng/inc/editeng/forbiddencharacterstable.hxx +++ b/editeng/inc/editeng/forbiddencharacterstable.hxx @@ -28,9 +28,7 @@ #ifndef _FORBIDDENCHARACTERSTABLE_HXX #define _FORBIDDENCHARACTERSTABLE_HXX -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <vos/refernce.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/editeng/inc/editeng/measfld.hxx b/editeng/inc/editeng/measfld.hxx index f78485e920..28f8b7e038 100644 --- a/editeng/inc/editeng/measfld.hxx +++ b/editeng/inc/editeng/measfld.hxx @@ -32,9 +32,7 @@ #ifndef _FLDITEM_HXX #ifndef ITEMID_FIELD -#ifndef _EDITDATA_HXX #include <editeng/editdata.hxx> /* das include wird wg. EE_FEATURE_FIELD benoetigt */ -#endif #define ITEMID_FIELD EE_FEATURE_FIELD /* wird fuer #include <editeng/flditem.hxx> benoetigt */ #endif #include <editeng/flditem.hxx> diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx index 8d2926adcf..8d2926adcf 100755..100644 --- a/editeng/inc/editeng/splwrap.hxx +++ b/editeng/inc/editeng/splwrap.hxx diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx index c7ba241a6b..d78d25fe2e 100644 --- a/editeng/inc/editeng/unoedsrc.hxx +++ b/editeng/inc/editeng/unoedsrc.hxx @@ -36,9 +36,7 @@ #include <tools/gen.hxx> #include <vcl/mapmod.hxx> #include <tools/string.hxx> -#ifndef _SV_COLOR_HXX //autogen #include <tools/color.hxx> -#endif #include <svl/poolitem.hxx> #include <svl/itempool.hxx> #include "editeng/editengdllapi.h" diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index e3ad32cfab..e24deff546 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -28,9 +28,7 @@ #ifndef _EDITDOC_HXX #define _EDITDOC_HXX -#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> -#endif #include <editattr.hxx> #include <edtspell.hxx> diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index c10575e840..c10575e840 100755..100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index 2175a453a7..d5cc6df1ca 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -27,9 +27,7 @@ #ifndef _SV_XMLAUTOCORRECTIMPORT_HXX #define _SV_XMLAUTOCORRECTIMPORT_HXX -#ifndef _SVSTOR_HXX #include <sot/storage.hxx> -#endif #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 536af8b3d1..419344d49b 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -28,9 +28,7 @@ #define _OUTLEENG_HXX #include <editeng/outliner.hxx> -#ifndef _EDITENG_HXX #include <editeng/editeng.hxx> -#endif typedef EENotify* EENotifyPtr; SV_DECL_PTRARR_DEL( NotifyList, EENotifyPtr, 1, 1 ) diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index 38b601c01c..0358210d0f 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -36,9 +36,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XBorderResizeListener.hpp> -#ifndef _COM_SUN_STAR_FRAME_XBORDERWIDTHS_HPP_ #include <com/sun/star/frame/BorderWidths.hpp> -#endif #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx index c38c158e0a..bf3e2c2553 100644 --- a/formula/source/core/inc/core_resource.hxx +++ b/formula/source/core/inc/core_resource.hxx @@ -28,9 +28,7 @@ #ifndef _FORMULA_CORE_RESOURCE_HXX_ #define _FORMULA_CORE_RESOURCE_HXX_ -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <osl/mutex.hxx> class ResMgr; diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx index d72235842d..e760518823 100644 --- a/fpicker/source/aqua/FilterHelper.hxx +++ b/fpicker/source/aqua/FilterHelper.hxx @@ -47,13 +47,9 @@ #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HXX_ #include <com/sun/star/uno/RuntimeException.hpp> -#endif // #ifndef _RTL_USTRING_H_ // #include <rtl/ustring.hxx> diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index 2721147535..5d9bbc5cf4 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -42,16 +42,12 @@ #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/beans/StringPair.hpp> -#ifndef _SALAQUAPICKER_HXX_ #include "SalAquaPicker.hxx" -#endif #include <memory> #include <list> -#ifndef _RTL_USTRING_H_ #include <rtl/ustring.hxx> -#endif #include "FilterHelper.hxx" #include "AquaFilePickerDelegate.hxx" diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx index 38540ff8c5..72d52148ca 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.hxx +++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx @@ -32,26 +32,18 @@ // includes of other projects //_______________________________________________________________________________________________________________________ -#ifndef _CPPUHELPER_COMPBASE4_HXX_ #include <cppuhelper/implbase4.hxx> -#endif #include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif -#ifndef _SALAQUAPICKER_HXX_ #include "SalAquaPicker.hxx" -#endif #include <memory> -#ifndef _RTL_USTRING_H_ #include <rtl/ustring.hxx> -#endif #include <list> diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx index fc01ab780e..10f4c5e326 100644 --- a/fpicker/source/aqua/SalAquaPicker.hxx +++ b/fpicker/source/aqua/SalAquaPicker.hxx @@ -34,17 +34,11 @@ #include <osl/mutex.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HXX_ #include <com/sun/star/uno/RuntimeException.hpp> -#endif #include "ControlHelper.hxx" #include <premac.h> diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index cb5e8699c5..8ca6733a82 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -37,9 +37,7 @@ #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#ifndef _COM_SUN_STAR_UNO_XCOMPONENT_CONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif #include <vcl/wintypes.hxx> diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 0753072215..04eec2c60f 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -27,12 +27,8 @@ #ifndef _IODLGIMPL_HXX #define _IODLGIMPL_HXX -#ifndef _VCL_DIALOG_HXX #include <vcl/dialog.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/edit.hxx> #include <vcl/combobox.hxx> diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx index 85e934db58..3b0c20058b 100644 --- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx +++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx @@ -41,15 +41,11 @@ #include <com/sun/star/ui/dialogs/XFilePreview.hpp> #include <com/sun/star/beans/StringPair.hpp> -#ifndef _SALGTKPICKER_HXX_ #include "SalGtkPicker.hxx" -#endif #include <memory> -#ifndef _RTL_USTRING_H_ #include <rtl/ustring.hxx> -#endif #include <list> diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx index e2804e2ff1..39bd7cbff1 100644 --- a/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx +++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.hxx @@ -32,19 +32,13 @@ // includes of other projects //_______________________________________________________________________________________________________________________ -#ifndef _CPPUHELPER_COMPBASE3_HXX_ #include <cppuhelper/implbase3.hxx> -#endif -#ifndef _SALGTKPICKER_HXX_ #include "SalGtkPicker.hxx" -#endif #include <memory> -#ifndef _RTL_USTRING_H_ #include <rtl/ustring.hxx> -#endif #include <list> diff --git a/fpicker/source/unx/gnome/eventnotification.hxx b/fpicker/source/unx/gnome/eventnotification.hxx index e09917bd24..b9b7b230e4 100644 --- a/fpicker/source/unx/gnome/eventnotification.hxx +++ b/fpicker/source/unx/gnome/eventnotification.hxx @@ -28,9 +28,7 @@ #ifndef _EVENTNOTIFICATION_HXX_ #define _EVENTNOTIFICATION_HXX_ -#ifndef _COM_SUN_STAR_UNO_XINTEFACE_HPP_ #include <com/sun/star/uno/XInterface.hpp> -#endif #include <com/sun/star/uno/Reference.hxx> //----------------------------------- diff --git a/fpicker/source/unx/gnome/resourceprovider.hxx b/fpicker/source/unx/gnome/resourceprovider.hxx index 8f424b0e55..a00c205a75 100644 --- a/fpicker/source/unx/gnome/resourceprovider.hxx +++ b/fpicker/source/unx/gnome/resourceprovider.hxx @@ -35,9 +35,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif #define FOLDERPICKER_TITLE 500 #define FOLDER_PICKER_DEF_DESCRIPTION 501 diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx index 29083d46d4..d819dd68b6 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx @@ -34,9 +34,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif #include <rtl/ustrbuf.hxx> #include "platform_xp.h" diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx index 6239b52dc7..76070bbbff 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx @@ -33,9 +33,7 @@ // includes //------------------------------------------------------------------------ -#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXTENDEDFILEPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> -#endif #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp> #include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp> #include "FilterContainer.hxx" diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx index e09917bd24..b9b7b230e4 100644 --- a/fpicker/source/win32/filepicker/eventnotification.hxx +++ b/fpicker/source/win32/filepicker/eventnotification.hxx @@ -28,9 +28,7 @@ #ifndef _EVENTNOTIFICATION_HXX_ #define _EVENTNOTIFICATION_HXX_ -#ifndef _COM_SUN_STAR_UNO_XINTEFACE_HPP_ #include <com/sun/star/uno/XInterface.hpp> -#endif #include <com/sun/star/uno/Reference.hxx> //----------------------------------- diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx index c98c9ca4fa..7f35bf6741 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.hxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx @@ -36,16 +36,12 @@ #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif #include <com/sun/star/util/XCancellable.hpp> #include <memory> -#ifndef _FPIMPLBASE_HXX_ #include "WinFOPImpl.hxx" -#endif //---------------------------------------------------------- // class declaration diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx index 9e65b5e467..c64a1957d4 100644 --- a/fpicker/source/win32/misc/resourceprovider.hxx +++ b/fpicker/source/win32/misc/resourceprovider.hxx @@ -35,9 +35,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif //------------------------------------------------------------------------ // deklarations diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 020aafddf2..4db513592a 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -34,9 +34,7 @@ #include <osl/mutex.hxx> #include <rtl/ustring.hxx> -#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP_ #include <com/sun/star/awt/XBitmap.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx index 6d76204248..ce2c044b44 100644 --- a/framework/inc/classes/droptargetlistener.hxx +++ b/framework/inc/classes/droptargetlistener.hxx @@ -39,9 +39,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/frame/XFrame.hpp> //_________________________________________________________________________________________________________________ @@ -49,9 +47,7 @@ //_________________________________________________________________________________________________________________ #include <cppuhelper/implbase1.hxx> -#ifndef _SOT_EXCHANGE_HXX_ #include <sot/exchange.hxx> -#endif namespace framework { diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index b5f1761f0d..c6053b2629 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -42,9 +42,7 @@ #include <classes/filtercachedata.hxx> #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <general.h> #include <queries.h> diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index db8fe774db..9416b2b01e 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -40,9 +40,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <macros/debug.hxx> #include <general.h> diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx index 1710989484..1710989484 100755..100644 --- a/framework/inc/classes/fwlresid.hxx +++ b/framework/inc/classes/fwlresid.hxx diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx index 76c41f97e8..17b55424b7 100644 --- a/framework/inc/dispatch/basedispatcher.hxx +++ b/framework/inc/dispatch/basedispatcher.hxx @@ -36,9 +36,7 @@ #include <threadhelp/resetableguard.hxx> #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/debug.hxx> diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 3bb619f810..8dade33d08 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -37,9 +37,7 @@ #include <classes/protocolhandlercache.hxx> #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/debug.hxx> diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 33a8af37c8..9484b9595f 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -32,85 +32,49 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ #include <threadhelp/threadhelpbase.hxx> -#endif -#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_ #include <threadhelp/resetableguard.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ #include <macros/xinterface.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ #include <macros/xtypeprovider.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_ #include <macros/xserviceinfo.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include <macros/debug.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ #include <macros/generic.hxx> -#endif -#ifndef __FRAMEWORK_GENERAL_H_ #include <general.h> -#endif -#ifndef __FRAMEWORK_STDTYPES_H_ #include <stdtypes.h> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ #include <com/sun/star/lang/XTypeProvider.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XNOTIFYINGDISPATCH_HPP_ #include <com/sun/star/frame/XNotifyingDispatch.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include <com/sun/star/frame/XStatusListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_ #include <com/sun/star/document/XExtendedFilterDetection.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UTIL_URL_HPP_ #include <com/sun/star/util/URL.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index f9feb35384..465ed39126 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -63,12 +63,8 @@ #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#ifndef _COM_SUN_STAR_URI_XURLREFERENCEFACTORY_HPP_ #include <com/sun/star/uri/XUriReferenceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_URI_XURLREFERENCE_HPP_ #include <com/sun/star/uri/XUriReference.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 8efbbac090..8efbbac090 100755..100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index acd5f68e35..16f4bd8e53 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ #include <threadhelp/threadhelpbase.hxx> -#endif #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx index 31616bd3e7..68682b6456 100644 --- a/framework/inc/helper/otasksenumeration.hxx +++ b/framework/inc/helper/otasksenumeration.hxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ #include <threadhelp/threadhelpbase.hxx> -#endif #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index fc00d9999d..98c553714e 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -58,9 +58,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> -#ifndef _COM_SUN_STAR_URTIL_XUPDATABLE_HPP_ #include <com/sun/star/util/XUpdatable.hpp> -#endif //_______________________________________________ // include others diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index b1a2b3a40d..8a99fa905a 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -32,73 +32,43 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ #include <threadhelp/threadhelpbase.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_DEBUG_HXX_ #include <macros/debug.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ #include <macros/xinterface.hxx> -#endif -#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_ #include <macros/xtypeprovider.hxx> -#endif -#ifndef __FRAMEWORK_GENERAL_H_ #include <general.h> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XTITLE_HPP_ #include <com/sun/star/frame/XTitle.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HPP_ #include <com/sun/star/frame/XFrameActionListener.hpp> -#endif -#ifndef _COM_SUN_STAR_FRAME_XTITLECHANGELISTENER_HPP_ #include <com/sun/star/frame/XTitleChangeListener.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_ #include <com/sun/star/lang/XEventListener.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX #include <unotools/moduleoptions.hxx> -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif -#ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> -#endif //_________________________________________________________________________________________________________________ // const diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index e0ec288b04..8358900716 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -35,16 +35,12 @@ #include <macros/debug.hxx> #include <macros/generic.hxx> -#ifndef __FRAMEWORK_GENERAL_HXX_ #include <general.h> -#endif //_______________________________________________ // include UNO interfaces -#ifndef _COM_SUN_STAR_URTIL_XUPDATABLE_HPP_ #include <com/sun/star/util/XUpdatable.hpp> -#endif //_______________________________________________ // include all others diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index 2752c5fe89..764a25f8b0 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -45,13 +45,9 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XKeyListener.hpp> -#ifndef _COM_SUN_STAR_FAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 9059cf185d..50b63f0e2d 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -40,9 +40,7 @@ #include <macros/xserviceinfo.hxx> #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <general.h> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 183b49d1f3..00efbde9fd 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -39,9 +39,7 @@ #include <threadhelp/readguard.hxx> #include <threadhelp/threadhelpbase.hxx> -#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ #include <threadhelp/transactionbase.hxx> -#endif #include <macros/generic.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index b50dc6daea..5a72c056bd 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_THREADHELPER_THREADHELPBASE_HXX_ #include <threadhelp/threadhelpbase.hxx> -#endif #include <macros/generic.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> @@ -65,13 +63,9 @@ #include <vcl/edit.hxx> #include <vcl/combobox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/morebtn.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx index 4d2f44840d..da9310cda5 100644 --- a/framework/inc/services/pluginframe.hxx +++ b/framework/inc/services/pluginframe.hxx @@ -51,9 +51,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _VCL_ATOM_HXX #include <vcl/threadex.hxx> -#endif #include <unotools/cmdoptions.hxx> diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx index 5f14f2e5c3..c16627768f 100644 --- a/framework/inc/services/urltransformer.hxx +++ b/framework/inc/services/urltransformer.hxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_OMUTEXMEMBER_HXX_ #include <threadhelp/threadhelpbase.hxx> -#endif #include <macros/generic.hxx> #include <macros/debug.hxx> #include <macros/xinterface.hxx> diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index 80a43f6df5..b72b96abd9 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -48,12 +48,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _COM_SUN_STAR_LANG_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XTOPWINDOW_HPP_ #include <com/sun/star/awt/XTopWindow.hpp> -#endif #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/awt/XSimpleTabController.hpp> #include <com/sun/star/awt/XTabListener.hpp> diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index 35b00aec14..3226d0d644 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -34,9 +34,7 @@ // interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/container/XNameContainer.hpp> -#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HXX_ #include <com/sun/star/graphic/XGraphic.hpp> -#endif #include <cppuhelper/implbase1.hxx> namespace framework diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 6bd26b6409..c287a2b53a 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -56,9 +56,7 @@ #include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> -#ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONSTORGAE_HPP_ #include <com/sun/star/ui/XUIConfigurationStorage.hpp> -#endif #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/ui/UIElementType.hpp> diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 26e39dea28..c4e7ba5899 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -32,9 +32,7 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_UILEMENT_TOOLBARMANAGER_HXX_ #include <uielement/toolbarmanager.hxx> -#endif #include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index ee14f19fbf..662ce60ca6 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -42,9 +42,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef __COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 3e652b2212..e758658316 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -58,9 +58,7 @@ #include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <vcl/accel.hxx> -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <hash_map> namespace framework diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index a20575b09b..a20575b09b 100755..100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index d56ad67239..330caee1b8 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -40,13 +40,9 @@ //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef __COM_SUN_STAR_XML_SAX_XLOCATOR_HPP_ #include <com/sun/star/xml/sax/XLocator.hpp> -#endif //_______________________________________________ // other includes diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index 26c2d3b938..ac5bab51d2 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -39,9 +39,7 @@ //_______________________________________________ // interface includes -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif //_______________________________________________ // other includes diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx index 8d32d5d1f9..2591e0dac3 100644 --- a/framework/inc/xml/eventsdocumenthandler.hxx +++ b/framework/inc/xml/eventsdocumenthandler.hxx @@ -28,17 +28,13 @@ #ifndef __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_ -#ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ #include <xml/eventsconfiguration.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 6d4e8d5992..015b13f157 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -32,9 +32,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 67d783a40d..cdf384e228 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -32,9 +32,7 @@ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 86b25bf776..a7f38caebd 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -28,17 +28,13 @@ #ifndef __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_ -#ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ #include <xml/statusbarconfiguration.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif //_________________________________________________________________________________________________________________ // other includes diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx index f1f0949e4e..9cf8ef0485 100644 --- a/framework/inc/xml/toolboxconfiguration.hxx +++ b/framework/inc/xml/toolboxconfiguration.hxx @@ -5,9 +5,7 @@ #include <vcl/bitmap.hxx> #include <tools/string.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> diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx index 87c5717d65..d23f945695 100644 --- a/framework/source/accelerators/acceleratorexecute.hxx +++ b/framework/source/accelerators/acceleratorexecute.hxx @@ -33,29 +33,17 @@ #include <vector> -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_ #include <com/sun/star/frame/XFrame.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_ #include <com/sun/star/frame/XDispatchProvider.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_ #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#endif -#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_ #include <com/sun/star/util/XURLTransformer.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif #include <vcl/keycod.hxx> #include <vcl/evntpost.hxx> #include <osl/mutex.h> diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 2462ce455f..d7c415e26d 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -38,9 +38,7 @@ //__________________________________________ // interface includes -#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_ #include <com/sun/star/awt/KeyEvent.hpp> -#endif //__________________________________________ // other includes diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx index 05515770ae..02858ded3d 100644 --- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx @@ -34,18 +34,14 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> -#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ #include <macros/interface.hxx> -#endif #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> //__________________________________________ // interface includes -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif //__________________________________________ // other includes diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx index de1a652c69..2a2d3063c7 100644 --- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx @@ -34,9 +34,7 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> -#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_ #include <macros/interface.hxx> -#endif #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 7131011827..e6866ad86f 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -39,13 +39,9 @@ //__________________________________________ // interface includes -#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //__________________________________________ // other includes diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index b604d880d6..b0d3848eeb 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -39,13 +39,9 @@ //=============================================== // interface includes -#ifndef __COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include <com/sun/star/embed/XStorage.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //=============================================== // other includes diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 2479e4f19a..2479e4f19a 100755..100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 60c3c317e0..e2589ad41b 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -44,13 +44,9 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/URL.hpp> -#ifndef _COM_SUN_STAR_LANG_IllegalArgumentException_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_IOException_HPP_ #include <com/sun/star/io/IOException.hpp> -#endif //_______________________________________________ // includes of an other project diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index b2de45fef2..34b1291f7a 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -39,9 +39,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 49d6ddbb5e..a1fa0af0ec 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -41,9 +41,7 @@ //_______________________________________________ // other includes -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <vcl/wrkwin.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 5e213f8a59..5e213f8a59 100755..100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx index c5854daae9..c5854daae9 100755..100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx index eeeb621613..2f0a377904 100644 --- a/framework/source/uielement/rootitemcontainer.cxx +++ b/framework/source/uielement/rootitemcontainer.cxx @@ -32,13 +32,9 @@ //_________________________________________________________________________________________________________________ #include <uielement/rootitemcontainer.hxx> -#ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HHX_ #include <uielement/itemcontainer.hxx> -#endif -#ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HHX_ #include <uielement/constitemcontainer.hxx> -#endif #include <threadhelp/resetableguard.hxx> #include <general.h> #include <properties.h> diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx index 8faf4e64e1..32ef0cd125 100644 --- a/framework/test/typecfg/cfgview.cxx +++ b/framework/test/typecfg/cfgview.cxx @@ -54,9 +54,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#ifndef __SGI_STL_HASH_MAP #include <hash_map> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index c76ee093da..428b938933 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/script/XScriptListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/XControl.hpp> -#ifndef _COM_SUN_STAR_BEANS_XINTROSPECTION_HPP_ #include <com/sun/star/beans/XIntrospectionAccess.hpp> -#endif #include <cppuhelper/implbase1.hxx> #include <com/sun/star/script/XScriptEventsSupplier.hpp> diff --git a/scripting/source/storage/ScriptSecurityManager.hxx b/scripting/source/storage/ScriptSecurityManager.hxx index 39fede0118..39fede0118 100755..100644 --- a/scripting/source/storage/ScriptSecurityManager.hxx +++ b/scripting/source/storage/ScriptSecurityManager.hxx diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 81ee75f057..6216e03f63 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -28,12 +28,8 @@ #ifndef SCRIPTING_DLGPROV_HXX #define SCRIPTING_DLGPROV_HXX -#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCEWITHSTORAGE_HPP_ #include <com/sun/star/resource/XStringResourceWithStorage.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XSTRINGRESOURCEWITHSTORAGE_HPP_ #include <com/sun/star/resource/XStringResourceWithLocation.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sfx2/inc/basmgr.hxx b/sfx2/inc/basmgr.hxx index d961042d2f..41f5701cbb 100644 --- a/sfx2/inc/basmgr.hxx +++ b/sfx2/inc/basmgr.hxx @@ -28,8 +28,6 @@ #ifndef _SFX_BASMGR_HXX #define _SFX_BASMGR_HXX -#ifndef _BASMGR_HXX_ #include <basic/basmgr.hxx> -#endif #endif //_SFX_BASMGR_HXX diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx index 293557399d..293557399d 100755..100644 --- a/sfx2/inc/brokenpackageint.hxx +++ b/sfx2/inc/brokenpackageint.hxx diff --git a/sfx2/inc/dinfedt.hxx b/sfx2/inc/dinfedt.hxx index ab2ea95d5d..9a2d74efed 100644 --- a/sfx2/inc/dinfedt.hxx +++ b/sfx2/inc/dinfedt.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx index 8b84c0a028..90603639d1 100644 --- a/sfx2/inc/docvor.hxx +++ b/sfx2/inc/docvor.hxx @@ -28,9 +28,7 @@ #define _SFXDOCVOR_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <svtools/svtreebx.hxx> #include <sfx2/objsh.hxx> diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx index ce945eb671..19fd4dc0dc 100644 --- a/sfx2/inc/imgmgr.hxx +++ b/sfx2/inc/imgmgr.hxx @@ -33,9 +33,7 @@ #include <sal/types.h> #include <tools/gen.hxx> -#ifndef _IMAGE_HXX //autogen #include <vcl/image.hxx> -#endif class ToolBox; class SfxModule; diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index c50e3a87ed..67c958b998 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -32,9 +32,7 @@ #include <tools/string.hxx> #include <tools/urlobj.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svtools/acceleratorexecute.hxx> #if _SOLAR__PRIVATE diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index e8f7feaacf..5ace4b1b70 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -30,13 +30,9 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#ifndef _FLOATWIN_HXX //autogen #include <vcl/floatwin.hxx> -#endif #include <vcl/timer.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif class TabPage; class SfxTabPage; diff --git a/sfx2/inc/sfx2/controlwrapper.hxx b/sfx2/inc/sfx2/controlwrapper.hxx index 66fd1dfc06..dae767f04b 100644 --- a/sfx2/inc/sfx2/controlwrapper.hxx +++ b/sfx2/inc/sfx2/controlwrapper.hxx @@ -34,9 +34,7 @@ #include <memory> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx index 415eb058b7..6ab5d4552a 100644 --- a/sfx2/inc/sfx2/doctdlg.hxx +++ b/sfx2/inc/sfx2/doctdlg.hxx @@ -31,9 +31,7 @@ #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index 4257353c9b..3be1314d57 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -38,9 +38,7 @@ #include <tools/errcode.hxx> #include <vcl/dialog.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/graph.hxx> #include <sfx2/sfxdefs.hxx> #include <sfx2/sfxuno.hxx> diff --git a/sfx2/inc/sfx2/linksrc.hxx b/sfx2/inc/sfx2/linksrc.hxx index 7286285d68..945dddfaec 100644 --- a/sfx2/inc/sfx2/linksrc.hxx +++ b/sfx2/inc/sfx2/linksrc.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#ifndef _TOOLS_REF_HXX #include <tools/ref.hxx> -#endif #include <tools/rtti.hxx> #include <com/sun/star/io/XInputStream.hpp> diff --git a/sfx2/inc/sfx2/lnkbase.hxx b/sfx2/inc/sfx2/lnkbase.hxx index bb34180294..e905cb1161 100644 --- a/sfx2/inc/sfx2/lnkbase.hxx +++ b/sfx2/inc/sfx2/lnkbase.hxx @@ -31,12 +31,8 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include <sot/exchange.hxx> -#ifndef _TOOLS_REF_HXX #include <tools/ref.hxx> -#endif -#ifndef _LINKSOURCE_HXX #include <sfx2/linksrc.hxx> -#endif namespace com { namespace sun { namespace star { namespace uno { diff --git a/sfx2/inc/sfx2/mgetempl.hxx b/sfx2/inc/sfx2/mgetempl.hxx index 8180a69766..333640a4b7 100644 --- a/sfx2/inc/sfx2/mgetempl.hxx +++ b/sfx2/inc/sfx2/mgetempl.hxx @@ -31,9 +31,7 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_MEDIT_HXX #include <svtools/svmedit.hxx> -#endif #include <sfx2/tabdlg.hxx> diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index 4221d2b405..6248001737 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -29,9 +29,7 @@ #include <stdarg.h> -#ifndef _MENU_HXX //autogen //wg. MENU_APPEND !!!! #include <vcl/menu.hxx> -#endif #include <vcl/wintypes.hxx> #include <tools/link.hxx> #include <com/sun/star/embed/VerbDescriptor.hpp> diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx index 9b2c4d1c58..8b2286909c 100644 --- a/sfx2/inc/sfx2/new.hxx +++ b/sfx2/inc/sfx2/new.hxx @@ -30,18 +30,10 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> //========================================================================= diff --git a/sfx2/inc/sfx2/newstyle.hxx b/sfx2/inc/sfx2/newstyle.hxx index ac0c148e3f..108b97233e 100644 --- a/sfx2/inc/sfx2/newstyle.hxx +++ b/sfx2/inc/sfx2/newstyle.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/msgbox.hxx> #include <vcl/combobox.hxx> #include <vcl/dialog.hxx> diff --git a/sfx2/inc/sfx2/objface.hxx b/sfx2/inc/sfx2/objface.hxx index 82c80f7111..986c3f9db0 100644 --- a/sfx2/inc/sfx2/objface.hxx +++ b/sfx2/inc/sfx2/objface.hxx @@ -31,9 +31,7 @@ #include "sfx2/dllapi.h" #include "sal/types.h" #include <tools/string.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include <sfx2/msg.hxx> diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 6a583fe492..dc10c7d3d0 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> diff --git a/sfx2/inc/sfx2/printer.hxx b/sfx2/inc/sfx2/printer.hxx index 64cbcb2226..fadf0fa3a1 100644 --- a/sfx2/inc/sfx2/printer.hxx +++ b/sfx2/inc/sfx2/printer.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#ifndef _PRINT_HXX //autogen #include <vcl/print.hxx> -#endif class SfxFont; class SfxTabPage; diff --git a/sfx2/inc/sfx2/printopt.hxx b/sfx2/inc/sfx2/printopt.hxx index e65c273203..79203c15a1 100644 --- a/sfx2/inc/sfx2/printopt.hxx +++ b/sfx2/inc/sfx2/printopt.hxx @@ -31,14 +31,10 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX //autogen wg. FixedText #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/print.hxx> diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx index ade48ac8f4..ade48ac8f4 100755..100644 --- a/sfx2/inc/sfx2/securitypage.hxx +++ b/sfx2/inc/sfx2/securitypage.hxx diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 2953b95644..454e1e50bf 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -55,9 +55,7 @@ //________________________________________________________________________________________________________________________ #include <osl/mutex.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif //________________________________________________________________________________________________________________________ // defines for namespaces ! diff --git a/sfx2/inc/sfx2/styfitem.hxx b/sfx2/inc/sfx2/styfitem.hxx index f8dff35c4d..7fb14e251b 100644 --- a/sfx2/inc/sfx2/styfitem.hxx +++ b/sfx2/inc/sfx2/styfitem.hxx @@ -30,16 +30,10 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif -#ifndef _IMAGE_HXX //autogen #include <vcl/image.hxx> -#endif #include <tools/list.hxx> -#ifndef _RC_HXX //autogen #include <tools/rc.hxx> -#endif #include <rsc/rscsfx.hxx> #ifndef _SFX_STYFITEM_HXX_NOLIST diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx index 8bd07c4f9d..7589d92874 100644 --- a/sfx2/inc/sfx2/tbxctrl.hxx +++ b/sfx2/inc/sfx2/tbxctrl.hxx @@ -31,15 +31,9 @@ #include "sfx2/dllapi.h" #include "sal/types.h" #include <vcl/timer.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FLOATWIN_HXX //autogen #include <vcl/floatwin.hxx> -#endif #include <sfx2/ctrlitem.hxx> #include <sfx2/sfxstatuslistener.hxx> #include <svtools/toolboxcontroller.hxx> diff --git a/sfx2/inc/sfxresid.hxx b/sfx2/inc/sfxresid.hxx index aa3a13b37b..49dd041945 100644 --- a/sfx2/inc/sfxresid.hxx +++ b/sfx2/inc/sfxresid.hxx @@ -29,9 +29,7 @@ #include <tools/string.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif class SfxResId: public ResId { diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 384f075f01..eb57e7c56a 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -27,16 +27,10 @@ #ifndef _SFX_SRCHDLG_HXX_ #define _SFX_SRCHDLG_HXX_ -#ifndef _VCL_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/combobox.hxx> -#ifndef _VCL_EDIT_HXX #include <vcl/edit.hxx> -#endif -#ifndef _VCL_FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> // ============================================================================ diff --git a/sfx2/inc/viewfac.hxx b/sfx2/inc/viewfac.hxx index 0ab7159ae2..cacbdbf2b6 100644 --- a/sfx2/inc/viewfac.hxx +++ b/sfx2/inc/viewfac.hxx @@ -30,9 +30,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include <tools/string.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif class SfxViewFrame; class SfxViewShell; diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 5fe4addcb3..69072fcffe 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -27,9 +27,7 @@ #ifndef INCLUDED_SFX_HELPINTERCEPTOR_HXX #define INCLUDED_SFX_HELPINTERCEPTOR_HXX -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include <cppuhelper/implbase3.hxx> -#endif #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XInterceptorInfo.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index cc18016e33..13fc55b7ec 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -12,12 +12,8 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> -#ifndef _RTL_STRING_HXX #include <rtl/string.hxx> -#endif -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <osl/mutex.hxx> #include <osl/module.hxx> #include <sfx2/sfxuno.hxx> diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index 5b3feb30cd..e81c4d4d97 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -28,9 +28,7 @@ #ifndef _SFX_DOCTEMPLATESLOCAL_HXX #define _SFX_DOCTEMPLATESLOCAL_HXX -#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 0fddd50de0..0fddd50de0 100755..100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx index 6e0e2d0fd8..6e0e2d0fd8 100755..100644 --- a/sfx2/source/doc/printhelper.hxx +++ b/sfx2/source/doc/printhelper.hxx diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx index c358a4a93b..df110e14d3 100644 --- a/sfx2/source/inc/alienwarn.hxx +++ b/sfx2/source/inc/alienwarn.hxx @@ -27,9 +27,7 @@ #ifndef _SFX_ALIENWARN_HXX #define _SFX_ALIENWARN_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx index 53b7ebe684..e126700464 100644 --- a/sfx2/source/inc/mnucfga.hxx +++ b/sfx2/source/inc/mnucfga.hxx @@ -28,9 +28,7 @@ #define _SFXMNUCFGA_HXX #include <tools/string.hxx> -#ifndef _SFXMINARRAY_HXX #include <sfx2/minarray.hxx> -#endif //================================================================== diff --git a/sfx2/source/inc/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx index ccd56e0252..aa6cf95580 100644 --- a/sfx2/source/inc/nfltdlg.hxx +++ b/sfx2/source/inc/nfltdlg.hxx @@ -30,9 +30,7 @@ #include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> class SfxFilterMatcher; diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx index 3adea607c9..c76c23f71a 100644 --- a/sfx2/source/inc/objmnctl.hxx +++ b/sfx2/source/inc/objmnctl.hxx @@ -28,9 +28,7 @@ #define _SFX_OBJMNCTL_HXX -#ifndef _SFX_HXX #include <sfx2/mnuitem.hxx> -#endif class SfxBindings; class PopupMenu; diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx index a85ae8b305..de3731b8a4 100644 --- a/sfx2/source/inc/ownsubfilterservice.hxx +++ b/sfx2/source/inc/ownsubfilterservice.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/io/XStream.hpp> diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 4560408512..529cf1fd86 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -28,24 +28,14 @@ #define _SFX_SFXTYPES_HXX #include <tools/debug.hxx> -#ifndef _RC_HXX //autogen #include <tools/rc.hxx> -#endif -#ifndef _RCID_H //autogen #include <tools/rcid.h> -#endif -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include <tools/link.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <vcl/wrkwin.hxx> -#ifndef _VOS_MUTEX_HXX //autogen #include <vos/mutex.hxx> -#endif #ifndef DELETEZ #define DELETEZ(pPtr) ( delete pPtr, pPtr = 0 ) diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 7a6d4fc823..38db6675ba 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -27,9 +27,7 @@ #ifndef _SFXSPLITWIN_HXX #define _SFXSPLITWIN_HXX -#ifndef _SPLITWIN_HXX //autogen #include <vcl/splitwin.hxx> -#endif #include <sfx2/childwin.hxx> class SfxWorkWindow; diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index fd23e99857..b7dc5401d8 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -38,13 +38,9 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <cppuhelper/weak.hxx> -#ifndef _SFXBINDINGS_HXX #include <sfx2/bindings.hxx> -#endif -#ifndef _SFXMSGSERV_HXX #include "slotserv.hxx" -#endif #include <sfx2/sfxuno.hxx> diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index a5e24e2ce9..5074df9264 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -29,15 +29,9 @@ class SfxTemplateControllerItem; -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svl/lstner.hxx> #include <svtools/svtreebx.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index edac2017a0..e2a43a174b 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -30,13 +30,9 @@ // #include ***************************************************************** -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _SVTREEBOX_HXX //autogen #include <svtools/svtabbx.hxx> -#endif #include <svtools/svmedit.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 9e652cfef9..32ebaa9bd3 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -30,9 +30,7 @@ #include <vector> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XFrame.hpp> -#ifndef _COM_SUN_STAR_UI_XUILEMENT_HPP_ #include <com/sun/star/ui/XUIElement.hpp> -#endif #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/frame/XLayoutManagerListener.hpp> #include <cppuhelper/weak.hxx> diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/internal/basereader.hxx index d481731892..ac49615829 100644 --- a/shell/inc/internal/basereader.hxx +++ b/shell/inc/internal/basereader.hxx @@ -34,9 +34,7 @@ #include "internal/utilities.hxx" #include "internal/i_xml_parser_event_handler.hxx" -#ifndef XML_PARSER_HXX_INCLUDED #include "internal/xml_parser.hxx" -#endif #include "internal/zipfile.hxx" class CBaseReader : public i_xml_parser_event_handler diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx index 417c69c656..417c69c656 100755..100644 --- a/shell/inc/internal/metainforeader.hxx +++ b/shell/inc/internal/metainforeader.hxx diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx index 2b1b50255c..2b1b50255c 100755..100644 --- a/shell/inc/internal/propertyhdl.hxx +++ b/shell/inc/internal/propertyhdl.hxx diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx index fc4291622e..fc4291622e 100755..100644 --- a/shell/inc/internal/shlxthdl.hxx +++ b/shell/inc/internal/shlxthdl.hxx diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx index d7eb99bd18..d7eb99bd18 100755..100644 --- a/shell/inc/internal/stream_helper.hxx +++ b/shell/inc/internal/stream_helper.hxx diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index 7ae7de59be..7ae7de59be 100755..100644 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx diff --git a/shell/source/cmdmail/cmdmailmsg.hxx b/shell/source/cmdmail/cmdmailmsg.hxx index b853e6e4aa..4ee406acf8 100644 --- a/shell/source/cmdmail/cmdmailmsg.hxx +++ b/shell/source/cmdmail/cmdmailmsg.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailMessage.hpp> -#endif #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/Reference.hxx> diff --git a/shell/source/cmdmail/cmdmailsuppl.hxx b/shell/source/cmdmail/cmdmailsuppl.hxx index 4cc8a6b9da..26e3487917 100644 --- a/shell/source/cmdmail/cmdmailsuppl.hxx +++ b/shell/source/cmdmail/cmdmailsuppl.hxx @@ -37,13 +37,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailClient.hpp> -#endif -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailClientSupplier.hpp> -#endif //---------------------------------------------------------- // class declaration diff --git a/shell/source/unix/exec/shellexec.hxx b/shell/source/unix/exec/shellexec.hxx index d528800880..a8121fe54a 100644 --- a/shell/source/unix/exec/shellexec.hxx +++ b/shell/source/unix/exec/shellexec.hxx @@ -34,9 +34,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSystemShellExecute.hpp> -#endif //---------------------------------------------------------- // class declaration diff --git a/shell/source/win32/SysShExec.hxx b/shell/source/win32/SysShExec.hxx index 5be95783b4..defda9b724 100644 --- a/shell/source/win32/SysShExec.hxx +++ b/shell/source/win32/SysShExec.hxx @@ -36,9 +36,7 @@ #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSystemShellExecute.hpp> -#endif //---------------------------------------------------------- // class declaration diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index f23e050d6b..f23e050d6b 100755..100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx diff --git a/shell/source/win32/simplemail/smplmailclient.hxx b/shell/source/win32/simplemail/smplmailclient.hxx index 9ceaa07a81..4008414bca 100644 --- a/shell/source/win32/simplemail/smplmailclient.hxx +++ b/shell/source/win32/simplemail/smplmailclient.hxx @@ -31,9 +31,7 @@ #include <cppuhelper/compbase1.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailClient.hpp> -#endif namespace css = ::com::sun::star; diff --git a/shell/source/win32/simplemail/smplmailmsg.hxx b/shell/source/win32/simplemail/smplmailmsg.hxx index 13b1d5400b..de92df318b 100644 --- a/shell/source/win32/simplemail/smplmailmsg.hxx +++ b/shell/source/win32/simplemail/smplmailmsg.hxx @@ -36,9 +36,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailMessage.hpp> -#endif //---------------------------------------------------------- // class declaration diff --git a/shell/source/win32/simplemail/smplmailsuppl.hxx b/shell/source/win32/simplemail/smplmailsuppl.hxx index 6432db2c91..69ecc82fe0 100644 --- a/shell/source/win32/simplemail/smplmailsuppl.hxx +++ b/shell/source/win32/simplemail/smplmailsuppl.hxx @@ -32,13 +32,9 @@ #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_SYS_SHELL_XSYSTEMSHELLEXECUTE_HPP_ #include <com/sun/star/system/XSimpleMailClientSupplier.hpp> -#endif -#ifndef _SIMPLEMAPI_HXX_ #include "simplemapi.hxx" -#endif class CSmplMailSupplBase diff --git a/svx/inc/connctrl.hxx b/svx/inc/connctrl.hxx index 6ba07e23ae..43c409a238 100644 --- a/svx/inc/connctrl.hxx +++ b/svx/inc/connctrl.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _CTRL_HXX //autogen #include <vcl/ctrl.hxx> -#endif #include "svx/svxdllapi.h" class SfxItemSet; diff --git a/svx/inc/fontlb.hxx b/svx/inc/fontlb.hxx index e8bcd3777c..8c56f9e7f0 100644 --- a/svx/inc/fontlb.hxx +++ b/svx/inc/fontlb.hxx @@ -28,9 +28,7 @@ #ifndef SVX_FONTLB_HXX #define SVX_FONTLB_HXX -#ifndef _SVTABBOX_HXX #include <svtools/svtabbx.hxx> -#endif #include <vcl/virdev.hxx> #include "svx/svxdllapi.h" #include <layout/layout.hxx> diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx index dc587513b8..65efcea510 100644 --- a/svx/inc/imapdlg.hxx +++ b/svx/inc/imapdlg.hxx @@ -34,25 +34,15 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include "svx/svxdllapi.h" diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx index fe00bcf0e5..cf283976b6 100644 --- a/svx/inc/lightdlg.hxx +++ b/svx/inc/lightdlg.hxx @@ -35,9 +35,7 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <svx/dlgctrl.hxx> /************************************************************************* diff --git a/svx/inc/measctrl.hxx b/svx/inc/measctrl.hxx index 00e061b08e..9021242198 100644 --- a/svx/inc/measctrl.hxx +++ b/svx/inc/measctrl.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _CTRL_HXX //autogen #include <vcl/ctrl.hxx> -#endif #include "svx/svxdllapi.h" diff --git a/svx/inc/passwd.hxx b/svx/inc/passwd.hxx index 617c89014d..22dd412e31 100644 --- a/svx/inc/passwd.hxx +++ b/svx/inc/passwd.hxx @@ -31,17 +31,11 @@ #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include "svx/svxdllapi.h" // class SvxPasswordDialog ----------------------------------------------- diff --git a/svx/inc/relfld.hxx b/svx/inc/relfld.hxx index 15863f498e..9f5817ba53 100644 --- a/svx/inc/relfld.hxx +++ b/svx/inc/relfld.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "svx/svxdllapi.h" diff --git a/svx/inc/rubydialog.hxx b/svx/inc/rubydialog.hxx index 51f83c79ac..e2b599dd1e 100644 --- a/svx/inc/rubydialog.hxx +++ b/svx/inc/rubydialog.hxx @@ -32,12 +32,8 @@ #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> #include <vcl/lstbox.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <vcl/scrbar.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/sdrpaintwindow.hxx index 5b2224dfa8..a31f47b864 100644 --- a/svx/inc/sdrpaintwindow.hxx +++ b/svx/inc/sdrpaintwindow.hxx @@ -28,9 +28,7 @@ #ifndef _SDRPAINTWINDOW_HXX #define _SDRPAINTWINDOW_HXX -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx index 19e735265b..2b27902e0c 100644 --- a/svx/inc/sjctrl.hxx +++ b/svx/inc/sjctrl.hxx @@ -27,9 +27,7 @@ #ifdef SOLAR_JAVA -#ifndef _SFXSFXJS_HXX #include <sfx2/sfxjs.hxx> -#endif class VCControl; class VCForm; diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index c8136ca4b9..6c69fde5e6 100644 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx @@ -28,13 +28,9 @@ #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX #define _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX #include <svx/AccessibleShape.hxx> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include "svx/svxdllapi.h" namespace accessibility { diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index 59a601c5a4..59a601c5a4 100755..100644 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index dbbca94edc..dbbca94edc 100755..100644 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx index 403ad6726e..f747ea938e 100644 --- a/svx/inc/svx/SvxShapeTypes.hxx +++ b/svx/inc/svx/SvxShapeTypes.hxx @@ -28,9 +28,7 @@ #ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX #define _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX -#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX #include <svx/ShapeTypeHandler.hxx> -#endif #include <com/sun/star/accessibility/XAccessible.hpp> namespace accessibility { diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 4aefcf2791..4b8d391482 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -33,9 +33,7 @@ #include <svtools/svtreebx.hxx> #include <svtools/svlbitm.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include "svx/svxdllapi.h" // class SvxCheckListBox ------------------------------------------------- diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 853fd75470..b6f14273d1 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -28,12 +28,8 @@ #ifndef _SVX_CTREDLIN_HXX #define _SVX_CTREDLIN_HXX -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx index 8d1c4b7f5c..8d1c4b7f5c 100755..100644 --- a/svx/inc/svx/dbcharsethelper.hxx +++ b/svx/inc/svx/dbcharsethelper.hxx diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 22e2ab820e..22e2ab820e 100755..100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 1d255187c0..9bdb2feac7 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -29,16 +29,10 @@ #define _SVX_FLOAT3D_HXX #include <sfx2/ctrlitem.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <sfx2/dockwin.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include <svtools/valueset.hxx> #include <svtools/stdctrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index 63ab4b85e7..1fda6f0595 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -33,21 +33,13 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx index 911ac0a78b..faf26fc175 100644 --- a/svx/inc/svx/fmshell.hxx +++ b/svx/inc/svx/fmshell.hxx @@ -35,9 +35,7 @@ #include <sfx2/module.hxx> #include <vcl/event.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/fmview.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 20badbeb75..13c43f7580 100644 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -33,9 +33,7 @@ #include <editeng/svxfont.hxx> #include "svx/svxdllapi.h" -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif // forward --------------------------------------------------------------- diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 756b76c868..cd06a07ad9 100644 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -29,12 +29,8 @@ // include --------------------------------------------------------------- -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/valueset.hxx> #include <sfx2/dockwin.hxx> #include <sfx2/ctrlitem.hxx> diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index c56b363d58..b7f9ba36c0 100644 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx @@ -28,9 +28,7 @@ #ifndef _SVX_FRMDIRLBOX_HXX #define _SVX_FRMDIRLBOX_HXX -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <sfx2/itemconnect.hxx> #include <editeng/frmdir.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index e754b32ced..9c5b1a6a09 100644 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -30,9 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/dialog.hxx> #include <vcl/group.hxx> diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index 496891c758..302f0a6f97 100644 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -38,9 +38,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <tools/date.hxx> #include <tools/ref.hxx> #include <svtools/editbrowsebox.hxx> diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 7efa978285..c40a6103d6 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -31,17 +31,11 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svx/pagectrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index a20eecf424..bb476d441d 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -31,9 +31,7 @@ #include <tools/solar.h> #include <tools/stream.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/string.hxx> #include <tools/gen.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx index 43f8c8cd96..63dc2e60e8 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -28,9 +28,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx index 493ba8d79a..e16c9fb297 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -28,9 +28,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx index 20987d603c..f283196606 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -28,9 +28,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 48741625a3..e23763dd55 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -28,9 +28,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx index a14b252d01..6f62af8656 100644 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -28,9 +28,7 @@ #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX #define _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX -#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX #include <svx/sdr/contact/viewcontactofe3d.hxx> -#endif ////////////////////////////////////////////////////////////////////////////// // predeclarations diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx index 13fb76bcb0..29a319cc0a 100644 --- a/svx/inc/svx/sdshitm.hxx +++ b/svx/inc/svx/sdshitm.hxx @@ -27,9 +27,7 @@ #ifndef _SDSHITM_HXX #define _SDSHITM_HXX -#ifndef _SDOOITEM_HXX #include <svx/sdooitm.hxx> -#endif #include <svx/svddef.hxx> //------------------------------ diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx index ccd041888a..ccd041888a 100755..100644 --- a/svx/inc/svx/shapeproperty.hxx +++ b/svx/inc/svx/shapeproperty.hxx diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 6f313b4419..54a90b7877 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -28,17 +28,11 @@ #ifndef _SVX_SIMPTABL_HXX #define _SVX_SIMPTABL_HXX -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <vcl/lstbox.hxx> diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index 0a8c4fe7f7..8a57d39747 100644 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _RESARY_HXX //autogen #include <tools/resary.hxx> -#endif #include "svx/svxdllapi.h" // class SvxStringArray ------------------------------------------------- diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 50cb575ede..fdd3f60212 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -28,9 +28,7 @@ #ifndef _SVDATTR_HXX #define _SVDATTR_HXX -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <tools/solar.h> #include <svx/sdangitm.hxx> #include <svx/sderitm.hxx> @@ -42,25 +40,15 @@ #include <svx/sdshtitm.hxx> #include <svx/sdsxyitm.hxx> #include <svx/sdtaaitm.hxx> -#ifndef _SDTACITM_HXX #include <svx/sdtacitm.hxx> -#endif -#ifndef _SDTACITM_HXX #include <svx/sdtaditm.hxx> -#endif #include <svx/sdtagitm.hxx> #include <svx/sdtaiitm.hxx> #include <svx/sdtaitm.hxx> -#ifndef _SDTAKITM_HXX #include <svx/sdtakitm.hxx> -#endif #include <svx/sdtayitm.hxx> -#ifndef SDTCFITM_HXX #include <svx/sdtcfitm.hxx> -#endif -#ifndef _SDTDITM_HXX #include <svx/sdtditm.hxx> -#endif #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> #include <svx/sdynitm.hxx> diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx index cf1f8e4762..6da6f9ed8a 100644 --- a/svx/inc/svx/svdattrx.hxx +++ b/svx/inc/svx/svdattrx.hxx @@ -33,9 +33,7 @@ #include <svx/sxcaitm.hxx> #include <svx/sxcecitm.hxx> -#ifndef _SXCGIITM_HXX #include <svx/sxcgitm.hxx> -#endif #include <svx/sxciaitm.hxx> #include <svx/sxcikitm.hxx> #include <svx/sxcllitm.hxx> @@ -44,13 +42,9 @@ #include <svx/sxelditm.hxx> #include <svx/sxenditm.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif -#ifndef _SXLAYITM_HXX #include <svx/sxlayitm.hxx> -#endif #include <svx/sxlogitm.hxx> #include <svx/sxmbritm.hxx> #include <svx/sxmfsitm.hxx> @@ -58,9 +52,7 @@ #include <svx/sxmoitm.hxx> #include <svx/sxmovitm.hxx> -#ifndef _SXMSIITM_HXX #include <svx/sxmsitm.hxx> -#endif #include <svx/sxmspitm.hxx> #include <svx/sxmsuitm.hxx> #include <svx/sxmtaitm.hxx> diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 3abbde007a..3d99487e7d 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -31,9 +31,7 @@ #include <tools/string.hxx> #include <tools/contnr.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <tools/shl.hxx> #include <editeng/outliner.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 777117c925..1eaa24f4a1 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -30,14 +30,10 @@ #include <tools/gen.hxx> -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include <tools/contnr.hxx> -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <svx/xpoly.hxx> #include <svx/svdoedge.hxx> diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index d1b5896118..401ae8046c 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -32,9 +32,7 @@ #include <tools/color.hxx> #include <tools/gen.hxx> -#ifndef _POINTR_HXX //autogen #include <vcl/pointr.hxx> -#endif #include <tools/contnr.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx index e8b2eaf3bc..dfda4a711c 100644 --- a/svx/inc/svx/svdouno.hxx +++ b/svx/inc/svx/svdouno.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XControl.hpp> -#ifndef _COM_SUN_STAR_AWT_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/awt/XControlContainer.hpp> #include "svx/svxdllapi.h" #include <svx/svdorect.hxx> diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index c6c2271917..8212eb79d1 100644 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -32,9 +32,7 @@ #include <tools/poly.hxx> #include <tools/fract.hxx> -#ifndef _MAPMOD_HXX //autogen #include <vcl/mapmod.hxx> -#endif #include <tools/string.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 5017f1e127..c56e08c10c 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -28,9 +28,7 @@ #ifndef _SVDUNDO_HXX #define _SVDUNDO_HXX -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #include <svl/undo.hxx> #include <tools/contnr.hxx> #include <tools/gen.hxx> diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx index f93d72e68c..e2dd877b76 100644 --- a/svx/inc/svx/svdxcgv.hxx +++ b/svx/inc/svx/svdxcgv.hxx @@ -30,9 +30,7 @@ #include <svx/svdedxv.hxx> -#ifndef _GDIMTF_HXX //autogen #include <vcl/gdimtf.hxx> -#endif #include "svx/svxdllapi.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx index 28221d57ba..ed7734fa3b 100644 --- a/svx/inc/svx/sxcaitm.hxx +++ b/svx/inc/svx/sxcaitm.hxx @@ -29,9 +29,7 @@ #include <svx/svddef.hxx> -#ifndef _SDRANGITM_HXX #include <svx/sdangitm.hxx> -#endif #include <svx/sdooitm.hxx> //------------------------------------ diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx index f6765fc7f0..06af7e729e 100644 --- a/svx/inc/svx/sxmbritm.hxx +++ b/svx/inc/svx/sxmbritm.hxx @@ -29,9 +29,7 @@ #include <svx/svddef.hxx> -#ifndef SXMBRITM_HXX #include <svx/sdynitm.hxx> -#endif // Die Masslinie unterhalb der Bezugskante // Zur Bemassung einer Objektunterkante diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx index bf1c214557..bdca34b01a 100644 --- a/svx/inc/svx/sxreaitm.hxx +++ b/svx/inc/svx/sxreaitm.hxx @@ -29,9 +29,7 @@ #include <svx/svddef.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif //------------------------------ // class SdrResizeXAllItem diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx index 6a70ba5cca..87a96197e1 100644 --- a/svx/inc/svx/sxreoitm.hxx +++ b/svx/inc/svx/sxreoitm.hxx @@ -29,9 +29,7 @@ #include <svx/svddef.hxx> -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif //------------------------------ // class SdrResizeXOneItem diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index e984f38bb2..bda81abef9 100644 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -27,9 +27,7 @@ #ifndef _SXSIITM_HXX #define _SXSIITM_HXX -#ifndef _SXFIITM_HXX #include <svx/sxfiitm.hxx> -#endif class SdrScaleItem: public SdrFractionItem { public: diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index d6229320d3..480ef78129 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -30,12 +30,8 @@ // include --------------------------------------------------------------- #include <svtools/valueset.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svx/dlgctrl.hxx> #include <svx/xsetit.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 8015939271..d81e65a648 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -29,12 +29,8 @@ // include --------------------------------------------------------------- -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/stdctrl.hxx> #include <svx/svdpage.hxx> #include <svx/xlineit0.hxx> diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index b01c13b55a..2b62fd6053 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -36,9 +36,7 @@ #include <com/sun/star/drawing/XShapeGrouper.hpp> #include <com/sun/star/drawing/XShapeCombiner.hpp> #include <com/sun/star/drawing/XShapeBinder.hpp> -#ifndef _COM_SUN_STAR_UNO_XUNOTUNNEL_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <svl/lstner.hxx> diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index c0a793df80..6869a064fc 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -28,9 +28,7 @@ #define _SVX_VIEWLAYOUTITEM_HXX #include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "svx/svxdllapi.h" //------------------------------------------------------------------------- diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 187a0678d4..beb4ce29ee 100644 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -29,9 +29,7 @@ #define _SVX_XBITMAP_HXX #include <tools/color.hxx> -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif #include <svtools/grfmgr.hxx> #include <svx/xenum.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 3a35a0d6d8..ce6fb2624a 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -28,9 +28,7 @@ #ifndef _SVX_FILLITEM_HXX #define _SVX_FILLITEM_HXX -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif #include <svx/xcolit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index bb571dcd5a..7185808864 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -30,9 +30,7 @@ #include <svx/xit.hxx> -#ifndef _SVX_XLINIIT_HXX //autogen #include <svx/xdash.hxx> -#endif #include "svx/svxdllapi.h" class SdrModel; diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index f40b9fa939..da68a579f9 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -28,9 +28,7 @@ #ifndef _SVX_XSETITEM_HXX #define _SVX_XSETITEM_HXX -#ifndef _XATTR_HXX #include <svx/xit.hxx> -#endif #include <svl/metitem.hxx> #include <svl/eitem.hxx> #include <svx/rectenum.hxx> diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 444d2cf984..d5c8b199f5 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -37,14 +37,10 @@ #include <svx/xflasit.hxx> #include <svx/xlnasit.hxx> -#ifndef _SV_COLOR_HXX #include <tools/color.hxx> -#endif #include <tools/string.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include "svx/svxdllapi.h" #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index ef335083aa..99e5bfda0b 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -28,9 +28,7 @@ #define _SVX_ZOOMITEM_HXX #include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "svx/svxdllapi.h" //------------------------------------------------------------------------- diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index dddb6ec80c..ef6c5ccd97 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -28,9 +28,7 @@ #define _SVX_ZOOMSLIDERITEM_HXX #include <svl/intitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <com/sun/star/uno/Sequence.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/txencbox.hxx b/svx/inc/txencbox.hxx index a37cf0aad7..e37971cdd4 100644 --- a/svx/inc/txencbox.hxx +++ b/svx/inc/txencbox.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <rtl/textenc.h> #include "svx/svxdllapi.h" diff --git a/svx/inc/txenctab.hxx b/svx/inc/txenctab.hxx index a1d28b2695..3634af6122 100644 --- a/svx/inc/txenctab.hxx +++ b/svx/inc/txenctab.hxx @@ -29,9 +29,7 @@ // include --------------------------------------------------------------- -#ifndef _RESARY_HXX //autogen #include <tools/resary.hxx> -#endif #include <rtl/textenc.h> #include "svx/svxdllapi.h" diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx index 8fe1de39b2..210bfb475d 100644 --- a/svx/inc/uiks.hxx +++ b/svx/inc/uiks.hxx @@ -27,9 +27,7 @@ #ifndef _SVX_UIKS_HXX #define _SVX_UIKS_HXX -#ifndef _USR_UIKS_HXX #include <usr/uiks.hxx> -#endif // DBENGINE diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 0355a840d5..fe63e729f3 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -31,15 +31,9 @@ #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/Key.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HDL_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLERELATIONTYPE_HDL_ #include <com/sun/star/accessibility/AccessibleRelationType.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HDL_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/awt/FocusChangeReason.hpp> #include <unotools/accessiblestatesethelper.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 33d9bef294..af26d92771 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -58,14 +58,10 @@ #include <numeric> #include <algorithm> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ #include <com/sun/star/i18n/CharacterIteratorMode.hdl> -#endif #include <basegfx/polygon/b2dpolygontools.hxx> using namespace com::sun::star; diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 3689d19935..a062456787 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -27,9 +27,7 @@ #ifndef _CONTIMP_HXX_ #define _CONTIMP_HXX_ -#ifndef _CONTDLG_HXX #include <svx/contdlg.hxx> -#endif #include "contwnd.hxx" #include <vcl/toolbox.hxx> #include <vcl/status.hxx> diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 96a5c1782e..40b1e005d1 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_USHORTS diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index fb92cb45f7..b6c4383992 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -29,17 +29,13 @@ #ifndef _SVXGRAPHACCESSIBLECONTEXT_HXX #define _SVXGRAPHACCESSIBLECONTEXT_HXX -#ifndef _CPPUHELPER_IMPLBASE7_HXX_ #include <cppuhelper/compbase7.hxx> -#endif #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_IllegalAccessibleComponentStateException_HPP_ #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <cppuhelper/weak.hxx> diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index a32993e907..0a21bb5bc5 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -29,9 +29,7 @@ #include <tools/list.hxx> #include <tools/color.hxx> #include <tools/string.hxx> -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif #include <rtl/uuid.h> #include <comphelper/accessibleselectionhelper.hxx> #include <com/sun/star/accessibility/XAccessibleTable.hpp> diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index da91352adc..b5d19257a5 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -29,13 +29,9 @@ #define _SVX_DOCRECOVERY_HXX #include <vcl/tabpage.hxx> -#ifndef _SV_TABDIALOG_HXX #include <vcl/tabdlg.hxx> -#endif #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <svtools/svmedit2.hxx> #include <svtools/svtreebx.hxx> diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 16ebaa7273..3b7aac5f43 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> /** === end UNO includes === **/ -#ifndef SVX_SOURCE_FORM_FMDOCUMENTCLASSIFICATION_HXX #include "fmdocumentclassification.hxx" -#endif #include <unotools/confignode.hxx> //........................................................................ diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx index fad4aaa3bf..2c1791ee71 100644 --- a/svx/source/inc/fmgroup.hxx +++ b/svx/source/inc/fmgroup.hxx @@ -27,13 +27,9 @@ #ifndef _SVX_FMGROUP_HXX #define _SVX_FMGROUP_HXX -#ifndef _SVX_FMCPONT_HXX #include "fmcpont.hxx" -#endif -#ifndef __DBFORM_HXX #include <dbform.hxx> -#endif DECLARE_LIST( FmCtrlModelList, XInterface* ); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index e90391d138..31103bd371 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -51,9 +51,7 @@ #include <sfx2/app.hxx> #include <svx/svdmark.hxx> #include <svx/fmsearch.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/svarray.hxx> #include <svl/lstner.hxx> diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 849981fefb..92edace2f2 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -31,9 +31,7 @@ #include <vcl/field.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif //======================================================================== class SvxFmAbsRecWin : public NumericField diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index d8590b973f..0424e408f5 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -32,9 +32,7 @@ // header for class FixedLine #include <vcl/fixed.hxx> // header for class RadioButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif // header for class Edit #include <vcl/edit.hxx> // header for class ListBox diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 630ac959e5..0e305a7d3a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -32,9 +32,7 @@ // header for class FixedLine #include <vcl/fixed.hxx> // header for class RadioButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif //............................................................................. namespace textconversiondlgs diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 801d7bc93c..8dfa8ba559 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -29,9 +29,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/container/XIdentifierContainer.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#ifndef _COM_SUN_STAR_DRAWING_GLUEPOINT2_HDL_ #include <com/sun/star/drawing/GluePoint2.hpp> -#endif #include <cppuhelper/implbase2.hxx> diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index dc6575af02..cf13014610 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ #include <com/sun/star/beans/PropertyState.hpp> -#endif #include <comphelper/propertysetinfo.hxx> #include <rtl/uuid.h> diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index fe01e01449..dabc8edcf7 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -41,12 +41,8 @@ #include <svl/itempool.hxx> #include "galobj.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ #include <com/sun/star/beans/PropertyState.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HDL_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/gallery/GalleryItemType.hpp> #define UNOGALLERY_GALLERYITEMTYPE 1 diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 5df3bbcc36..cc75585290 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/gallery/XGalleryItem.hpp> #include <comphelper/propertysethelper.hxx> -#ifndef _COMPHELPER_PROPERTYSETINFO_HXX_ #include <comphelper/propertysetinfo.hxx> -#endif class GalleryTheme; struct GalleryObject; diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index e09093d09e..8065e2f757 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -41,9 +41,7 @@ #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HDL_ #include <com/sun/star/io/XSeekable.hdl> -#endif #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sysui/source/win32/misc/AutoBuffer.hxx b/sysui/source/win32/misc/AutoBuffer.hxx index 6f16a337cd..22eed08c5d 100644 --- a/sysui/source/win32/misc/AutoBuffer.hxx +++ b/sysui/source/win32/misc/AutoBuffer.hxx @@ -34,9 +34,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif //------------------------------------------------------------- // A simple unicode buffer management class, the class itself diff --git a/sysui/source/win32/misc/WinImplHelper.hxx b/sysui/source/win32/misc/WinImplHelper.hxx index c692e939bd..f36ee2a7f6 100644 --- a/sysui/source/win32/misc/WinImplHelper.hxx +++ b/sysui/source/win32/misc/WinImplHelper.hxx @@ -35,9 +35,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif #include <windows.h> #include <com/sun/star/uno/Any.hxx> diff --git a/sysui/source/win32/misc/resourceprovider.hxx b/sysui/source/win32/misc/resourceprovider.hxx index b61e477acc..fcc40a4eb2 100644 --- a/sysui/source/win32/misc/resourceprovider.hxx +++ b/sysui/source/win32/misc/resourceprovider.hxx @@ -35,9 +35,7 @@ #include <sal/types.h> -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif //------------------------------------------------------------------------ // deklarations diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index f62b262808..9b1f1226cf 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -40,9 +40,7 @@ #include <com/sun/star/beans/XPropertiesChangeNotifier.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/ucb/XContentProvider.hpp> -#ifndef _COM_SUN_STAR_UCB_XRESULTSET_HPP_ #include <com/sun/star/ucb/XDynamicResultSet.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> @@ -59,9 +57,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp> -#ifndef _COM_SUN_STAR_UCB_SHELL_HXX_ #include "shell.hxx" -#endif namespace fileaccess { diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 329889af6c..0a73274272 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -40,9 +40,7 @@ #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _COM_SUN_STAR_UCB_XDYNAMICRESULTSET_HPP__ #include <com/sun/star/ucb/XDynamicResultSet.hpp> -#endif #include <com/sun/star/ucb/XDynamicResultSetListener.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/ucb/NumberedSortingInfo.hpp> diff --git a/ucb/source/ucp/ftp/ftphandleprovider.hxx b/ucb/source/ucp/ftp/ftphandleprovider.hxx index d3b1e4f28f..d3b1e4f28f 100755..100644 --- a/ucb/source/ucp/ftp/ftphandleprovider.hxx +++ b/ucb/source/ucp/ftp/ftphandleprovider.hxx diff --git a/ucb/source/ucp/ftp/test_ftpurl.hxx b/ucb/source/ucp/ftp/test_ftpurl.hxx index 641e29fa80..641e29fa80 100755..100644 --- a/ucb/source/ucp/ftp/test_ftpurl.hxx +++ b/ucb/source/ucp/ftp/test_ftpurl.hxx diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx index 23956945e7..5a42bad695 100644 --- a/uui/source/cookiedg.hxx +++ b/uui/source/cookiedg.hxx @@ -28,9 +28,7 @@ #ifndef UUI_COOKIEDG_HXX #define UUI_COOKIEDG_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index f9cec7899a..630980c1b6 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -34,14 +34,10 @@ #include <vcl/dialog.hxx> -#ifndef _MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <tools/string.hxx> diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 0f54e9ee8a..0f54e9ee8a 100755..100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index a349929ce7..60b728fa59 100755..100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -29,9 +29,7 @@ #define UUI_LOGINDLG_HXX #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx index ec1317dbd8..ec1317dbd8 100755..100644 --- a/uui/source/loginerr.hxx +++ b/uui/source/loginerr.hxx diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 6c652cbb44..d6dfdc33d1 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -28,13 +28,9 @@ #ifndef UUI_MASTERPASSCRTDLG_HXX #define UUI_MASTERPASSCRTDLG_HXX -#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP #include <com/sun/star/task/PasswordRequestMode.hpp> -#endif #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/group.hxx> diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 07753fbd3d..c8272d5130 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -28,13 +28,9 @@ #ifndef UUI_MASTERPASSWORDDLG_HXX #define UUI_MASTERPASSWORDDLG_HXX -#ifndef _COM_SUN_STAR_TASK_PASSWORDREQUESTMODE_HPP #include <com/sun/star/task/PasswordRequestMode.hpp> -#endif #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/group.hxx> diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index e5a0a7885b..e5a0a7885b 100755..100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 4e94cc8855..01242470a9 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -33,9 +33,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace cssu = com::sun::star::uno; diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 0ca6c38fe8..8a54879007 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -33,9 +33,7 @@ #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <com/sun/star/security/XCertificate.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_XXSECURITYENVIRONMENT_HPP_ #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace cssu = com::sun::star::uno; diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx index b0dd184c1a..b0dd184c1a 100755..100644 --- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx +++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index 5bc23f44b2..5bc23f44b2 100755..100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx diff --git a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx index 09ff47ed3f..a6b659ba8f 100644 --- a/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx +++ b/xmlhelp/source/cxxhelp/inc/db/EntryProcessor.hxx @@ -27,9 +27,7 @@ #ifndef _XMLSEARCH_DB_ENTRYPROCESSOR_HXX_ #define _XMLSEARCH_DB_ENTRYPROCESSOR_HXX_ -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring> -#endif namespace xmlsearch { diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 24b9ff414b..e763d15e85 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -28,9 +28,7 @@ #define _XMLSEARCH_QE_DOCGENERATOR_HXX_ #include <rtl/ref.hxx> -#ifndef _RTL_USTRING_HXX__ #include <rtl/ustring.hxx> -#endif #include <excep/XmlSearchExceptions.hxx> #include <util/CompressorIterator.hxx> #include <util/Decompressor.hxx> diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx index e821f712b3..35c64bc6d2 100644 --- a/xmloff/inc/XMLBackgroundImageExport.hxx +++ b/xmloff/inc/XMLBackgroundImageExport.hxx @@ -28,9 +28,7 @@ #ifndef _XMLBACKGROUNDIMAGEEXPORT_HXX #define _XMLBACKGROUNDIMAGEEXPORT_HXX -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif namespace rtl { class OUString; } namespace com { namespace sun { namespace star { namespace uno { diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index 1546b25d77..7ed76b64a6 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -30,9 +30,7 @@ #include <xmloff/xmlictxt.hxx> -#ifndef _XMLOFF_XMLIMP_HXX_ #include <xmloff/xmlimp.hxx> -#endif #include <rtl/ustrbuf.hxx> diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 8b6a98569a..269fa32e06 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -28,9 +28,7 @@ #define _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_ -#ifndef _XMLOFF_XMLICTXT_HXX_ #include <xmloff/xmlictxt.hxx> -#endif namespace com { namespace sun { namespace star { namespace text { class XTextCursor; } diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/unoatrcn.hxx index a1d2493fc1..8cc12084ec 100644 --- a/xmloff/inc/unoatrcn.hxx +++ b/xmloff/inc/unoatrcn.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase3.hxx> -#endif extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvUnoAttributeContainer_CreateInstance(); diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx index 7bb2d2992f..4f5dc9bea2 100644 --- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx +++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx @@ -34,9 +34,7 @@ #include <vector> #endif -#ifndef _XMLOFF_XMLSTYLE_HXX_ #include <xmloff/xmlstyle.hxx> -#endif struct XMLPropertyState; class SvXMLTokenMap; diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx index 2824f97252..0acb0eacfc 100644 --- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx +++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx @@ -31,9 +31,7 @@ #include "xmloff/dllapi.h" #include "sal/types.h" -#ifndef _XMLOFF_XMLSTYLE_HXX_ #include <xmloff/xmlstyle.hxx> -#endif namespace com { namespace sun { namespace star { namespace style { class XStyle; } diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx index 5ae9d2b60d..64df3a0d62 100644 --- a/xmloff/inc/xmloff/prstylei.hxx +++ b/xmloff/inc/xmloff/prstylei.hxx @@ -34,9 +34,7 @@ #ifndef __SGI_STL_VECTOR #include <vector> #endif -#ifndef _XMLOFF_XMLSTYLE_HXX_ #include <xmloff/xmlstyle.hxx> -#endif struct XMLPropertyState; class SvXMLStylesContext; diff --git a/xmloff/inc/xmloff/xmlement.hxx b/xmloff/inc/xmloff/xmlement.hxx index 8926165bb9..4263f7356c 100644 --- a/xmloff/inc/xmloff/xmlement.hxx +++ b/xmloff/inc/xmloff/xmlement.hxx @@ -28,9 +28,7 @@ #ifndef _XMLOFF_XMLEMENT_HXX #define _XMLOFF_XMLEMENT_HXX -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif #include <xmloff/xmltoken.hxx> /** Map an XMLTokenEnum to a sal_uInt16 value. diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 688f002a06..1932cc7b71 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -54,12 +54,8 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XExporter.hpp> -#ifndef _COM_SUN_STAR_DRAWING_XGRAPHICOBJECTRESOLVER_HPP_ #include <com/sun/star/document/XGraphicObjectResolver.hpp> -#endif -#ifndef _COM_SUN_STAR_DRAWING_XEMBEDDEDOBJECTRESOLVER_HPP_ #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XEventListener.hpp> diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx index cbc4560736..07c293aecb 100644 --- a/xmloff/inc/xmloff/xmlimppr.hxx +++ b/xmloff/inc/xmloff/xmlimppr.hxx @@ -33,9 +33,7 @@ #include <tools/solar.h> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp> diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index 6f5ffee572..6f5ffee572 100755..100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 5a250142c6..8c7de5c7ff 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -54,9 +54,7 @@ #include <rtl/ustrbuf.hxx> #include "xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> -#ifndef _XMLOFF_NMSPMAP_HX #include <xmloff/nmspmap.hxx> -#endif #include "SchXMLImport.hxx" // header for class XMLPropStyleContext #include <xmloff/prstylei.hxx> diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index f80be8bbc7..f80be8bbc7 100755..100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx index 9a3b8297b4..07a3c40052 100644 --- a/xmloff/source/style/XMLRectangleMembersHandler.cxx +++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx @@ -31,9 +31,7 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> -#ifndef _COM_SUN_STAR_AWT_RECTANGLE_HDL_ #include <com/sun/star/awt/Rectangle.hdl> -#endif #include "XMLRectangleMembersHandler.hxx" #include <xmloff/xmltypes.hxx> diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx index ab947fa614..e9d2b42516 100644 --- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx +++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx @@ -28,9 +28,7 @@ #ifndef _XMLOFF_XMLANCHORTYPEPROPHDL_HXX #define _XMLOFF_XMLANCHORTYPEPROPHDL_HXX -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif #include <xmloff/xmlprhdl.hxx> diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index ed66c43555..f9a182fc93 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -28,9 +28,7 @@ #ifndef _XMLTEXTFRAMECONTEXT_HXX #define _XMLTEXTFRAMECONTEXT_HXX -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif #include <xmloff/xmlictxt.hxx> namespace com { namespace sun { namespace star { diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index 7fdd058a54..cbfa463d9b 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -28,12 +28,8 @@ #ifndef _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX #define _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX -#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP #include <com/sun/star/text/TextContentAnchorType.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_XTEXTFRAME_HPP #include <com/sun/star/text/XTextFrame.hpp> -#endif #include <xmloff/xmlictxt.hxx> namespace com { namespace sun { namespace star { diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index ae4c96e687..67d349cb33 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -32,9 +32,7 @@ #include "txtdrope.hxx" #include "xmltabe.hxx" #include "XMLTextColumnsExport.hxx" -#ifndef _XMLOFF_XMLBACKGROUNDIMAGEEXPORT_HXX #include "XMLBackgroundImageExport.hxx" -#endif class SvXMLExport; class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index 553d49188b..0e4ca36c02 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -33,9 +33,7 @@ #include <map> -#ifndef _XMLOFF_FLATTRCONTEXT_HXX #include "FlatTContext.hxx" -#endif typedef ::std::multimap< ::rtl::OUString, ::rtl::Reference< XMLPersTextContentTContext >, diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index 3d49e63f47..f7d1a7bd14 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XFilter.hpp> #include "ActionMapTypesOOo.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX_ #include "TransformerBase.hxx" -#endif class XMLTransformerOOoEventMap_Impl; diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx index 5d0093f851..1f5511dea9 100644 --- a/xmloff/source/transform/Oasis2OOo.hxx +++ b/xmloff/source/transform/Oasis2OOo.hxx @@ -29,9 +29,7 @@ #define _XMLOFF_OASIS2OOO_HXX #include "ActionMapTypesOASIS.hxx" -#ifndef _XMLOFF_TRANSFORMERBASE_HXX_ #include "TransformerBase.hxx" -#endif class XMLTransformerOASISEventMap_Impl; diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx index ff6f615df4..6664b99a51 100644 --- a/xmloff/source/transform/TransformerBase.hxx +++ b/xmloff/source/transform/TransformerBase.hxx @@ -36,9 +36,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_TRANSFORMER_HXX_ #include "Transformer.hxx" -#endif namespace rtl { class OUString; } namespace com { namespace sun { namespace star { diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx index 616b0504cc..4a235710a8 100644 --- a/xmloff/source/transform/TransformerTokenMap.hxx +++ b/xmloff/source/transform/TransformerTokenMap.hxx @@ -32,9 +32,7 @@ #include <comphelper/stl_types.hxx> #include <hash_map> #include <xmloff/xmltoken.hxx> -#ifndef _XMLOFF_TRANSFORMERTOKENMAP_HXX #include "TransformerTokenMap.hxx" -#endif diff --git a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx index 2fe6f352dc..c2d7abc951 100644 --- a/xmlscript/inc/xmlscript/xmldlg_imexp.hxx +++ b/xmlscript/inc/xmlscript/xmldlg_imexp.hxx @@ -27,18 +27,10 @@ #ifndef _XMLSCRIPT_XMLDLG_IMEXP_HXX_ #define _XMLSCRIPT_XMLDLG_IMEXP_HXX_ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HXX_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_ #include <com/sun/star/io/XInputStreamProvider.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HXX_ #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HXX_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif #include "xmlscript/xmlns.h" diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx index cc46525d4e..291be12a88 100644 --- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx +++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_ #include <com/sun/star/script/XLibraryContainer2.hpp> -#endif #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/input/XRoot.hpp> #include <cppuhelper/implbase1.hxx> |