diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-04 16:59:51 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:21:29 +0200 |
| commit | 028b4003986f9cff3274707eebd14ee9099bf87b (patch) | |
| tree | 6e37bc8851a0a068389d4626a8364669600c6fdf | |
| parent | fc7c68636687446d0723330e848faa93c4b7efd8 (diff) | |
remove include guards using fixguard.py
276 files changed, 0 insertions, 794 deletions
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx index 2192148461dc..2192148461dc 100755..100644 --- a/basegfx/source/tools/canvastools.cxx +++ b/basegfx/source/tools/canvastools.cxx diff --git a/basegfx/source/tools/debugplotter.cxx b/basegfx/source/tools/debugplotter.cxx index 2c68eb44a846..2c68eb44a846 100755..100644 --- a/basegfx/source/tools/debugplotter.cxx +++ b/basegfx/source/tools/debugplotter.cxx diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx index 871fed7c7d18..871fed7c7d18 100755..100644 --- a/basegfx/source/tools/unopolypolygon.cxx +++ b/basegfx/source/tools/unopolypolygon.cxx diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx index 642ef7bd7db6..642ef7bd7db6 100755..100644 --- a/canvas/source/directx/dx_5rm.cxx +++ b/canvas/source/directx/dx_5rm.cxx diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index a0f485befa12..a0f485befa12 100755..100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx diff --git a/canvas/source/directx/dx_bitmap.cxx b/canvas/source/directx/dx_bitmap.cxx index d1468105a22b..d1468105a22b 100755..100644 --- a/canvas/source/directx/dx_bitmap.cxx +++ b/canvas/source/directx/dx_bitmap.cxx diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx index 860b56401873..860b56401873 100755..100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.cxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index f15af7745422..f15af7745422 100755..100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 9c8309d5e39f..9c8309d5e39f 100755..100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index d87079b34c0f..d87079b34c0f 100755..100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index 866cc0f03ec3..866cc0f03ec3 100755..100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx index 60d62dad338a..60d62dad338a 100755..100644 --- a/canvas/source/directx/dx_canvashelper_texturefill.cxx +++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx index bfbb46a42d09..bfbb46a42d09 100755..100644 --- a/canvas/source/directx/dx_config.cxx +++ b/canvas/source/directx/dx_config.cxx diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx index 731e28e2700f..731e28e2700f 100755..100644 --- a/canvas/source/directx/dx_devicehelper.cxx +++ b/canvas/source/directx/dx_devicehelper.cxx diff --git a/canvas/source/directx/dx_gdiplususer.cxx b/canvas/source/directx/dx_gdiplususer.cxx index f11965ac6860..f11965ac6860 100755..100644 --- a/canvas/source/directx/dx_gdiplususer.cxx +++ b/canvas/source/directx/dx_gdiplususer.cxx diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx index c298fb9238f9..c298fb9238f9 100755..100644 --- a/canvas/source/directx/dx_impltools.cxx +++ b/canvas/source/directx/dx_impltools.cxx diff --git a/canvas/source/directx/dx_linepolypolygon.cxx b/canvas/source/directx/dx_linepolypolygon.cxx index 12bd4e98ae31..12bd4e98ae31 100755..100644 --- a/canvas/source/directx/dx_linepolypolygon.cxx +++ b/canvas/source/directx/dx_linepolypolygon.cxx diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 43350287d92a..43350287d92a 100755..100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx index 211fd5502919..211fd5502919 100755..100644 --- a/canvas/source/directx/dx_spritecanvashelper.cxx +++ b/canvas/source/directx/dx_spritecanvashelper.cxx diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx index d0b0c3e2101e..d0b0c3e2101e 100755..100644 --- a/canvas/source/directx/dx_spritehelper.cxx +++ b/canvas/source/directx/dx_spritehelper.cxx diff --git a/canvas/source/directx/dx_surfacegraphics.cxx b/canvas/source/directx/dx_surfacegraphics.cxx index 97a89b7e66cf..97a89b7e66cf 100755..100644 --- a/canvas/source/directx/dx_surfacegraphics.cxx +++ b/canvas/source/directx/dx_surfacegraphics.cxx diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index 1516b49d1620..1516b49d1620 100755..100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index c48931b87eae..c48931b87eae 100755..100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index ad833cc3ca40..ad833cc3ca40 100755..100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index bf217f75c8db..02644f152974 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -34,9 +34,7 @@ #include <wchar.h> #endif #include <osl/mutex.hxx> -#ifndef _VOS_DIAGNOSE_HXX_ #include <vos/diagnose.hxx> -#endif #include <vos/macros.hxx> #include <comphelper/eventattachermgr.hxx> #include <com/sun/star/beans/XIntrospection.hpp> diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index e3247cae5b60..10bd0f913285 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -32,9 +32,7 @@ #include <comphelper/accessibletexthelper.hxx> #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_ #include <com/sun/star/i18n/WordType.hpp> -#endif #include <com/sun/star/i18n/KCharacterType.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/accessibility/TextSegment.hpp> diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx index e91adee3912b..e91adee3912b 100755..100644 --- a/comphelper/source/misc/evtmethodhelper.cxx +++ b/comphelper/source/misc/evtmethodhelper.cxx diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index 9054f0754b5e..7499758708b3 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -29,17 +29,11 @@ #include "precompiled_comphelper.hxx" #include <comphelper/stillreadwriteinteraction.hxx> -#ifndef __COM_SUN_STAR_UCB_INTERACTIVEIOEXCEPTION_HPP__ #include <com/sun/star/ucb/InteractiveIOException.hpp> -#endif -#ifndef __COM_SUN_STAR_TASK_XINTERACTIONABORT_HPP__ #include <com/sun/star/task/XInteractionAbort.hpp> -#endif -#ifndef __COM_SUN_STAR_UCB_UNSUPPORTEDDATASINKEXCEPTION_HPP__ #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> -#endif namespace comphelper{ diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 28078a8019fc..2e6698e05879 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_comphelper.hxx" -#ifndef _COMPHELPER_MASTERPROPERTYSET_HXX_ #include <comphelper/MasterPropertySet.hxx> -#endif #include <comphelper/MasterPropertySetInfo.hxx> #include <comphelper/ChainablePropertySet.hxx> #include <comphelper/ChainablePropertySetInfo.hxx> diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 57cf22b77508..898c47aca8ee 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_comphelper.hxx" -#ifndef _COMPHELPER_CHAINABLEPROPERTYSETINFO_HXX_ #include <comphelper/MasterPropertySetInfo.hxx> -#endif #include <comphelper/TypeGeneration.hxx> using ::rtl::OUString; diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx index a8f5ea540327..9ab04fa851fa 100644 --- a/comphelper/source/property/TypeGeneration.cxx +++ b/comphelper/source/property/TypeGeneration.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_comphelper.hxx" -#ifndef _COMPHELPER_TYPEGENERATION_HXX #include <comphelper/TypeGeneration.hxx> -#endif #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> @@ -97,9 +95,7 @@ #include <com/sun/star/beans/XVetoableChangeListener.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertyStateChangeListener.hpp> -#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <com/sun/star/beans/XPropertiesChangeListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertyAccess.hpp> diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 9ad617b0e6d1..03994486a50d 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -28,24 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_comphelper.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/StringPair.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP #include <com/sun/star/xml/sax/XParser.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP #include <com/sun/star/lang/IllegalArgumentException.hpp> -#endif #include <comphelper/ofopxmlhelper.hxx> #include <comphelper/attributelist.hxx> diff --git a/cppcanvas/source/wrapper/impltext.cxx b/cppcanvas/source/wrapper/impltext.cxx index 7ebb378ea401..5a7aed1268e7 100644 --- a/cppcanvas/source/wrapper/impltext.cxx +++ b/cppcanvas/source/wrapper/impltext.cxx @@ -31,15 +31,9 @@ #include <impltext.hxx> #include <canvas/canvastools.hxx> -#ifndef _COM_SUN_STAR_RENDERING_TEXTDIRECTION_HPP__ #include <com/sun/star/rendering/TextDirection.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_XCANVAS_HPP__ #include <com/sun/star/rendering/XCanvas.hpp> -#endif -#ifndef _COM_SUN_STAR_RENDERING_STRINGCONTEXT_HPP__ #include <com/sun/star/rendering/StringContext.hpp> -#endif #include <rtl/ustring.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/dtrans/source/os2/clipb/OS2Bitmap.cxx b/dtrans/source/os2/clipb/OS2Bitmap.cxx index 53b78c7afaef..b4141a8ef43d 100644 --- a/dtrans/source/os2/clipb/OS2Bitmap.cxx +++ b/dtrans/source/os2/clipb/OS2Bitmap.cxx @@ -8,9 +8,7 @@ #define INCL_WIN #include <svpm.h> -#ifndef _OS2CLIPBOARD_HXX_ #include "Os2Clipboard.hxx" -#endif // same typedefs from win32 sdk typedef unsigned short WORD; diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 951c3a69d291..3dedd1826155 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -34,9 +34,7 @@ #include <sal/types.h> #include <rtl/process.h> -#ifndef _DOWRAPPERTRANSFERABLE_HXX_ #include "DOTransferable.hxx" -#endif #include "..\misc\ImplHelper.hxx" #include "..\misc\WinClip.hxx" #include "DTransHelper.hxx" diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx index e6cadec92983..7b4fa502630a 100644 --- a/dtrans/source/win32/dtobj/DtObjFactory.cxx +++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx @@ -33,13 +33,9 @@ //------------------------------------------------------------------------ #include "..\..\inc\DtObjFactory.hxx" -#ifndef _TWRAPPERDATAOBJECT_HXX_ #include "XTDataObject.hxx" -#endif -#ifndef _DOWRAPPERTRANSFERABLE_HXX_ #include "DOTransferable.hxx" -#endif //------------------------------------------------------------------------ // namespace directives diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx index 8deb2296ad80..406f3c6ad604 100644 --- a/dtrans/source/win32/dtobj/FetcList.cxx +++ b/dtrans/source/win32/dtobj/FetcList.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include <com/sun/star/datatransfer/XMimeContentType.hpp> -#ifndef _DATAFORMATTRANSLATOR_HXX_ #include "DataFmtTransl.hxx" -#endif #include "..\misc\ImplHelper.hxx" #include "..\misc\WinClip.hxx" diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index e17a931d7380..b736d57c4474 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -33,9 +33,7 @@ //------------------------------------------------------------------------ #include <osl/diagnose.h> -#ifndef _TXDATAOBJECT_HXX_ #include "XTDataObject.hxx" -#endif #include <com/sun/star/datatransfer/dataflavor.hpp> #include "..\misc\ImplHelper.hxx" #include "DTransHelper.hxx" diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index c0a8264a71b8..7c655f08af3e 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -33,9 +33,7 @@ //------------------------------------------------------------------------ #include <osl/diagnose.h> -#ifndef _DFLVCONT_HXX_ #include "ftransl.hxx" -#endif #include <com/sun/star/datatransfer/XMimeContentType.hpp> #include "..\misc\ImplHelper.hxx" diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 01d1521b15bc..2e769016de2e 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/container/XSet.hpp> #include <osl/diagnose.h> -#ifndef _COM_SUN_STAR_DATATRANSFER_XDATAFLAVORCONTAINER_HPP_ #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp> -#endif #include "ftransl.hxx" //----------------------------------------------------------------- diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx index c3209429cf21..51f00a62feb1 100644 --- a/dtrans/source/win32/workbench/XTDo.cxx +++ b/dtrans/source/win32/workbench/XTDo.cxx @@ -35,9 +35,7 @@ #include "..\DTransHelper.hxx" -#ifndef _TWRAPPERDATAOBJECT_HXX_ #include "XTDo.hxx" -#endif #if defined _MSC_VER #pragma warning(push,1) diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index 43222b7a41eb..43222b7a41eb 100755..100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index 76d181fb8e5e..37d89dc667d2 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -28,9 +28,7 @@ #include <stdio.h> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#ifndef _PAD_RTSETUP_HRC_ #include <rtsetup.hrc> -#endif #include <cmddlg.hxx> #include <padialog.hxx> #include <helper.hxx> diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index b81d37df5cb1..ab630f68fda4 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -27,9 +27,7 @@ #include <unistd.h> #include <helper.hxx> -#ifndef _PAD_PADIALOG_HRC_ #include <padialog.hrc> -#endif #include <osl/file.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx index 03ef67db8da9..f763d2c300d0 100644 --- a/padmin/source/progress.cxx +++ b/padmin/source/progress.cxx @@ -34,9 +34,7 @@ #include <vcl/svapp.hxx> #include <progress.hxx> #include <helper.hxx> -#ifndef _PAD_PADIALOG_HRC_ #include <padialog.hrc> -#endif using namespace padmin; diff --git a/padmin/source/titlectrl.cxx b/padmin/source/titlectrl.cxx index 450780dce1e3..4db59ded2857 100644 --- a/padmin/source/titlectrl.cxx +++ b/padmin/source/titlectrl.cxx @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _PAD_NEWPPDLG_HXX_ #include <titlectrl.hxx> -#endif using namespace padmin; diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 5e9023a83e83..bb1af69adf0a 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -36,9 +36,7 @@ // Programmabhaengige Includes. #include <rscconst.hxx> -#ifndef _RSCSARRAY_HXX #include <rscarray.hxx> -#endif #include <rscdb.hxx> /****************** C O D E **********************************************/ diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index c23022e4222e..82ecb366b055 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -32,9 +32,7 @@ #include <string.h> #include <ctype.h> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif // Solar Definitionen #include <tools/solar.h> diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 1c749aa05cb8..401dc51ccc30 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -33,12 +33,8 @@ #include <tools/tempfile.hxx> #include <tools/ownlist.hxx> #include <tools/string.hxx> -#ifndef _TOOLS_FSYS_HXX #include <tools/fsys.hxx> -#endif -#ifndef _TOOLS_STREAM_HXX #include <tools/stream.hxx> -#endif #include <tools/pstm.hxx> #include <tools/debug.hxx> diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 136abb29a98e..18d076c86ba3 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -41,9 +41,7 @@ #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <unotools/ucbstreamhelper.hxx> -#ifndef _TOOLS_FSYS_HXX #include <tools/fsys.hxx> -#endif #include <tools/cachestr.hxx> #include <tools/debug.hxx> #include <tools/urlobj.hxx> diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 73460ef3d277..c6d8ae2b4c37 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -34,9 +34,7 @@ #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> -#ifndef _COM_SUN_STAR_UCB_INTERACTIVEIODEXCEPTION_HPP_ #include <com/sun/star/ucb/InteractiveIOException.hpp> -#endif #include <com/sun/star/ucb/IOErrorCode.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -53,9 +51,7 @@ #include <com/sun/star/sdbc/XRow.hpp> -#ifndef _COMPHELPER_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <comphelper/storagehelper.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index da8b52234485..7931a1d017fc 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -32,9 +32,7 @@ #include <svl/cenumitm.hxx> #include <whassert.hxx> -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include <cppuhelper/extract.hxx> -#endif //============================================================================ // diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 60c622208d53..dceb48993e93 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif #define _SVSTDARR_STRINGS #define _SVSTDARR_STRINGSSORTDTOR diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 0269894bff81..f46faac7ba89 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.cxx @@ -30,9 +30,7 @@ #ifndef GCC #endif -#ifndef DEBUG_HXX #include <tools/debug.hxx> -#endif #include "broadcast.hxx" #include "listener.hxx" diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx index ec899ee9d70b..8acc9c545687 100644 --- a/svl/source/notify/listenerbase.cxx +++ b/svl/source/notify/listenerbase.cxx @@ -30,9 +30,7 @@ #ifndef GCC #endif -#ifndef DEBUG_HXX #include <tools/debug.hxx> -#endif #include "listenerbase.hxx" #include "listeneriter.hxx" diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 3f003e6dde8f..4331df16e175 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -30,9 +30,7 @@ #ifndef GCC #endif -#ifndef DEBUG_HXX #include <tools/debug.hxx> -#endif #include <svl/hint.hxx> #include <svl/brdcst.hxx> diff --git a/svl/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx index b93eda3e7f37..99d860e99e57 100644 --- a/svl/source/numbers/nbdll.cxx +++ b/svl/source/numbers/nbdll.cxx @@ -31,9 +31,7 @@ #ifdef WIN #include <svwin.h> -#ifndef _SYSDEP_HXX #include <sysdep.hxx> -#endif // Statische DLL-Verwaltungs-Variablen static HINSTANCE hDLLInst = 0; // HANDLE der DLL diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx index 110ec0b83285..fd8db3290e89 100644 --- a/svtools/bmpmaker/bmp.cxx +++ b/svtools/bmpmaker/bmp.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef INCLUDED_RTL_MATH_HXX #include <rtl/math.hxx> -#endif #include <math.h> #include <stdio.h> diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index cb43e4989355..305a03f2d266 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -33,16 +33,10 @@ #ifndef GCC #endif -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif -#ifndef _HELP_HXX #include <vcl/help.hxx> -#endif -#ifndef _IMAGE_HXX #include <vcl/image.hxx> -#endif #include <tools/debug.hxx> diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 4f0afbaf5d2d..31d0813ba7ee 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -29,26 +29,18 @@ #include "precompiled_svtools.hxx" #include <svtools/editbrowsebox.hxx> -#ifndef _SVTOOLS_EDITBROWSEBOX_HRC_ #include "editbrowsebox.hrc" -#endif -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <tools/debug.hxx> #include <vcl/window.hxx> -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <tools/resid.hxx> #include <vcl/spinfld.hxx> #include <svtools/svtdata.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif #include <algorithm> #include <tools/multisel.hxx> diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index b2d2c54232b0..b635fbac13cd 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -36,21 +36,11 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ #include <unotools/processfactory.hxx> -#endif -#ifndef _SVT_LOGHELPER_HXX_ #include <unotools/loghelper.hxx> -#endif #include <svl/smplhint.hxx> diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx index 46e1f737d347..2259079e3fca 100644 --- a/svtools/source/config/printoptions.cxx +++ b/svtools/source/config/printoptions.cxx @@ -40,33 +40,19 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ #include <unotools/processfactory.hxx> -#endif -#ifndef _SVT_LOGHELPER_HXX #include <unotools/loghelper.hxx> -#endif #include <itemholder2.hxx> diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx index ea4e0c0ec942..4efadef2e213 100644 --- a/svtools/source/config/test/test.cxx +++ b/svtools/source/config/test/test.cxx @@ -53,9 +53,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/regpathhelper.hxx> -#endif #include <cppuhelper/servicefactory.hxx> #include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> diff --git a/svtools/source/contnr/ctrdll.cxx b/svtools/source/contnr/ctrdll.cxx index 463c6ccc8b35..5f93f3dc264f 100644 --- a/svtools/source/contnr/ctrdll.cxx +++ b/svtools/source/contnr/ctrdll.cxx @@ -31,9 +31,7 @@ #ifdef WIN #include <svwin.h> -#ifndef _SYSDEP_HXX #include <sysdep.hxx> -#endif // Statische DLL-Verwaltungs-Variablen static HINSTANCE hDLLInst = 0; // HANDLE der DLL diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index f6c4dc01434e..802103c5904d 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -67,9 +67,7 @@ #include <ucbhelper/content.hxx> #include <ucbhelper/commandenvironment.hxx> #include <vcl/msgbox.hxx> -#ifndef INCLUDED_RTL_MATH_H #include <rtl/math.hxx> -#endif #include <tools/config.hxx> #include <osl/mutex.hxx> #include <osl/conditn.hxx> diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 484584828b9f..742a43ca8a0b 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -30,9 +30,7 @@ #include <vcl/svapp.hxx> #include <vcl/salnativewidgets.hxx> -#ifndef _HELP_HXX #include <vcl/help.hxx> -#endif #include <tabbar.hxx> #ifndef _STACK_ @@ -46,14 +44,10 @@ #include <rtl/instance.hxx> #include <svtools/svtdata.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif // #102891# -------------------- -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #define NODE_BMP_TABDIST_NOTVALID -2000000 #define FIRST_ENTRY_TAB 1 diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index 3fabff4c8f25..6de504c668dc 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -29,9 +29,7 @@ #include "precompiled_svtools.hxx" #include <limits.h> -#ifndef _METRIC_HXX #include <vcl/metric.hxx> -#endif #include <vcl/svapp.hxx> #ifdef DBG_UTIL #include <vcl/sound.hxx> @@ -40,9 +38,7 @@ #include <svtools/svlbox.hxx> #include <svtools/svicnvw.hxx> #include <svimpicn.hxx> -#ifndef _SVLBITM_HXX #include <svtools/svlbitm.hxx> -#endif #include <svl/svarray.hxx> diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index edb0a65cb39f..e393d5118b96 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -32,9 +32,7 @@ #include <svtools/svlbox.hxx> #include <svtools/svlbitm.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/decoview.hxx> #include <vcl/sound.hxx> #include <vcl/salnativewidgets.hxx> diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index a69253c69629..47fcfd0bc3bc 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -47,9 +47,7 @@ #define _SVSTDARR_ULONGSSORT #include <svl/svstdarr.hxx> -#ifndef _SVEDI_HXX #include <svtools/svmedit.hxx> -#endif #include <svtools/svlbitm.hxx> using namespace ::com::sun::star::accessibility; diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 080371e4d9c6..e659f9010a60 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -30,14 +30,10 @@ #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> #include <svtools/svtdata.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#ifndef SVTOOLS_ACCESSIBLE_FACTORY_HXX #include "svtaccessiblefactory.hxx" -#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::accessibility; diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 61112f6669ca..ef9c6d5cc9e5 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -40,15 +40,9 @@ #include "templatefoldercache.hxx" #include "imgdef.hxx" #include "txtattr.hxx" -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif -#ifndef _SVTOOLS_TEMPLWIN_HRC #include "templwin.hrc" -#endif -#ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> -#endif #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> #include <unotools/ucbhelper.hxx> diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index f7b49ac57eeb..d3fabc4b7d4c 100755..100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -28,30 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif -#ifndef _HELP_HXX #include <vcl/help.hxx> -#endif -#ifndef _MENU_HXX #include <vcl/menu.hxx> -#endif -#ifndef _DECOVIEW_HXX #include <vcl/decoview.hxx> -#endif -#ifndef _FLOATWIN_HXX #include <vcl/floatwin.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <unotools/calendarwrapper.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/Weekdays.hpp> diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 9988bfdadbb9..9988bfdadbb9 100755..100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index d44b18a29ae1..b051ae4fcce4 100755..100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -30,12 +30,8 @@ #define _CTRLBOX_CXX #include <tools/debug.hxx> -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif #include <comphelper/processfactory.hxx> #include <unotools/charclass.hxx> diff --git a/svtools/source/control/ctrldll.cxx b/svtools/source/control/ctrldll.cxx index 2f3ff037be31..a0789aec3adc 100644 --- a/svtools/source/control/ctrldll.cxx +++ b/svtools/source/control/ctrldll.cxx @@ -31,9 +31,7 @@ #ifdef WIN #include <svwin.h> -#ifndef _SYSDEP_HXX #include <sysdep.hxx> -#endif // Statische DLL-Verwaltungs-Variablen static HINSTANCE hDLLInst = 0; // HANDLE der DLL diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index bd965aca66a6..ba9d044ce59d 100755..100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -32,13 +32,9 @@ #include <string.h> -#ifndef TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <i18npool/mslangid.hxx> -#ifndef _VCL_WINDOW_HXX #include <vcl/window.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 14c0478f5327..5dd130bb62f2 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -32,9 +32,7 @@ #include <tools/urlobj.hxx> #include <svtools/svtdata.hxx> #include <filectrl.hxx> -#ifndef _SV_FILECTRL_HRC #include <filectrl.hrc> -#endif #ifndef GCC #endif diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 1ae223bebf06..4a24a3deaef1 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -31,19 +31,11 @@ #define _SV_HEADBAR_CXX #include <svtools/headbar.hxx> #include <tools/debug.hxx> -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif -#ifndef _VCL_APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _VCL_HELP_HXX #include <vcl/help.hxx> -#endif -#ifndef _VCL_IMAGE_HXX #include <vcl/image.hxx> -#endif #include <com/sun/star/accessibility/XAccessible.hpp> // ======================================================================= diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index 10ef8cdcfadf..79ea667032ac 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -27,15 +27,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef SVTOOLS_ROADMAP_HXX #include <svtools/hyperlabel.hxx> -#endif #include <vcl/bitmap.hxx> #include <tools/color.hxx> -#ifndef _VCL_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif //......................................................................... diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 5a79edab5b77..5a79edab5b77 100755..100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 02a578629039..ebeb10a7651d 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -51,17 +51,11 @@ #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <vcl/toolbox.hxx> -#ifndef _VOS_THREAD_HXX //autogen #include <vos/thread.hxx> -#endif -#ifndef _VOS_MUTEX_HXX //autogen #include <vos/mutex.hxx> -#endif #include <vcl/svapp.hxx> #include <unotools/historyoptions.hxx> #include <svl/eitem.hxx> diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx index b67202e9c1fc..427e91d5e13e 100644 --- a/svtools/source/control/prgsbar.cxx +++ b/svtools/source/control/prgsbar.cxx @@ -30,12 +30,8 @@ #define _SV_PRGSBAR_CXX -#ifndef _TOOLS_DEBUGS_HXX #include <tools/debug.hxx> -#endif -#ifndef _VCL_STATUS_HXX #include <vcl/status.hxx> -#endif #include <prgsbar.hxx> // ======================================================================= diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 7cf88816199f..6712cd2d4332 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -41,9 +41,7 @@ #include <vcl/bitmap.hxx> #include <tools/color.hxx> -#ifndef _RTL_USTRING_HXX_ #include <rtl/OUString.hxx> -#endif #include <memory> #define ROADMAP_INDENT_X 4 diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index 95b6d3fbd5c6..9ab711b4f8f3 100644 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -30,9 +30,7 @@ #include <string.h> -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif #include <vcl/i18nhelp.hxx> diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index a902b02f6028..a902b02f6028 100755..100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx index e84c934ef0d8..d9955cbdeb30 100644 --- a/svtools/source/control/taskbar.cxx +++ b/svtools/source/control/taskbar.cxx @@ -30,14 +30,10 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <tools/debug.hxx> -#ifndef _VCL_FLOATWIN_HXX #include <vcl/floatwin.hxx> -#endif #include <taskbar.hxx> diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index 8e5ff6de8def..9148686d2608 100644 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -30,9 +30,7 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <tools/debug.hxx> #include <vcl/image.hxx> #include <vcl/help.hxx> diff --git a/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx index 4c9fda217258..03ff6adb41f8 100644 --- a/svtools/source/control/taskmisc.cxx +++ b/svtools/source/control/taskmisc.cxx @@ -30,9 +30,7 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <tools/debug.hxx> #include <vcl/help.hxx> diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 2fdab63be37f..d07bc73da82c 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -30,9 +30,7 @@ #define _TASKBAR_CXX -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <tools/debug.hxx> #include <tools/date.hxx> #include <vcl/image.hxx> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 62193eadf735..09b2db7c7b5d 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -31,12 +31,8 @@ #include <tools/debug.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> -#ifndef _SCRBAR_HXX #include <vcl/scrbar.hxx> -#endif -#ifndef _HELP_HXX #include <vcl/help.hxx> -#endif #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 9a66230f012c..1064fcae6314 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,15 +32,9 @@ #include "addresstemplate.hxx" -#ifndef _SVT_ADDRESSTEMPLATE_HRC_ #include "addresstemplate.hrc" -#endif -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif -#ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> -#endif #include <svtools/svtdata.hxx> #include <tools/debug.hxx> #include <comphelper/processfactory.hxx> @@ -49,9 +43,7 @@ #include <vcl/waitobj.hxx> #include <vcl/msgbox.hxx> #include <toolkit/helper/vclunohelper.hxx> -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include <cppuhelper/extract.hxx> -#endif #include <comphelper/interaction.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> @@ -66,9 +58,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include "localresaccess.hxx" -#ifndef SVTOOLS_FILENOTATION_HXX_ #include "svl/filenotation.hxx" -#endif #include <tools/urlobj.hxx> #include <algorithm> diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index b0e77d658931..6f94158f71fb 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include <vcl/svapp.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 532fd3f61bb2..f39098137de6 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include <tools/debug.hxx> -#ifndef _SV_APP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _VCL_PRINT_HXX #include <vcl/print.hxx> -#endif #include <vcl/msgbox.hxx> #include <vcl/jobset.hxx> #include <tools/urlobj.hxx> @@ -45,9 +41,7 @@ #include <svtools/svtdata.hxx> #include <filedlg.hxx> #include "svl/pickerhelper.hxx" -#ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> -#endif #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index ceef2a88642b..6fc2f9ea39ee 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include <tools/debug.hxx> -#ifndef _VCL_PRINT_HXX #include <vcl/print.hxx> -#endif #ifndef GCC #endif diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx index 675a93ca728b..f6ec090c9cbb 100644 --- a/svtools/source/dialogs/propctrl.cxx +++ b/svtools/source/dialogs/propctrl.cxx @@ -29,15 +29,9 @@ #include "precompiled_svtools.hxx" -#ifndef _USR_INTROSP_HXX #include <usr/inspect.hxx> -#endif -#ifndef _USR_SERINFO_HXX #include <usr/serinfo.hxx> -#endif -#ifndef _USR_INTROSP_HXX #include <usr/introsp.hxx> -#endif #include <propctrl.hxx> #include <property.hxx> diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 2053da80019d..6390c6d9b507 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -33,9 +33,7 @@ #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <svtools/svtdata.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif //......................................................................... namespace svt diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index f06b4f53ce7c..470691b6c8a3 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -30,15 +30,9 @@ #define _SVT_WIZDLG_CXX #include <tools/debug.hxx> -#ifndef _VCL_FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _VCL_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _VCL_TABPAGE_HXX #include <vcl/tabpage.hxx> -#endif #include <svtools/wizdlg.hxx> // ======================================================================= diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index e0e136089d78..3f8e13e80660 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -44,17 +44,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValues.hpp> -#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_CHARACTERITERATORMODE_HPP_ #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_ #include <com/sun/star/i18n/WordType.hpp> -#endif #ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 48cd23bdcc6f..b5ba775f59bb 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -43,17 +43,11 @@ #include <sot/formats.hxx> #include <svl/urlbmk.hxx> -#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_CHARACTERITERATORMODE_HPP_ #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#endif -#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_ #include <com/sun/star/i18n/WordType.hpp> -#endif #include <cppuhelper/weak.hxx> #include <vcl/unohelp.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> @@ -61,9 +55,7 @@ #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANS_HPP_ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#endif #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index c8a79d3a35cd..88f2ec13af51 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -60,9 +60,7 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/XAggregation.hpp> -#ifndef _COM_SUN_STAR_UNO_XTYPEPROVIDER_HPP_ #include <com/sun/star/lang/XTypeProvider.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter.vcl/ixpm/xpmread.cxx index 7575c94e3ed9..9c1fa3e26404 100644 --- a/svtools/source/filter.vcl/ixpm/xpmread.cxx +++ b/svtools/source/filter.vcl/ixpm/xpmread.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _BMPACC_HXX #include <vcl/bmpacc.hxx> -#endif -#ifndef _GRAPH_HXX #include <vcl/graph.hxx> -#endif #include "rgbtable.hxx" #define _XPMPRIVATE #include "xpmread.hxx" diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx index 4dff9732c7d0..72a1f2264211 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.cxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx @@ -36,9 +36,7 @@ #include <rtl/tencinfo.h> #include <tools/tenccvt.hxx> #include <osl/endian.h> -#ifndef INCLUDED_I18NUTIL_UNICODE_HXX #include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType -#endif #include <vcl/metric.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 6458e359a49c..e8994f3c6581 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -32,45 +32,25 @@ //=============================================== // includes -#ifndef __COM_SUN_STAR_FRAME_XMODULEMANAGER_HPP_ #include <com/sun/star/frame/XModuleManager.hpp> -#endif -#ifndef __COM_SUN_STAR_FRAME_XDESKTOP_HPP_ #include <com/sun/star/frame/XDesktop.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_ #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#endif -#ifndef __COM_SUN_STAR_UI_XUICONFIGURATIONMANAGERSUPPLIER_HPP_ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_XTOPWINDOW_HPP_ #include <com/sun/star/awt/XTopWindow.hpp> -#endif -#ifndef __COM_SUN_STAR_AWT_KEYMODIFIER_HPP_ #include <com/sun/star/awt/KeyModifier.hpp> -#endif -#ifndef __COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif -#ifndef __COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef __COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> -#endif #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 3aa0016c225e..6b9ed9ea03c4 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -42,9 +42,7 @@ #include <tools/globname.hxx> #include <sot/clsids.hxx> #include <com/sun/star/util/XModifyListener.hpp> -#ifndef _COM_SUN_STAR_UTIL_XMODIFYiBLE_HPP_ #include <com/sun/star/util/XModifiable.hpp> -#endif #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/XStateChangeListener.hpp> diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 1d407bbdb611..2e81e6f90611 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -29,18 +29,12 @@ #include "precompiled_svtools.hxx" #include "helpagentwindow.hxx" #include <osl/diagnose.h> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/bitmap.hxx> #include <svtools/svtdata.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif -#ifndef _SVT_HELPID_HRC #include <svtools/helpid.hrc> -#endif #define WB_AGENT_STYLE 0 diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index c02ebc4477c6..cf647ce78a27 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -39,9 +39,7 @@ #include <sot/storage.hxx> #include <sot/clsids.hxx> #include <unotools/ucbhelper.hxx> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/document/XTypeDetection.hpp> diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 436c3f721833..7026e9faa0c7 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef SVTOOLS_SOURCE_MISC_IMAGERESOURCEACCESS_HXX #include "imageresourceaccess.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/io/NotConnectedException.hpp> diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 9834fe0fcb76..bd5ab933ebc8 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -35,9 +35,7 @@ // #include <math.h> #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <sot/formats.hxx> #include "svl/urihelper.hxx" diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx index b20863db3208..b20863db3208 100755..100644 --- a/svtools/source/misc/svtaccessiblefactory.cxx +++ b/svtools/source/misc/svtaccessiblefactory.cxx diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 268533ebb8c8..4e245ca50520 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -43,12 +43,8 @@ #include <rtl/memory.h> #include <rtl/uuid.h> #include <rtl/uri.hxx> -#ifndef DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef URLOBJ_HXX #include <tools/urlobj.hxx> -#endif #include <unotools/ucbstreamhelper.hxx> #include <sot/exchange.hxx> #include <sot/storage.hxx> @@ -65,12 +61,8 @@ #include <comphelper/seqstream.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPEFACTORY_HPP_ #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XMIMECONTENTTYPE_HPP_ #include <com/sun/star/datatransfer/XMimeContentType.hpp> -#endif #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index dcd0f81b2758..90b352fc5303 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include <vos/mutex.hxx> -#ifndef DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef URLOBJ_HXX #include <tools/urlobj.hxx> -#endif #include <unotools/ucbstreamhelper.hxx> #include <sot/exchange.hxx> #include <sot/storage.hxx> @@ -43,9 +39,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DROPTARGETDRAGCONTEXT_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> -#endif #include "svl/urlbmk.hxx" #include "inetimg.hxx" diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx index a382d8293617..a382d8293617 100755..100644 --- a/svtools/source/misc/xwindowitem.cxx +++ b/svtools/source/misc/xwindowitem.cxx diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx index 39629f5c3f77..60ea61d255e7 100644 --- a/svtools/source/productregistration/productregistration.cxx +++ b/svtools/source/productregistration/productregistration.cxx @@ -31,9 +31,7 @@ #include "productregistration.hxx" #include "unotools/regoptions.hxx" #include "registrationdlg.hxx" -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif #include "cppuhelper/factory.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx index 460cedb060d1..df20dc238843 100644 --- a/svtools/source/productregistration/registrationdlg.cxx +++ b/svtools/source/productregistration/registrationdlg.cxx @@ -31,14 +31,10 @@ #if 0 /* @@@ */ #include <svtools/svtdata.hxx> -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif #endif /* @@@ */ -#ifndef SVTOOLS_REGISTRATIONDLG_HRC #include "registrationdlg.hrc" -#endif #include <vcl/msgbox.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx index 32ba9b5c6a24..32ba9b5c6a24 100755..100644 --- a/svtools/source/toolpanel/paneldecklisteners.cxx +++ b/svtools/source/toolpanel/paneldecklisteners.cxx diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 23067d3ee5d0..23067d3ee5d0 100755..100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index f68bbc1bbd0f..f68bbc1bbd0f 100755..100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index e157090bbf0e..e157090bbf0e 100755..100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 0a84a90b4fb3..0a84a90b4fb3 100755..100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 2f25a8f2f9b2..f2fdbcb59921 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include "svtools/genericunodialog.hxx" -#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ #include "addresstemplate.hxx" -#endif -#ifndef _CPPUHELPER_EXTRACT_HXX_ #include <cppuhelper/extract.hxx> -#endif #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> #include <com/sun/star/sdbc/XDataSource.hpp> diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index ac75a1b9a24b..b84e819668bc 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -48,9 +48,7 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/logfile.hxx> diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index 14b802a1bf90..c6bd84564a28 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -39,9 +39,7 @@ #include <vcl/status.hxx> #include <imgdef.hxx> #include <svtools/miscopt.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif using namespace ::cppu; using namespace ::com::sun::star::awt; diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index f5bc837f60b0..f5bc837f60b0 100755..100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 92ae93f5080d..835b98da6449 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -38,9 +38,7 @@ #include <imgdef.hxx> #include <svtools/miscopt.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/toolbox.hxx> //shizhobo #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 526cdbb5d03a..5318af62d1fc 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <rtl/ustrbuf.hxx> diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 88f22f0c8402..7ca97040cb30 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/PointSequence.hpp> -#ifndef _COMPHELPER_SERVICEHELPER_HXX_ #include <comphelper/servicehelper.hxx> -#endif #include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/weakagg.hxx> diff --git a/svtools/workben/browser.cxx b/svtools/workben/browser.cxx index 2f4f120a276b..513991b667cc 100644 --- a/svtools/workben/browser.cxx +++ b/svtools/workben/browser.cxx @@ -37,9 +37,7 @@ #include <svtools/brwbox.hxx> #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/dialog.hxx> #define MID_BROWSER 10 diff --git a/svtools/workben/stest.cxx b/svtools/workben/stest.cxx index 85b7013663da..d36fb4d2c043 100644 --- a/svtools/workben/stest.cxx +++ b/svtools/workben/stest.cxx @@ -30,9 +30,7 @@ #include <svtools/svmedit.hxx> #include <txtcmp.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/wrkwin.hxx> #include <vcl/fixed.hxx> #include <vcl/svapp.hxx> diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx index 6d044cee7c93..6d044cee7c93 100755..100644 --- a/svtools/workben/toolpanel/toolpaneltest.cxx +++ b/svtools/workben/toolpanel/toolpaneltest.cxx diff --git a/svtools/workben/urange.cxx b/svtools/workben/urange.cxx index aa5eba3d5543..5748e142ba45 100644 --- a/svtools/workben/urange.cxx +++ b/svtools/workben/urange.cxx @@ -30,9 +30,7 @@ /* Test the SfxUShortRanges class */ -#ifndef _SFXITEMS_HXX #include <sfxitems.hxx> -#endif USHORT nValues1[] = {340,472,482,4288,4374,4890,5026,5356,5724,6130,6186,6666,9222,9764,9908, 10110,11302,11748,11946,12298,12344,12642,12958,13076,13410,13496,14462, diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index f85e29c21099..8bb878308db6 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -29,9 +29,7 @@ #include "precompiled_toolkit.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> -#ifndef _SVWIN_HXX #include <tools/svwin.h> -#endif #include <stdio.h> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> @@ -82,9 +80,7 @@ #include <toolkit/helper/convert.hxx> #include <vcl/unohelp.hxx> #include <vcl/btndlg.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/ctrl.hxx> #include <vcl/dialog.hxx> diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index db34c840f8eb..bf55bab1f749 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -49,9 +49,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <vcl/field.hxx> diff --git a/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx index 439fb49c1cbe..d158878c3925 100644 --- a/toolkit/source/awt/xthrobber.cxx +++ b/toolkit/source/awt/xthrobber.cxx @@ -32,9 +32,7 @@ #include <toolkit/helper/tkresmgr.hxx> #include <toolkit/helper/throbberimpl.hxx> -#ifndef _TOOLKIT_AWT_XTHROBBER_HRC_ #include "xthrobber.hrc" -#endif #include <tools/debug.hxx> #include <vcl/fixed.hxx> #include <vcl/timer.hxx> diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index c54549baed5e..4e04608c2c99 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -39,9 +39,7 @@ #include <toolkit/controls/unocontrols.hxx> #include "toolkit/controls/formattedcontrol.hxx" #include "toolkit/controls/roadmapcontrol.hxx" -#ifndef TOOLKIT_INC_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX #include "toolkit/controls/tkscrollbar.hxx" -#endif #include <toolkit/controls/stdtabcontroller.hxx> #include <toolkit/controls/tksimpleanimation.hxx> #include <toolkit/controls/tkthrobber.hxx> diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx index 0cbf9d4e7281..7f488408b78c 100644 --- a/toolkit/source/controls/eventcontainer.cxx +++ b/toolkit/source/controls/eventcontainer.cxx @@ -31,9 +31,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/queryinterface.hxx> -#ifndef _CPPUHELER_WEAK_HXX_ #include <cppuhelper/weak.hxx> -#endif #include <cppuhelper/factory.hxx> #include <cppuhelper/interfacecontainer.hxx> diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index ac8a6e83ae28..562ecb9a3598 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -34,9 +34,7 @@ #include <rtl/instance.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> -#ifndef _COM_SUN_STAR_XNAMECONTAINER_HPP_ #include <toolkit/controls/eventcontainer.hxx> -#endif #include <toolkit/helper/property.hxx> #include <tools/debug.hxx> #include <algorithm> diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 96f51b39dc72..78ef83433754 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_toolkit.hxx" -#ifndef _TOOLKIT_ROADMAP_CONTROL_HXX #include <toolkit/controls/roadmapcontrol.hxx> -#endif #include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/XVclWindowPeer.hpp> diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index fb760e404b93..cc6ec58dc7f9 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -29,9 +29,7 @@ #include "precompiled_toolkit.hxx" #include <toolkit/controls/roadmapentry.hxx> -#ifndef _RTL_USTRING_HXX_ #include <rtl/OUString.hxx> -#endif #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index d56ca82bb845..028f7e72b1ed 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_toolkit.hxx" -#ifndef _TOOLKIT_TREE_CONTROL_HXX #include <treecontrol.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/view/SelectionType.hpp> diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index eb45dd521d9a..de4e4768d922 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -31,9 +31,7 @@ #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/PosSize.hpp> -#ifndef _COM_SUN_STAR_LAN_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <toolkit/controls/unocontrol.hxx> diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index d0961188d06c..fd605cff8eaa 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -60,9 +60,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index bff2d6008d10..3a78f318231f 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -28,58 +28,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_toolkit.hxx" -#ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX #include <toolkit/helper/formpdfexport.hxx> -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include <com/sun/star/container/XIndexAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_XFORM_HPP_ #include <com/sun/star/form/XForm.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include <com/sun/star/container/XChild.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_ #include <com/sun/star/form/FormComponentType.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_ #include <com/sun/star/awt/TextAlign.hpp> -#endif -#ifndef _COM_SUN_STAR_STYLE_VERTICALALIGNMENT_HPP_ #include <com/sun/star/style/VerticalAlignment.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_FORMBUTTONTYPE_HPP_ #include <com/sun/star/form/FormButtonType.hpp> -#endif -#ifndef _COM_SUN_STAR_FORM_SUBMITMETHOD_HPP_ #include <com/sun/star/form/FormSubmitMethod.hpp> -#endif /** === end UNO includes === **/ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> -#endif -#ifndef _VCL_PDFEXTOUTDEVDATA_HXX #include <vcl/pdfextoutdevdata.hxx> -#endif -#ifndef _SV_OUTDEV_HXX #include <vcl/outdev.hxx> -#endif #include <functional> #include <algorithm> diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index 4e1e4153daf1..05b6fc61edcf 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -29,9 +29,7 @@ #include "precompiled_toolkit.hxx" #include <toolkit/helper/tkresmgr.hxx> #include <tools/simplerm.hxx> -#ifndef _TOOLS_RESMGR_HXX_ #include <tools/resmgr.hxx> -#endif #include <vcl/svapp.hxx> diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx index 0e0bdec3a9b0..c4d2d6fedd80 100644 --- a/tools/os2/source/dll/toolsdll.cxx +++ b/tools/os2/source/dll/toolsdll.cxx @@ -25,13 +25,9 @@ * ************************************************************************/ -#ifndef _SHL_HXX #include <tools/shl.hxx> -#endif -#ifndef _DLL_HXX #include <dll.hxx> -#endif // ======================================================================= diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 1bd43bffc4e7..3d3ca56e3330 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -57,9 +57,7 @@ #endif #include <tools/stream.hxx> -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif #include <osl/file.hxx> #include <rtl/instance.hxx> diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx index 03f8f9eb46ce..d9f0e26a136a 100644 --- a/tools/source/fsys/os2.cxx +++ b/tools/source/fsys/os2.cxx @@ -41,10 +41,8 @@ #include "comdep.hxx" #ifdef OS2 -#ifndef _VOS_MUTEX_HXX //autogen #include <vos/mutex.hxx> #endif -#endif int Sys2SolarError_Impl( int nSysErr ); diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index b6bf48a8cdf9..ae00d0485a0a 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -36,9 +36,7 @@ #include <tools/debug.hxx> #include <tools/list.hxx> -#ifndef _COMPED_HXX #include "comdep.hxx" -#endif #include <tools/fsys.hxx> diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index 37e9dedf9259..61f13cdf4015 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -36,9 +36,7 @@ #include <tools/rc.hxx> #include <tools/rcid.h> #include <tools/resid.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif // ----------- // - Inlines - diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx index 0b8231d620ce..8ffe4a338fe1 100644 --- a/tools/source/generic/fract.cxx +++ b/tools/source/generic/fract.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -#ifndef _LIMITS_H #include <limits.h> -#endif #include <tools/debug.hxx> #include <tools/fract.hxx> #include <tools/stream.hxx> diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index e9f98b07adbd..b421e541d281 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -36,12 +36,8 @@ #include <tools/vcompat.hxx> #include <poly.h> #include <tools/line.hxx> -#ifndef _VECTOR2D_H #include <tools/vector2d.hxx> -#endif -#ifndef _POLY_HXX #include <tools/poly.hxx> -#endif #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx index feec97168b59..59f6d274a3c4 100644 --- a/tools/source/inet/inetmsg.cxx +++ b/tools/source/inet/inetmsg.cxx @@ -29,9 +29,7 @@ #include "precompiled_tools.hxx" #include <sal/types.h> #include <tools/datetime.hxx> -#ifndef _TOOLS_INETMIME_HXX #include <tools/inetmime.hxx> -#endif #include <tools/inetmsg.hxx> #include <tools/inetstrm.hxx> #include <rtl/instance.hxx> diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx index 4a4ee47886ee..5ec539578b77 100644 --- a/tools/source/memtools/contnr.cxx +++ b/tools/source/memtools/contnr.cxx @@ -28,17 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -#ifndef _LIMITS_H #include <limits.h> -#endif -#ifndef _STRING_H #include <string.h> -#endif -#ifndef _STDIO_H #include <stdio.h> -#endif #include <tools/solar.h> #include <impcont.hxx> #include <tools/contnr.hxx> diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx index 45d6d2ea9367..499a7647727a 100644 --- a/tools/source/memtools/mempool.cxx +++ b/tools/source/memtools/mempool.cxx @@ -31,9 +31,7 @@ #include <tools/mempool.hxx> #include "rtl/alloc.h" -#ifndef INCLUDED_STDIO_H #include <stdio.h> -#endif /************************************************************************* |* diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index daeaf8e4c3a5..3fa63a1a1974 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -33,9 +33,7 @@ #include <stdlib.h> #include <vos/signal.hxx> #include <tools/debug.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/stream.hxx> #include <tools/resmgr.hxx> #include <tools/rc.hxx> diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx index d211d7790b08..62ff2763d453 100644 --- a/tools/source/stream/strmos2.cxx +++ b/tools/source/stream/strmos2.cxx @@ -43,9 +43,7 @@ using namespace osl; // class FileBase -#ifndef _OSL_FILE_HXX_ #include <osl/file.hxx> -#endif using namespace osl; diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx index f2525e3bca84..3361bac22318 100644 --- a/tools/source/string/tstring.cxx +++ b/tools/source/string/tstring.cxx @@ -33,15 +33,9 @@ #include "boost/static_assert.hpp" #include "osl/diagnose.h" -#ifndef _OSL_INTERLCK_H #include <osl/interlck.h> -#endif -#ifndef _RTL_ALLOC_H #include <rtl/alloc.h> -#endif -#ifndef _RTL_MEMORY_H #include <rtl/memory.h> -#endif #include <rtl/tencinfo.h> #include <rtl/instance.hxx> @@ -49,9 +43,7 @@ #include <impstrg.hxx> // For shared byte convert tables -#ifndef _TOOLS_TOOLSIN_HXX #include <toolsin.hxx> -#endif #include <tools/debug.hxx> diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx index 27dab841124d..7f88d6b62eaa 100644 --- a/tools/source/string/tustring.cxx +++ b/tools/source/string/tustring.cxx @@ -32,15 +32,9 @@ #include "boost/static_assert.hpp" -#ifndef _OSL_INTERLCK_H #include <osl/interlck.h> -#endif -#ifndef _RTL_ALLOC_H #include <rtl/alloc.h> -#endif -#ifndef _RTL_MEMORY_H #include <rtl/memory.h> -#endif #include <rtl/tencinfo.h> #include <rtl/instance.hxx> diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 8be75ee8aabd..042b68904fa2 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -37,9 +37,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX #include <ucbhelper/interactionrequest.hxx> -#endif #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/simpleioerrorrequest.hxx> diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx index ee881c97ecbf..69c2d41f740c 100644 --- a/ucbhelper/source/provider/configureucb.cxx +++ b/ucbhelper/source/provider/configureucb.cxx @@ -37,9 +37,7 @@ #include "osl/diagnose.h" -#ifndef _UCBHELPER_PROVCONF_HXX_ #include <provconf.hxx> -#endif #include <registerucb.hxx> using namespace com::sun::star; diff --git a/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx index 395a81c36fed..a74293b72cb9 100644 --- a/ucbhelper/source/provider/handleinteractionrequest.cxx +++ b/ucbhelper/source/provider/handleinteractionrequest.cxx @@ -38,9 +38,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "osl/diagnose.h" #include "rtl/ustring.hxx" -#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX #include "ucbhelper/interactionrequest.hxx" -#endif #include "ucbhelper/simpleauthenticationrequest.hxx" #include "ucbhelper/simpleinteractionrequest.hxx" #include "ucbhelper/simplecertificatevalidationrequest.hxx" diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx index df1917b45413..2cd7edfc67ef 100644 --- a/ucbhelper/source/provider/provconf.cxx +++ b/ucbhelper/source/provider/provconf.cxx @@ -34,9 +34,7 @@ *************************************************************************/ -#ifndef _UCBHELPER_PROVCONF_HXX_ #include <provconf.hxx> -#endif #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx index 8a34dc3c4e13..8a34dc3c4e13 100755..100644 --- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx +++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx index 4ca6cb71881d..aceecebd68eb 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx @@ -57,9 +57,7 @@ #include <ucbhelper/macros.hxx> #include <ucbhelper/configurationkeys.hxx> -#ifndef _UCBEXPLORER_HRC #include "ucbexplorer.hrc" -#endif using namespace com::sun::star; using namespace com::sun::star::beans; diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 5cb74f9bbf35..9c04fc8cba3b 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -53,33 +53,19 @@ #include <rtl/logfile.hxx> #include "itemholder1.hxx" -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#endif -#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_ #include <comphelper/configurationhelper.hxx> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_ #include <unotools/processfactory.hxx> -#endif -#ifndef _SVT_LOGHELPER_HXX #include <unotools/loghelper.hxx> -#endif //_________________________________________________________________________________________________________________ // namespaces diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx index 15bf425af744..6e01a851d671 100644 --- a/unotools/source/config/inetoptions.cxx +++ b/unotools/source/config/inetoptions.cxx @@ -30,9 +30,7 @@ #include <unotools/inetoptions.hxx> #include "rtl/instance.hxx" #include <tools/urlobj.hxx> -#ifndef _WILDCARD_HXX #include <tools/wldcrd.hxx> -#endif #include <algorithm> #include <map> diff --git a/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx index 8c41aac2d3de..e4e63c6ddf06 100644 --- a/unotools/source/config/javaoptions.cxx +++ b/unotools/source/config/javaoptions.cxx @@ -30,9 +30,7 @@ #ifndef GCC #endif -#ifndef _unotools_JAVAPTIONS_HXX #include <unotools/javaoptions.hxx> -#endif #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/logfile.hxx> diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 39233f022534..39233f022534 100755..100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index ebf8146ef0fa..56916e914512 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -32,9 +32,7 @@ #include <tools/string.hxx> #include <tools/debug.hxx> -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_ #include <comphelper/componentfactory.hxx> -#endif #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <com/sun/star/i18n/XExtendedCalendar.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index e82fd7a603ad..763f4b3cbfe2 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -32,9 +32,7 @@ #include <tools/string.hxx> #include <tools/debug.hxx> -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_ #include <comphelper/componentfactory.hxx> -#endif #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx index f4d679607424..4a1bbb09ed62 100644 --- a/unotools/source/i18n/collatorwrapper.cxx +++ b/unotools/source/i18n/collatorwrapper.cxx @@ -30,9 +30,7 @@ #include <unotools/collatorwrapper.hxx> #include <tools/debug.hxx> -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_ #include <comphelper/componentfactory.hxx> -#endif #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 8bbe6f182862..bb2334028d14 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -39,9 +39,7 @@ #include <tools/debug.hxx> #include <i18npool/mslangid.hxx> -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_ #include <comphelper/componentfactory.hxx> -#endif #include <unotools/processfactory.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -50,9 +48,7 @@ #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> -#ifndef _COM_SUN_STAR_I18N_NUMBERFORMATINDEX_HPP_ #include <com/sun/star/i18n/NumberFormatIndex.hdl> -#endif #include <rtl/instance.hxx> #define LOCALEDATA_LIBRARYNAME "i18npool" diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index f6df87615c6c..b9483f798145 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.cxx @@ -31,9 +31,7 @@ #include <unotools/nativenumberwrapper.hxx> #include <tools/debug.hxx> -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_ #include <comphelper/componentfactory.hxx> -#endif #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx index 2638e6730164..31f273fb87b0 100644 --- a/unotools/source/i18n/numberformatcodewrapper.cxx +++ b/unotools/source/i18n/numberformatcodewrapper.cxx @@ -31,9 +31,7 @@ #include <unotools/numberformatcodewrapper.hxx> #include <tools/debug.hxx> -#ifndef _COMPHELPER_COMPONENTFACTORY_HXX_ #include <comphelper/componentfactory.hxx> -#endif #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index f21855d20aed..43eeb51b1f38 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -31,18 +31,14 @@ #include <unotools/ucblockbytes.hxx> #include <comphelper/processfactory.hxx> #include <salhelper/condition.hxx> -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <tools/urlobj.hxx> #include <ucbhelper/interactionrequest.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> -#ifndef _COM_SUN_STAR_UCB_INTERACTIVEIODEXCEPTION_HPP_ #include <com/sun/star/ucb/InteractiveIOException.hpp> -#endif #include <com/sun/star/io/XActiveDataStreamer.hpp> #include <com/sun/star/ucb/DocumentHeaderField.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp> diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 023211dc3527..3872484062fc 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -28,12 +28,8 @@ #include <XTempFile.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/typeprovider.hxx> -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP #include <com/sun/star/registry/XRegistryKey.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <unotools/tempfile.hxx> #include <osl/file.hxx> #include <unotools/configmgr.hxx> diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx index 02a7337ce397..dfc425fb95ee 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.cxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx @@ -27,17 +27,11 @@ #include "documentfocuslistener.hxx" -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_ #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_ #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index c928d66e156d..0628fbd003bb 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -32,9 +32,7 @@ #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> #include <rtl/unload.h> -#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED #include "comphelper/makesequence.hxx" -#endif #include <cppuhelper/interfacecontainer.hxx> #include "aqua_clipboard.hxx" diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 2e6b327de446..ca8892fa1025 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <sal/types.h> -#ifndef _TRANSFERABLE_HXX_ #include "OSXTransferable.hxx" -#endif #include "DataFlavorMapping.hxx" diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx index 85c87c6b9ba9..18f9038ba802 100644 --- a/vcl/aqua/source/dtrans/test_aquacb.cxx +++ b/vcl/aqua/source/dtrans/test_aquacb.cxx @@ -36,9 +36,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> #include <com/sun/star/lang/XComponent.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include <rtl/ustring.hxx> #include <sal/types.h> #include <osl/diagnose.h> diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 335505de85ac..335505de85ac 100755..100644 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx index ec33b2dd8f8d..ec33b2dd8f8d 100755..100644 --- a/vcl/aqua/source/gdi/salcolorutils.cxx +++ b/vcl/aqua/source/gdi/salcolorutils.cxx diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index f7c234d2c4c4..f7c234d2c4c4 100755..100644 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx index 8df44acbf730..8df44acbf730 100755..100644 --- a/vcl/aqua/source/gdi/salmathutils.cxx +++ b/vcl/aqua/source/gdi/salmathutils.cxx diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx index b08a9769ccf4..581c37a41ff9 100644 --- a/vcl/os2/source/app/salinst.cxx +++ b/vcl/os2/source/app/salinst.cxx @@ -35,14 +35,10 @@ #define _SV_SALINST_CXX -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif #include <tools/debug.hxx> -#ifndef _SV_SALIDS_HRC #include <salids.hrc> -#endif #include <vcl/salatype.hxx> #include <saldata.hxx> #include <salinst.h> diff --git a/vcl/os2/source/app/sallang.cxx b/vcl/os2/source/app/sallang.cxx index f23705077ac3..92c4d382a946 100644 --- a/vcl/os2/source/app/sallang.cxx +++ b/vcl/os2/source/app/sallang.cxx @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _SALLANG_HXX #include <sallang.hxx> -#endif // ======================================================================= diff --git a/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx index dff1557170fb..eb152ec9af29 100644 --- a/vcl/os2/source/gdi/salgdi.cxx +++ b/vcl/os2/source/gdi/salgdi.cxx @@ -35,9 +35,7 @@ #include <tools/debug.hxx> #include <salframe.h> #include <tools/poly.hxx> -#ifndef _RTL_STRINGBUF_HXX #include <rtl/strbuf.hxx> -#endif #ifndef __H_FT2LIB #include <wingdi.h> diff --git a/vcl/os2/source/gdi/salgdi2.cxx b/vcl/os2/source/gdi/salgdi2.cxx index 37621ee1f6a8..5834dfc75c40 100644 --- a/vcl/os2/source/gdi/salgdi2.cxx +++ b/vcl/os2/source/gdi/salgdi2.cxx @@ -31,9 +31,7 @@ #define _SV_SALGDI2_CXX #include <salbmp.h> #include <saldata.hxx> -#ifndef _SV_SALIDS_HRC #include <salids.hrc> -#endif #include <salgdi.h> #include <salvd.h> #include <vcl/salbtype.hxx> diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx index 2086c2a5e4d3..2379b8922cb4 100644 --- a/vcl/os2/source/gdi/salgdi3.cxx +++ b/vcl/os2/source/gdi/salgdi3.cxx @@ -37,15 +37,9 @@ #define _SV_SALGDI3_CXX #include <tools/svwin.h> #include <rtl/tencinfo.h> -#ifndef _OSL_FILE_HXX #include <osl/file.hxx> -#endif -#ifndef _OSL_THREAD_HXX #include <osl/thread.hxx> -#endif -#ifndef _OSL_PROCESS_HXX #include <osl/process.h> -#endif #include <vcl/svapp.hxx> #include <saldata.hxx> #include <salgdi.h> @@ -57,9 +51,7 @@ #include <tools/debug.hxx> #include <saldata.hxx> #include <salgdi.h> -#ifndef _SV_OUTFONT_HXX #include <vcl/outfont.hxx> -#endif #include <sallayout.h> #include <tools/poly.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx index ca40441ccda7..5e0e87f5d54d 100644 --- a/vcl/os2/source/window/salframe.cxx +++ b/vcl/os2/source/window/salframe.cxx @@ -36,27 +36,19 @@ #define _SV_SALFRAME_CXX -#ifndef DEBUG_HXX #include <tools/debug.hxx> -#endif #define private public -#ifndef _SV_SALLANG_HXX #include <sallang.hxx> -#endif -#ifndef _SV_SALIDS_HRC #include <salids.hrc> -#endif #include <saldata.hxx> #include <salinst.h> #include <salgdi.h> #include <salframe.h> #include <vcl/timer.hxx> #include <vcl/settings.hxx> -#ifndef _SV_KEYCOES_HXX #include <vcl/keycodes.hxx> -#endif #include <saltimer.h> #if OSL_DEBUG_LEVEL>10 diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 913e11d03614..913e11d03614 100755..100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index bac9d50dc5da..910f999358e9 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -29,12 +29,8 @@ #include "precompiled_vcl.hxx" #include <tools/urlobj.hxx> #include <unotools/localfilehelper.hxx> -#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salframe.hxx> #include <tools/debug.hxx> #include <vcl/svdata.hxx> diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 176ec5a1b4c6..79eca315485e 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/svdata.hxx> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index f8b0d1d3379f..6ac910a07b0d 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -29,15 +29,11 @@ #include "precompiled_vcl.hxx" #include <string.h> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salinst.hxx> #include <vcl/salframe.hxx> -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif #include <osl/process.h> #include <osl/file.hxx> diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 356608e7fbfc..392b783e9fd9 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/saltimer.hxx> #include <tools/time.hxx> #include <vcl/svdata.hxx> diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index 711f9fb06ae1..dd7491922cea 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -35,14 +35,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_ #include <com/sun/star/i18n/XBreakIterator.hpp> -#endif #include <com/sun/star/i18n/XCharacterClassification.hpp> -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif #include <com/sun/star/awt/XExtendedToolkit.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 6bed493cacde..0473bca12a2c 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -28,12 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _OSL_MUTEX_HXX #include <osl/mutex.hxx> -#endif -#ifndef _RTL_USTRBUF_HXX #include <rtl/ustrbuf.hxx> -#endif #include <uno/dispatcher.h> // declaration of generic uno interface #include <uno/mapping.hxx> // mapping stuff #include <cppuhelper/factory.hxx> diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index d4f29e224e7b..7428964b87a9 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -30,13 +30,9 @@ #include <tools/debug.hxx> -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/svdata.hxx> -#ifndef _SV_IAMGE_HXX #include <vcl/image.hxx> -#endif #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/decoview.hxx> @@ -48,14 +44,10 @@ #include <vcl/button.hxx> #include <vcl/window.h> #include <vcl/controldata.hxx> -#ifndef _SV_NATIVEWIDGET_HXX #include <vcl/salnativewidgets.hxx> -#endif #include <vcl/edit.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 5b2e8755e5c8..d760b0b46914 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -30,9 +30,7 @@ #include <tools/table.hxx> #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/decoview.hxx> #include <vcl/ilstbox.hxx> diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 918675cc0783..cf6db4139693 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index c0e7b352642c..b081b5cf9615 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -28,17 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/decoview.hxx> #include <vcl/event.hxx> #include <vcl/cursor.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/menu.hxx> #include <vcl/cmdevt.h> #include <vcl/subedit.hxx> @@ -59,9 +55,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANS_HPP_ #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#endif #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 8ae2ecff41b9..a6ffc191a452 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -29,13 +29,9 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> -#ifndef _SV_EVENT_HXX #include <vcl/field.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/sound.hxx> #include <vcl/event.hxx> diff --git a/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx index b519174f95d1..f44468c9c374 100644 --- a/vcl/source/control/fixbrd.cxx +++ b/vcl/source/control/fixbrd.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/fixbrd.hxx> diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index ecf00568e11f..a4940e1294d2 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -31,9 +31,7 @@ #include <vcl/group.hxx> #include <vcl/controldata.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 02c8d2b5fcb3..f1cd779c97cf 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -39,17 +39,13 @@ #include <vcl/i18nhelp.hxx> #include <vcl/controldata.hxx> #include <vcl/unohelp.hxx> -#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_ #include <com/sun/star/i18n/XCollator.hpp> -#endif #ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_ #include <com/sun/star/accessibility/XAccessible.hpp> #endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #define MULTILINE_ENTRY_DRAW_FLAGS ( TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE | TEXT_DRAW_VCENTER ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 65fe11929d1e..7e74daa6fe51 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -34,9 +34,7 @@ #include <tools/debug.hxx> #include <tools/bigint.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 1c83779da1a9..8d26364f8765 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/decoview.hxx> #include <vcl/event.hxx> #include <vcl/menu.hxx> diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 921a25756d32..40a687832e37 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <vcl/morebtn.hxx> -#ifndef _SV_RD_H #include <tools/rc.h> -#endif diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index daf733a57a33..572edb2a1f41 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/decoview.hxx> #include <vcl/slider.hxx> diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 074935086b0b..24f81481e4e0 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -35,9 +35,7 @@ #include <vcl/outdev.hxx> #include <vcl/impbmp.hxx> #include <vcl/salbmp.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx index 6da78c697525..0079073216f5 100644 --- a/vcl/source/gdi/bitmap2.cxx +++ b/vcl/source/gdi/bitmap2.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/zcodec.hxx> -#ifndef _TOOLS_STREAM_HXX #include <tools/stream.hxx> -#endif #include <vcl/salbtype.hxx> #include <vcl/bmpacc.hxx> #include <vcl/outdev.hxx> diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 38402af626c2..ddcf2fe05248 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -37,12 +37,8 @@ #include <vcl/image.h> #include <vcl/bitmapex.hxx> #include <vcl/pngread.hxx> -#ifndef _SV_IMPIMAGETREE_H #include <vcl/impimagetree.hxx> -#endif -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svapp.hxx> #include <vcl/bmpacc.hxx> diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 8ba963bc4718..bd18a24191c3 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/metaact.hxx> #include <vcl/salinst.hxx> #include <vcl/svdata.hxx> diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index 3a8b51bf3022..ceb0b924444f 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -30,9 +30,7 @@ #include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <tools/debug.hxx> -#ifndef _SV_HATCX_HXX #include <vcl/hatch.hxx> -#endif DBG_NAME( Hatch ) diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index e79308b2664e..de16a03846bf 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -33,20 +33,14 @@ #include <rtl/logfile.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <tools/rc.hxx> -#ifndef _SV_RESMGR_HXX #include <tools/resmgr.hxx> -#endif #include <vcl/settings.hxx> #include <vcl/outdev.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_IMPIMAGETREE_H #include <vcl/impimagetree.hxx> -#endif #include <vcl/image.h> #include <vcl/image.hxx> diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx index d97999311751..c891ded66001 100644 --- a/vcl/source/gdi/imagerepository.cxx +++ b/vcl/source/gdi/imagerepository.cxx @@ -30,9 +30,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/imagerepository.hxx> #include <vcl/svapp.hxx> -#ifndef _SV_IMPIMAGETREE_H #include "vcl/impimagetree.hxx" -#endif //........................................................................ namespace vcl diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 3e328b7db7a4..67f98db54513 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salbmp.hxx> #include <tools/debug.hxx> #include <vcl/impbmp.hxx> diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 397a5d6b704a..19114f60c694 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -32,9 +32,7 @@ #include <tools/debug.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbstreamhelper.hxx> -#ifndef _UNTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif #include <vcl/outdev.hxx> #include <vcl/virdev.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 0846f5567200..fcbd3dabd05e 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -36,9 +36,7 @@ #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/virdev.hxx> -#ifndef _SV_VECTORIZ_HXX #include <impvect.hxx> -#endif // ----------- // - Defines - diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 2bc0addaa93c..9bdc31bef8cd 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> #include <tools/stream.hxx> -#ifndef _RTL_ALLOC_H #include <rtl/alloc.h> -#endif #include <vcl/jobset.hxx> #include <vcl/jobset.h> diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index a011e4ee4a92..d0708e5a26b3 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salgdi.hxx> #include <vcl/sallayout.hxx> #include <vcl/salframe.hxx> @@ -41,9 +39,7 @@ #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/ctrl.hxx> -#ifndef _POLY_HXX #include <tools/poly.hxx> -#endif #include <vcl/region.hxx> #include <vcl/region.h> #include <vcl/virdev.hxx> diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index bea307a4c38d..29c22e8f7962 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salbmp.hxx> #include <vcl/salgdi.hxx> #include <vcl/impbmp.hxx> diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 29e7380848f3..4448164e71c2 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -30,9 +30,7 @@ #include <cstring> #include <i18npool/mslangid.hxx> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salgdi.hxx> #include <vcl/sallayout.hxx> #include <rtl/tencinfo.h> @@ -62,9 +60,7 @@ #include <unotools/fontcfg.hxx> #include <vcl/sysdata.hxx> #include <vcl/textlayout.hxx> -#ifndef _OSL_FILE_H #include <osl/file.h> -#endif #ifdef ENABLE_GRAPHITE #include <vcl/graphite_features.hxx> #endif diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx index d42723215c55..b2b560030836 100644 --- a/vcl/source/gdi/outdev5.cxx +++ b/vcl/source/gdi/outdev5.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salgdi.hxx> #include <tools/debug.hxx> #include <vcl/svdata.hxx> diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 5b8d228bb141..d1dc7756a0d2 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salgdi.hxx> #include <tools/debug.hxx> #include <vcl/outdev.h> diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 189ba4c29e59..b800658fa2d7 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -30,9 +30,7 @@ #include <limits.h> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <tools/bigint.hxx> #include <tools/debug.hxx> #include <vcl/virdev.hxx> diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 2ea9bfcc4c11..13463325b278 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -31,9 +31,7 @@ #define ENABLE_BYTESTRING_STREAM_OPERATORS #include <list> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salinst.hxx> #include <vcl/salgdi.hxx> #include <vcl/salptype.hxx> diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 51f33ed17f6c..51f33ed17f6c 100755..100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 4931ee66e93f..0e2d0b0fbd8a 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -33,15 +33,9 @@ #include <vcl/salbtype.hxx> #include <tools/stream.hxx> #include <tools/debug.hxx> -#ifndef _REGION_H #include <vcl/region.h> -#endif -#ifndef _REGION_HXX #include <vcl/region.hxx> -#endif -#ifndef _REGBAND_HXX #include <vcl/regband.hxx> -#endif #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 97e11c5a6aa4..589b059c43bc 100755..100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/ref.hxx> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salgdi.hxx> #include <vcl/salframe.hxx> #include <vcl/salvd.hxx> diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 5e187944c706..5df10bcb758b 100755..100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -34,9 +34,7 @@ #include <math.h> #include <sal/alloca.h> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salgdi.hxx> #include <vcl/sallayout.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -44,9 +42,7 @@ #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <i18npool/lang.h> -#ifndef _TL_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <limits.h> diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 4c1439ffe6f4..b7b0bb382735 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salinst.hxx> #include <vcl/salgdi.hxx> #include <vcl/salframe.hxx> diff --git a/vcl/source/helper/smartid.cxx b/vcl/source/helper/smartid.cxx index c367aeb2bce5..c367aeb2bce5 100755..100644 --- a/vcl/source/helper/smartid.cxx +++ b/vcl/source/helper/smartid.cxx diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 3018236fff1a..62cb9c82a0a1 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -28,16 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" #include <tools/list.hxx> -#ifndef _TABLE_HXX #include <tools/table.hxx> -#endif #include <tools/debug.hxx> #include <vcl/svapp.hxx> #include <vcl/accel.h> #include <vcl/accel.hxx> -#ifndef _RC_H #include <tools/rc.h> -#endif diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 48d01e4f2059..b5355f8d468b 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/svdata.hxx> #include <vcl/event.hxx> #include <vcl/decoview.hxx> diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index e835fe749ed1..6b1fe7926051 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -34,9 +34,7 @@ #include <vcl/button.hxx> #include <vcl/btndlg.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index 03e01c96742b..c946820a880f 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _STRING_H #include <string.h> -#endif -#ifndef _SV_CMDEVT_HXX #include <vcl/cmdevt.hxx> -#endif // ======================================================================= diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 3b5585d3bc63..1f6ebd658c84 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/window.h> diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index e67c2d9ecfd5..e414914fae37 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <tools/time.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index c8e382bad982..cfed4f4202ae 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -28,13 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <tools/time.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/brdwin.hxx> #include <vcl/floatwin.hxx> diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index d775e9f2bf6e..b0d4680096cf 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> @@ -39,9 +37,7 @@ #include <vcl/toolbox.hxx> #include <vcl/floatwin.hxx> #include <vcl/window.h> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/salframe.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index 03f88adc3566..ff3c45db0254 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salframe.hxx> #include <tools/debug.hxx> #include <vcl/svdata.hxx> diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx index 2cd18b897ff5..9569c583fe38 100644 --- a/vcl/source/window/javachild.cxx +++ b/vcl/source/window/javachild.cxx @@ -42,9 +42,7 @@ #include <com/sun/star/java/XJavaThreadRegister_11.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salinst.hxx> #include <vcl/salframe.hxx> #include <vcl/window.hxx> diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index bcc5536fd028..14c5309e9d69 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -28,20 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salinst.hxx> #include <vcl/salframe.hxx> #include <vcl/svdata.hxx> #include <vcl/window.hxx> -#ifndef _SV_KEYCOD_HXX #include <vcl/keycod.hxx> -#endif -#ifndef _RC_H #include <tools/rc.h> -#endif diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 7f7a65cd7fb9..bb396ce63570 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/svdata.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> @@ -40,9 +38,7 @@ #include <vcl/brdwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/button.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/mnemonic.hxx> #include <vcl/window.h> diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 735add842518..e0efb37c9444 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -33,19 +33,11 @@ #include <tools/time.hxx> #include <tools/debug.hxx> -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/svdata.hxx> -#ifndef _VCL_TIMER_HXX #include <vcl/timer.hxx> -#endif -#ifndef _VCL_EVENT_HXX #include <vcl/event.hxx> -#endif -#ifndef _VCL_SCRWND_HXX #include <scrwnd.hxx> -#endif #include <math.h> #include <limits.h> diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index b4553a4cf8a7..fdc090a0e958 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/event.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 689c56cbe619..6d2c9a9ee0c1 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -37,9 +37,7 @@ #include <vcl/bitmap.hxx> #include <vcl/decoview.hxx> #include <vcl/symbol.hxx> -#ifndef _SV_SVIDS_HRC #include <vcl/svids.hrc> -#endif #include <vcl/image.hxx> #include <vcl/svdata.hxx> #include <vcl/help.hxx> diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 385dd241c770..ce3aa82e89da 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -30,9 +30,7 @@ #include <tools/list.hxx> #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/event.hxx> #include <vcl/decoview.hxx> diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 0ff9189f4fdb..a70a2e1853f0 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -28,21 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salinst.hxx> #include <vcl/salframe.hxx> #include <vcl/window.hxx> #include <vcl/salobj.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> -#ifndef _SV_WIDNOW_H #include <vcl/window.h> -#endif #include <vcl/svapp.hxx> #include <vcl/syschild.hxx> diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index f3624ef56f59..95f0ebd9fe3c 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <tools/debug.hxx> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salframe.hxx> #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index 874881c0c5ef..42e04ce1b4c9 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -30,9 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabdlg.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 0589d57009f4..f3c6c6ee2cc9 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -30,9 +30,7 @@ #include <tools/ref.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index cde91a8dcd97..47533e6d34e0 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -28,16 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <rtl/logfile.hxx> #include <tools/list.hxx> #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/event.hxx> #include <vcl/decoview.hxx> diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 334cdd2d0a64..47f4d68ef8fc 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -30,9 +30,7 @@ #include <tools/list.hxx> #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 5277da0567b6..d4c8ee32ae64 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include "svsys.h" -#endif #include "vcl/salframe.hxx" #include "vcl/salobj.hxx" #include "vcl/salinst.hxx" @@ -40,9 +38,7 @@ #include "vcl/unohelp.hxx" #include "tools/time.hxx" #include "tools/debug.hxx" -#ifndef _SV_RC_H #include "tools/rc.h" -#endif #include "vcl/svdata.hxx" #include "vcl/windata.hxx" #include "vcl/dbggui.hxx" diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 02b2713b01cc..6e19dea2c46f 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -29,9 +29,7 @@ #include "precompiled_vcl.hxx" #include <limits.h> -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salbmp.hxx> #include <vcl/salgdi.hxx> #include <vcl/salframe.hxx> @@ -49,9 +47,7 @@ #include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/scrbar.hxx> -#ifndef _SV_SCRWND_HXX #include <scrwnd.hxx> -#endif #include <vcl/dockwin.hxx> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index c964ad0d739b..ae226a595fac 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salwtype.hxx> #include <vcl/salframe.hxx> #include <tools/debug.hxx> diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 8fb2f2f8346a..ea0fbcafbf96 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -28,15 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif #include <vcl/salframe.hxx> #include <tools/debug.hxx> -#ifndef _SV_RC_H #include <tools/rc.h> -#endif #include <vcl/svdata.hxx> #include <vcl/svapp.hxx> #include <vcl/brdwin.hxx> diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx index c52d6d3e9589..c52d6d3e9589 100755..100644 --- a/vcl/test/dndtest.cxx +++ b/vcl/test/dndtest.cxx diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 34b0ff652cde..56e3d505296c 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -54,9 +54,7 @@ #include "i18n_im.hxx" #include "i18n_xkb.hxx" #include <vos/process.hxx> -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif /* #i59042# override KApplications method for session management * since it will interfere badly with our own. diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 7e07ca6e8d4d..e2494d2c55ce 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -35,13 +35,9 @@ #include <saldata.hxx> #include <saldisp.hxx> -#ifndef _SV_SALGDI_HXX #include <salgdi.h> -#endif -#ifndef _SV_SALGDI_HXX #include <salframe.h> -#endif #include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> #include <plugins/kde/kdedata.hxx> diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx index d3a4f2b819ae..ca2de1da8ecf 100644 --- a/vcl/unx/source/app/i18n_cb.cxx +++ b/vcl/unx/source/app/i18n_cb.cxx @@ -42,9 +42,7 @@ #include <i18n_status.hxx> #include "i18n_ic.hxx" #include "i18n_im.hxx" -#ifndef _OSL_THREAD_H #include <osl/thread.h> -#endif #include <vcl/salframe.hxx> // ------------------------------------------------------------------------- diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx index 3064be9367e1..ef71e6520940 100644 --- a/vcl/unx/source/app/i18n_ic.cxx +++ b/vcl/unx/source/app/i18n_ic.cxx @@ -43,15 +43,11 @@ #include <i18n_im.hxx> #include <i18n_status.hxx> -#ifndef _SV_SALFRAME_HXX #include <salframe.h> -#endif #include <saldata.hxx> #include <saldisp.hxx> -#ifndef _OSL_THREAD_H #include <osl/thread.h> -#endif using namespace vcl; diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx index 50ef71df8619..8202a8804b68 100644 --- a/vcl/unx/source/app/saldata.cxx +++ b/vcl/unx/source/app/saldata.cxx @@ -57,9 +57,7 @@ #include <unistd.h> #endif #include <vos/process.hxx> -#ifndef _VOS_MUTEX_HXX #include <vos/mutex.hxx> -#endif #include "Xproto.h" #include <saldisp.hxx> @@ -70,9 +68,7 @@ #include <osl/thread.h> #include <osl/process.h> #include <rtl/strbuf.hxx> -#ifndef _RTL_BOOTSTRAP_HXX #include <rtl/bootstrap.hxx> -#endif #include <tools/debug.hxx> #include <sm.hxx> diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 19417c83cb91..f81f25673995 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -87,9 +87,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*); #include <vcl/keycodes.hxx> #include <vcl/salbtype.hxx> #include <salbmp.h> -#ifndef _OSL_THREADMUTEX_H_ #include <osl/mutex.h> -#endif #include <salobj.h> #include <sm.hxx> #include <wmadaptor.hxx> diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx index 2bf9e55731d1..b6dbb0db0252 100644 --- a/vcl/unx/source/app/soicon.cxx +++ b/vcl/unx/source/app/soicon.cxx @@ -34,9 +34,7 @@ #include <vcl/salbtype.hxx> #include <vcl/impbmp.hxx> #include <vcl/bitmap.hxx> -#ifndef _SV_BITMAP_HXX #include <vcl/bitmapex.hxx> -#endif #include <vcl/graph.hxx> #include <soicon.hxx> #include <vcl/svdata.hxx> diff --git a/vcl/unx/source/gdi/xlfd_extd.cxx b/vcl/unx/source/gdi/xlfd_extd.cxx index 73731eddf115..f0af21a4c42d 100644 --- a/vcl/unx/source/gdi/xlfd_extd.cxx +++ b/vcl/unx/source/gdi/xlfd_extd.cxx @@ -36,9 +36,7 @@ #include <vcl/outfont.hxx> #include <rtl/alloc.h> -#ifndef _RTL_TENCINFO_H_ #include <rtl/tencinfo.h> -#endif #include <set> diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 647b95ae032c..7cae2d3b7d34 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -36,13 +36,9 @@ #include <salunx.h> #include <salstd.hxx> #include <saldata.hxx> -#ifndef _SV_SALINST_HXX #include <salinst.h> -#endif #include <saldisp.hxx> -#ifndef _SV_SALFRAME_HXX #include <salframe.h> -#endif #include <salobj.h> #include <vcl/salwtype.hxx> #include <vcl/keycodes.hxx> diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index eb260eb808c6..dd97cc549948 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -37,9 +37,7 @@ #include <tools/debug.hxx> #include <salframe.h> #include <tools/poly.hxx> -#ifndef _RTL_STRINGBUF_HXX #include <rtl/strbuf.hxx> -#endif using namespace rtl; diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index 803c0886f429..0222902f8c96 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -35,9 +35,7 @@ #include <wincomp.hxx> #include <salbmp.h> #include <saldata.hxx> -#ifndef _SV_SALIDS_HRC #include <salids.hrc> -#endif #include <salgdi.h> #include <salframe.h> diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 8197fb37cd6d..8197fb37cd6d 100755..100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index c8c7b5c68fff..4c14ff989bca 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -37,9 +37,7 @@ #include <excpt.h> #endif -#ifndef _OSL_MODULE_H #include <osl/module.h> -#endif #include <wincomp.hxx> #include <saldata.hxx> #include <salinst.h> diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 806d3b420b33..806d3b420b33 100755..100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 081bd4827a9b..97a88f41ce95 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -46,9 +46,7 @@ #include <stdio.h> -#ifndef _SVWIN_HXX #include <tools/svwin.h> -#endif #ifdef __MINGW32__ #include <excpt.h> #endif @@ -63,9 +61,7 @@ #pragma warning( disable: 4242 4244 ) #endif #include <wincomp.hxx> -#ifndef _SV_SALIDS_HRC #include <salids.hrc> -#endif #include <vcl/sysdata.hxx> #include <saldata.hxx> #include <salinst.h> @@ -80,17 +76,13 @@ #include <vcl/timer.hxx> #include <saltimer.h> #include <vcl/settings.hxx> -#ifndef _SV_KEYCOES_HXX #include <vcl/keycodes.hxx> -#endif #include <vcl/window.h> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/sallayout.hxx> #include <vcl/svapp.hxx> -#ifndef _VCL_IMPDEL_HXX #include <impdel.hxx> -#endif #define COMPILE_MULTIMON_STUBS #include <multimon.h> #include <vector> diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 2f657968284f..819fe51646ac 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -30,9 +30,7 @@ #include <string.h> -#ifndef _SVWIN_HXX #include <tools/svwin.h> -#endif #include <wincomp.hxx> #include <saldata.hxx> #include <salinst.h> diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 9122a1addc0a..9122a1addc0a 100755..100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx |