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 | d890da89f4d27f7acfb181a5a547a95ad823efb0 (patch) | |
| tree | ba02efe1388d25e748246fe06ebc80bb0eeabae7 | |
| parent | 7ed2a540495c2583fa2a9dcfb903b26c89cd153c (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 fdd27582a5f4..b83915e4775b 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 d3e1f2419b53..b64acf22b2ba 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 11f6b6f8b217..b940e1170d5a 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 eebf4edd73fa..3ba0315fb34e 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 778c877edf46..69b55ab34adf 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 4a7b84e4bb59..a17ee1f35135 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 a5b004e0383e..56e3f5efb13f 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 07740a1a9259..c888eb1d2030 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 e85bbc5035db..52f15f545a31 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 4ca2e76ddc52..33baf7d19e88 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 ff077f034e43..17607d817ff8 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 ea28121e3609..3d249b1c2046 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 17085571feea..83bc7ff68da1 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 1bb3e530c016..ff07f778f88f 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 34a567750b74..e3dc64f3eb32 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 36cff49a742a..b923f4f73290 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 b8faf2774f73..791f93282bd4 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 b1e18613fbeb..b6e10c98799c 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 014d349acfac..4c154971cfc9 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 a234dc206ec7..2f482db4b5ec 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 5cc76c8bd9c3..79a8e93970e6 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 d105d71d11f1..5f754159ba23 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 9a1a1d9c111e..29f87c11df09 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 cd76b6481def..863543702ce3 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 339f0c1a3d18..632df58248d3 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 4a003bd0482d..c9ea8ed89041 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 fbd67aa85f1b..0977b59212d6 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 e04396e20809..cca19b0286d2 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 2c927a8286f4..737d1274718f 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 d674b91faf71..9b427c9b6276 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 b0ebcb0e87f0..a64310582ca5 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 29e4f68cc133..6abb52df93f1 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 be396a426185..bd030ade499e 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 6ca69209a752..d61b91284042 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 e8a482c2f6e9..e8a482c2f6e9 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 78afa9783ca8..5a5981379fb7 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 9738e8763a1a..bd41d992aacc 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 930f68910b78..ec07dcbd8518 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 c1e9da823a20..f61ceb366ab0 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 94ca201e5ad5..94ca201e5ad5 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 0ac01575d440..33c9c90df918 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 9bec7c02d57f..992a4169e31b 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 710647b10380..87718e205685 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 26bc530a9960..64463a877493 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 d4454ec5ffa8..d4454ec5ffa8 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 52bb6e8ab62c..52bb6e8ab62c 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 200ccfb3d7dd..200ccfb3d7dd 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 4daba81de77b..4daba81de77b 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 af24f886f56f..af24f886f56f 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 1e12a3c2ae55..1e12a3c2ae55 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 641eba360a4e..641eba360a4e 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 c1327e823bea..c1327e823bea 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 239a9c448c99..239a9c448c99 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 4daa66699998..4daa66699998 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 b79fc93a8408..b79fc93a8408 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 b9d1fd6193d4..a73a5dab77f4 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 0458c672e050..0458c672e050 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 5f2f1af29405..5f2f1af29405 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 1e0f322aba55..44d02df57abe 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 df91d641ee8f..df91d641ee8f 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 215b77307c38..f9da0a0f3d5f 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 700e562ca6e3..53a410d75cf3 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 ec82541243e6..fc1ccbbb828c 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 d69a5e3435bf..df17d79680e6 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 9358cd65e650..49c7d5d59abd 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 562efc6ba0f9..b1fae734c1c9 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 b0bc3ad65323..8113c1ae254e 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 39c6e34408d4..af96e37a1838 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 4cd7c9805c9e..3478034de906 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 8d7d52e6eb97..f7ac9add7563 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 b514b82739d3..0dc98d549fb4 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 abd8f93ef395..76a14a6dc56f 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 b6fbdb231d4d..4f8bca60dc50 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 530387ceef4a..778fb6dc0808 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 bc4cd450f931..775704f4ff18 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 47cb4781c72a..c3ae303eb3c6 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 66f339247dfc..1120b6de0b93 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 fa7550812bbe..c5cb6aa1e789 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 4bca6e7e7d1a..ec5215c875cf 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 a5e1c9059454..6b1f2c051cc7 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 98cb7de7a04f..2755824936bf 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 f0a85cce98c0..f0a85cce98c0 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 7ac00e2740d4..7ac00e2740d4 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 762f50296690..762f50296690 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 094e25e249b7..094e25e249b7 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 32c317cb8735..34411f9ed0b6 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 c0e64a8028e8..991eac3d2ebd 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 95853746bef2..559946b7cc23 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 01511b1f2d21..01511b1f2d21 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 c21f7b67f6d5..9b6b1ede830e 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 de32033115b7..b1591e592473 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 1b2076d161c9..5d9c0cdab69b 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 3bb83f68ed12..3e18ffbbbbe7 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 e54e7beb0be4..96c2b4f5e183 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 5e46a96adb9f..5e46a96adb9f 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 3890bb009cae..b1c90f0de0a1 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 bf2e3d01852b..13069d4561a6 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 e185bcc9e3e5..e185bcc9e3e5 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 951507ee4f19..e13ac01a1dd4 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 70398c39620f..8e378d3c3fc0 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 c8df82fb1534..00a6bd7f5ab0 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 54cfbaee24af..9c8e576a9fde 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 0c4e7562389d..b0b982971f71 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 60795d87dec9..37390632978d 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 b7529a11e34f..a866f18483cf 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 be22ffddf063..4d4c45d9947e 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 21839554aefc..3fd0a0975e25 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 fbfa9a9355a5..632866529685 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 42f6a58b55f6..61c321cd6702 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 07b25c256653..6bac155bc602 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 6bd63f091441..a623375ca614 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 cb43dd12b3e2..8fbb8eb9113e 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 f1d8753dcf43..9167a21d5752 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 61d63952f8c7..d7b4e8d83f5f 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 6bd63f091441..a623375ca614 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 0bb02c3b7682..9d61286ce07b 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 97cd753053bf..41738a1f12e0 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 203fa6eb67eb..fc1ebc57ba69 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 34442c2e2a67..345fa0591bc7 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 516c50a1141a..d5e2e744371d 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 bd3aee81694b..cf19f99dcb55 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 cd82d4521b21..cd82d4521b21 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 0b2f7d547b2e..73099e57ddd8 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 15e2a1df5987..26babd41200f 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 25bb1db58086..82d4d14d59b8 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 e8002834dff9..5468024d9f3c 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 6a1886244b54..6a1886244b54 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 e3fce4bcac35..15ebd7d07514 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 acbcb5b3b050..53afa33c2da0 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 b2f2258517af..a2cd4e37c582 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 8081f823cc52..d7556d875c3f 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 7d3ca0539ef8..a2e6dfc1fa04 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 17a902f7d24d..f7b8fb2e5450 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 68960e101157..95129517fe9b 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 6c8a6ed4dd58..f06992586afc 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 1469181f13e0..d70e136f4311 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 13f374f353c7..870d01b1d9d0 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 069227446aa8..d9e53a21a23c 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 3f0072be212f..f93f95c89dfe 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 1526f57fc4c5..f85ad0bdc372 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 875ee7fb10b6..60e435a00ddf 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 bf1525cf5f63..771cd27d81b2 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 e5ccacd28c8f..1cc4898ab0c6 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 5e14b70f0044..9c10d4934b4d 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 14a62daca285..14a62daca285 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 745dea7ecee9..2f6c8638ff9e 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 caba9b8fa02f..519ac9d68c68 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 aa5d5ec52e1f..2db4d4437806 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 2ecb63ed1609..de9c91c2a4d6 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 fbf1dce837e3..675edea6ead4 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 3ce94a872344..5656649dcec3 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 924c601ac689..5b60c164f79d 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 07f6348184e2..4fd792c74dfa 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 23ec86df8a00..0956f468e822 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 f2b0b1d6afb6..f3b5b5c6bac6 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 8d83dcd459b3..a79613f3ebc7 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 2d8f3ea57920..dd0d39da7214 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 291fc29675eb..fab4fed699a3 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 0844dd74bf02..0844dd74bf02 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 982f390f8469..3729a91d73b9 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 7cb9280ef0e2..9d3949f08528 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 619ce140d491..c185e5644348 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 2a3a643731ab..2a3a643731ab 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 bc35def8036c..bc35def8036c 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 8c81f31f2394..de8e862ef32f 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 e11e33a8f4f4..5dbda39d56f0 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 85b0bfcd087d..838073a2f10a 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 29ca511f88f3..29ca511f88f3 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 c69c614db7cb..56b6ce48de3c 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 7156be8f8327..36486cd3a841 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 16f332480cf6..16f332480cf6 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 64ad32cb1337..d32acec8c7c9 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 1bdbdf98161d..979f3040626f 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 ae1f8a23ddc9..d49be8866b6a 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 fe8358bfe646..58cd91a26a7f 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 3508ea026637..30093efa3b3f 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 579d7b1299d3..8c5f471c72f7 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 ddc0d6196a64..ae2a88c9d091 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 9b775f8e827d..d8290c4dbc9e 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 a07c43426a71..578b295d56ac 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 2032b8f751ca..b7ca171e935f 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 ba6a9b844b7a..0794de2eaffb 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 9c9b566d9d9d..64a90c74684d 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 1647f880500d..c6f8aa2cfd4e 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 ce596bacaa81..fa30c4849f89 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 c7710f533935..6025925e76bd 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 cad348887670..722fa8a5625c 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 a96033835a84..1d11a2886eb8 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 4a8fc86d4205..4e2deccea7bb 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 d25f0ee0b967..d25f0ee0b967 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 fb331889a573..4976d5280bb0 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 76be875d6d70..93f7e9492b4a 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 30d82c854642..43f31f807a48 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 ceea5452a0d5..432fbd29dc0a 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 e45d8f591342..f26f709e6af3 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 6f9ae1d3cb37..56b3659e9fb8 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 3476f0d305b5..2adac61ee728 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 d702f2a50977..bc78874cb15f 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 84b1a9cc9611..e1b72185fb73 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 5bd586576ac8..5bd586576ac8 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 9ba05fc20cee..9ba05fc20cee 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 f7c38173fceb..a6de0d5ffc5f 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 bbc3c1cd63ac..e4d53dff22d8 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 371fa96c57a2..b6a9a3859c91 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 e58c6cd5592d..3a18416d59a4 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 f800e1e253ae..7d92a0af16df 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 73014121541e..0ba5de4f7b6f 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 5105d27dd536..7ee8812da1bd 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 03b0d72dac61..3fdc1f5d2d0a 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 116f56163681..fe123d54c509 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 73b686d91252..b5f08042f00b 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 a82b72bc2947..05040c0a716e 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 fcdf1cdd7dff..0980903a2508 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 ea29dff07c80..ea29dff07c80 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 6379fdf0137b..6379fdf0137b 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 b13a142b6e2c..b13a142b6e2c 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 2ef4529b54ce..2ef4529b54ce 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 4701a2682446..4701a2682446 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 520bd0acbb56..b52238efd026 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 343de67cb68c..37c895e4ce91 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 d7955cc135fd..34adfb25ba4c 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 b4d5f18b7899..675af73635b2 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 b68863523b28..b68863523b28 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 5457dffbffd9..847dbf0c8eea 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 caeb0710de90..c7b28626963f 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 e945556c6f8b..24fdfe4b44c5 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 468fffcc43b7..5c3ee5b0c517 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 813b01ba390f..cd79d36960f1 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 d1a6961453a5..11be78a884cc 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 0e9afebb42b5..08382225bde1 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 d45dc134cf19..45a582515e0b 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 9a6b14f0144a..4bd83bd3b5de 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 02d9ca20a5d3..aa060a3a40df 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 e8deecfed145..641c724b3346 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 fef8c2e604d0..2905c321d48c 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 16de32f733dc..192fc6ce4018 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 27cd0f5fe237..c755bc444626 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 e1979294b2d8..e1979294b2d8 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 1b8a7b6947c6..1b8a7b6947c6 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 b4c76f19354b..874ecfeaa666 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 b72b134e48d8..2bfb10d49373 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 abedd54f0c00..020c26418c9c 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 40ec31c37d85..40ec31c37d85 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 0894540d1972..0894540d1972 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 432d78b211ad..0119043446d2 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 b2722c7016b9..c5698b31d994 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 f37eeab8c5e6..523309cac77b 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 2b49e413e7be..7129ebbd8dc6 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 73f0ac5dd712..67bf1f2b7894 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 24eb27362e45..30e1b4c651f2 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 88c31fe42d13..0e6550f6de62 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 445d986b2c5e..6b1fa86d6c3a 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 b3c425b85b93..30ebed2ce6d8 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 6869a97e424a..efa51830f657 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 cccb51a4b8cc..c8920bb24d52 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 4fa152af362d..27626f67ec8e 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 5c8502348b00..9059a2354cbf 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 f681655888aa..05ae683bf652 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 68a64e888d91..d296ae552df0 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 95f98ce943f6..373ac6a851a4 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 9b08d9c741b4..9b08d9c741b4 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 1f5543e9e484..786e4db77da7 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 08f4975f1e35..3bd6bde172cd 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 4c4ddde2912d..41a419b51895 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 7fba70ed1ed2..f3cecb400708 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 527c1ac17bf8..3cc93646999f 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 f96b650d2be4..d09df319dbef 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 1d5677ec95f6..dd882c749baa 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 c30f22064674..9378e3ac71c5 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 36116e821369..3dc827521901 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 3ef31455b6e7..460b528dfa53 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 9bdd6e005cc3..bd265d7c6a08 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 647d6bc0d807..320cad9a63e2 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 1f28844a0910..998fa887c314 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 ea539f63d12b..c9701c0d006f 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 1d090c4b7277..4186ff1e5c8a 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 e3f11e57bc3a..4bd9b7a16934 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 873dbc576f7c..98c1d4f51df2 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 7ccc189b0083..c1c9b3771fe9 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 5c227112342b..14f3d2f1f809 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 37355a47084a..6d837e4ebca4 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 f3b2d98c138d..5c83af80067d 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 7556140bbbf6..19a51cdd6bf8 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 f2e22f4c7f11..0219ccc6dcc3 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 f8405490bac9..051baed0138b 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 7ef8e659b08f..2d4313bb74f0 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 9742002c282a..90dd5e83f177 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 dddb6ec80cdd..ef6c5ccd978f 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 e24716f8c953..ec28d643136d 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 e04428717c53..ed6abc43f9c7 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 a143d6537f65..78c6d1ac5be4 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 c39a5ae74e5b..6c8d4fc4c015 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 06c7098400a3..b34c5d7b02ce 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 0017966f1eaf..3af00f8d6f53 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 27b01dacec7e..6379c3593f17 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 395d3d511841..fcd23eeea474 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 f7eba57bd8fb..b0a1aead4aaf 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 b35b46a941aa..da69e9a754a4 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 0cff5f6282cd..493538fbf41a 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 109a445dca70..30670f3663d5 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 88d2346b9d20..55d8c33fc5ea 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 79fee9082999..f74e301d3db3 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 afe573330fe8..eb9d5ce9dde5 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 9d046d120e68..742a5c1d0dca 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 eb5cd8ec5231..52d6fa20fbe9 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 8c2d7ecde19a..f0b9a2e948d8 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 53bd6b99e5fc..6dc28ee4ac3c 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 a48f83a49313..e45e416f6649 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 58cf00441520..c08a18d1af0d 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 920ed38a589b..cdbcfa597ca5 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 05527c6e6ed2..48498e70a5b6 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 e1a0fbea30b8..f441dcd41309 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 2163758bfffc..3971d0b632a1 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 977eddec8ccd..2d1fc2a71405 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 1510f48e41a6..1510f48e41a6 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 641e29fa8087..641e29fa8087 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 42dec3d08611..ed0d1a808fea 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 7284ae001437..4690b1c6539d 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 581099462845..581099462845 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 05ba8e8d55d4..21e427631dfb 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 ec1317dbd805..ec1317dbd805 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 29134b6b8fbc..b9f2c6e79822 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 a78cb6eb50b8..823171a9fda6 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 fe5fe7f2ef84..fe5fe7f2ef84 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 cf8aa0a5511c..d966aaa87559 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 0d1f3ba1540b..a5117f111327 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 89d355db71f9..89d355db71f9 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 bffe5b99c4f1..bffe5b99c4f1 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 c50b7b50e8c7..0ea93819d5a5 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 3fc584402fcf..ca69616c97c8 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 341a784c13a5..bf749ac2bdd9 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 c21c4316674d..a472ca45b3ca 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 06fd057954e5..fb6cb51c5bb4 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 250eb2670f88..0db216715ac7 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 2e9c58e50e17..0dedf946f1eb 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 ff51c96f0092..e243bfe45de0 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 8dfe1dfaddaf..9b92df262440 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 011e3b27dff0..5a6f9d82f1f2 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 03903f38a331..fbb776e22192 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 91b9b19c1401..3fd7d3d27ed3 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 9fe2db8a30a4..9fe2db8a30a4 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 86e9693ee225..75df45c13476 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 736331d10e71..736331d10e71 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 acd53e2dfd4e..2da1ca88d203 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 8ea4f3a40d0d..49e376033574 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 5b9b59c42671..329c03b33117 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 312f8268945c..d7200aec41bb 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 a45057db5a5e..b33dae9a2b3e 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 b2a0317175ed..b544628d0506 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 863f45ca48a5..aeb68ae1a3dd 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 e6230b0bfcc1..644e4ca1226b 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 1f5f8c51123f..e899d25b291b 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 971ee3b96971..87a01c012816 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 fca73bc0144a..bde03d51ad89 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 6c11b197722a..b383649a4eac 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> |