diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-05 15:55:31 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:22:24 +0200 |
| commit | aa42876a0e79444577cdf9a4ca4297b6dd7bf792 (patch) | |
| tree | 369dc18620951c66b4d913626a944ac5c212b274 /sw/source | |
| parent | a4781ea4a180171d837bbffec5dc16b7f2bc7138 (diff) | |
more removed include guards using fixguard.py
Diffstat (limited to 'sw/source')
133 files changed, 0 insertions, 528 deletions
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 3e2153876219..8d18e74bb490 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -26,9 +26,7 @@ ************************************************************************/ #ifndef _ACCDOC_HXX #define _ACCDOC_HXX -#ifndef _ACCCONTEXT_HXX #include "acccontext.hxx" -#endif #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <accselectionhelper.hxx> diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index 8a0bbb84b6e5..1309bde90253 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -26,9 +26,7 @@ ************************************************************************/ #ifndef _ACCHEADERFOOTER_HXX #define _ACCHEADERFOOTER_HXX -#ifndef _ACCCONTEXT_HXX #include "acccontext.hxx" -#endif class SwHeaderFrm; class SwFooterFrm; diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index f8972060ecb3..fe2ed91ae97e 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -27,9 +27,7 @@ #ifndef _ACCPAGE_HXX #define _ACCPAGE_HXX -#ifndef _ACCCONTEXT_HXX #include "acccontext.hxx" -#endif /** diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 0ded6c326320..4b2b01937ee6 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <hints.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <editeng/scripttypeitem.hxx> #include <hintids.hxx> #include <swtypes.hxx> diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index b88e1e340638..44d1e133bc64 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -31,9 +31,7 @@ #include "breakit.hxx" #include <unicode/uchar.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <unotools/localedatawrapper.hxx> #include <editeng/unolingu.hxx> diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index 276b8779e01a..b7b80eb7c407 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <fmtcntnt.hxx> #include <txatbase.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 4a707e1fb1af..4b6ed90722f5 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -32,12 +32,8 @@ #include <string.h> // fuer strchr() #include <hintids.hxx> -#ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL #include <com/sun/star/i18n/UnicodeType.hdl> -#endif -#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL #include <com/sun/star/i18n/WordType.hdl> -#endif #include <unotools/charclass.hxx> #include <doc.hxx> #include <docary.hxx> diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx index f1ed6bbf1371..dcdbbe2c6aa8 100644 --- a/sw/source/core/inc/SwXTextDefaults.hxx +++ b/sw/source/core/inc/SwXTextDefaults.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#ifndef _COM_SUN_STAR_BEANS_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <svl/itemprop.hxx> class SwDoc; diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx index 714208a4b6c9..623ce06085c9 100644 --- a/sw/source/core/inc/drawdev.hxx +++ b/sw/source/core/inc/drawdev.hxx @@ -30,9 +30,7 @@ #include "swrect.hxx" -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif /************************************************************************* * class SwDrawDev diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index ca98a089969d..6d352514dddc 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -29,9 +29,7 @@ #include <tools/string.hxx> -#ifndef _KEYCOD_HXX //autogen #include <vcl/keycod.hxx> -#endif #include <svl/svarray.hxx> #include <IDocumentMarkAccess.hxx> #include <vector> diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx index 45ee0e3a5918..753823f2c76e 100644 --- a/sw/source/core/inc/observablethread.hxx +++ b/sw/source/core/inc/observablethread.hxx @@ -27,9 +27,7 @@ #ifndef _OBSERVABLETHREAD_HXX #define _OBSERVABLETHREAD_HXX -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <rtl/ref.hxx> #include <osl/interlck.h> diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx index fd09e1dbaca7..1c363b458215 100644 --- a/sw/source/core/inc/retrievedinputstreamdata.hxx +++ b/sw/source/core/inc/retrievedinputstreamdata.hxx @@ -31,9 +31,7 @@ #include <sal/types.h> #include <osl/mutex.hxx> #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <map> diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx index e16ba350246d..0bdb37d11e57 100644 --- a/sw/source/core/inc/retrieveinputstream.hxx +++ b/sw/source/core/inc/retrieveinputstream.hxx @@ -32,9 +32,7 @@ //#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_ //#include <com/sun/star/uno/Reference.hxx> //#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <retrievedinputstreamdata.hxx> /** class for a thread to retrieve an input stream given by an URL diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx index 2417f819bed3..ca96d1f6fada 100644 --- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx +++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx @@ -28,9 +28,7 @@ #define _RETRIEVEINPUTSTREAMCONSUMER_HXX #include <com/sun/star/uno/Reference.hxx> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> -#endif #include <osl/interlck.h> #include <retrievedinputstreamdata.hxx> diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 300929642f7a..3b996070c188 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -29,9 +29,7 @@ #include <tools/string.hxx> -#ifndef _DATE_HXX //autogen #include <tools/datetime.hxx> -#endif #include <svl/svarray.hxx> diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 90803b515080..2857138ba826 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -58,10 +58,8 @@ */ #ifdef DBG_UTIL -#ifndef _STRING_HXX //autogen #include <tools/string.hxx> #endif -#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_USHORTS diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 201c64149e05..0caa816b9172 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -29,9 +29,7 @@ #include <i18npool/lang.h> #include <tools/color.hxx> -#ifndef _TOOLS_STREAM_HXX //autogen #include <tools/stream.hxx> -#endif #include <editeng/svxfont.hxx> #include <swtypes.hxx> #include <drawfont.hxx> // SwDrawTextInfo diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 2f8c8047c96e..f047e99c04b3 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -28,9 +28,7 @@ #ifndef _WRONG_HXX #define _WRONG_HXX -#ifndef _COM_SUN_STAR_SMARTTAGS_XSMARTTAGPROPERTIES_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <vector> diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 382c58a6f5c6..f9dc8f6fa442 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -29,9 +29,7 @@ #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> #include <com/sun/star/beans/PropertyValues.hpp> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include "swtypes.hxx" #include "txttypes.hxx" diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx index b8e361bcae6c..43724225df91 100644 --- a/sw/source/core/text/itradj.cxx +++ b/sw/source/core/text/itradj.cxx @@ -27,9 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <vcl/outdev.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index b758ac5754bc..c1a5e5f22e33 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -30,9 +30,7 @@ #include "hintids.hxx" -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <editeng/lspcitem.hxx> #include <txtftn.hxx> #include <fmtftn.hxx> diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index ad8be036e1ef..2f53c364079c 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <vcl/graph.hxx> #include <editeng/brshitem.hxx> diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx index a849cbe42f40..912d312f1923 100644 --- a/sw/source/core/text/portxt.cxx +++ b/sw/source/core/text/portxt.cxx @@ -31,9 +31,7 @@ #include <ctype.h> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <hintids.hxx> // CH_TXTATR #include <errhdl.hxx> // ASSERT #include <SwPortionHandler.hxx> diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index d088f8998ccd..3e6fed6785c9 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -32,9 +32,7 @@ #include "hintids.hxx" #include <svl/whiter.hxx> #include <tools/shl.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <swmodule.hxx> #include <redline.hxx> // SwRedline #include <txtatr.hxx> // SwTxt ... diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index 466cd5a9ad02..0f4f78c0f859 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -29,9 +29,7 @@ #include "ndhints.hxx" -#ifndef IDOCUMENTREDLINEACCESS_HXX_INCLUDED #include <IDocumentRedlineAccess.hxx> -#endif #include "swfont.hxx" #ifndef _SVSTDARR_USHORTS diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 3e67e1037dfe..820ae7346f0b 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -43,9 +43,7 @@ #include <txtpaint.hxx> // SwSaveClip #include <blink.hxx> // pBlink #include <breakit.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <com/sun/star/i18n/WordType.hpp> #include <editeng/langitem.hxx> #include <charatr.hxx> diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 2b655847ad05..139064dbf2f9 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -43,9 +43,7 @@ #include <editeng/brshitem.hxx> #include <editeng/charrotateitem.hxx> #include <breakit.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <tabfrm.hxx> // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index f0769f113560..b644929679d9 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -35,12 +35,8 @@ #include <vcl/metric.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ #include <com/sun/star/i18n/CharacterIteratorMode.hdl> -#endif -#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL #include <com/sun/star/i18n/WordType.hdl> -#endif #include <breakit.hxx> #include <viewsh.hxx> // Bildschirmabgleich #include <viewopt.hxx> // Bildschirmabgleich abschalten, ViewOption diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index d50a85d7954f..c0b05b81de1e 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -33,12 +33,8 @@ #include <editeng/cmapitem.hxx> #include <vcl/outdev.hxx> -#ifndef _COM_SUN_STAR_I18N_CHARTYPE_HDL #include <com/sun/star/i18n/CharType.hdl> -#endif -#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL #include <com/sun/star/i18n/WordType.hdl> -#endif #include <vcl/print.hxx> #include <errhdl.hxx> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c1b8b62ea234..5808d1ddefc9 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <vcl/outdev.hxx> #include <unotools/localedatawrapper.hxx> #include <editeng/unolingu.hxx> diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx index 48ce2462cf2b..dd62fda499fe 100644 --- a/sw/source/core/txtnode/txatritr.cxx +++ b/sw/source/core/txtnode/txatritr.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <tools/string.hxx> #include <editeng/langitem.hxx> #include <txatritr.hxx> diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index b0d0f9623e71..c0da7ca66ee3 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -35,9 +35,7 @@ #include <com/sun/star/ucb/XContentProvider.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> -#ifndef _COM_SUN_STAR_UCB_NAMECLASH_HDL_ #include <com/sun/star/ucb/NameClash.hdl> -#endif #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 72a2dd4ba006..52e88b50411f 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -31,9 +31,7 @@ #include <tools/solar.h> #include <tools/string.hxx> -#ifndef _SVARRAY_H #include <svl/svarray.hxx> -#endif class SdrObject; class SwFrmFmt; diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index 4ab593898346..98672a68df1c 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -32,9 +32,7 @@ #include <ctype.h> #include <hintids.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <vcl/graph.hxx> #include <svl/urihelper.hxx> #include <svtools/rtftoken.h> diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx index 8ed3c585e975..56218d02d6b3 100644 --- a/sw/source/filter/ww1/w1class.hxx +++ b/sw/source/filter/ww1/w1class.hxx @@ -28,9 +28,7 @@ #include <tools/debug.hxx> // local -#ifndef _W1STRUCT_HXX #include <w1struct.hxx> -#endif #ifdef DUMP #include <fstream.h> diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx index c3f5c22bdf02..317a349660e1 100644 --- a/sw/source/filter/ww1/w1par.hxx +++ b/sw/source/filter/ww1/w1par.hxx @@ -29,9 +29,7 @@ #define _W1PAR_HXX #include <fltshell.hxx> -#ifndef _W1CLASS_HXX #include <w1class.hxx> -#endif ////////////////////////////////////////////////////////////// Ww1Shell class Ww1Shell : public SwFltShell diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx index 7db1224704e3..71c54adde84a 100644 --- a/sw/source/filter/ww8/dump/ww8scan.hxx +++ b/sw/source/filter/ww8/dump/ww8scan.hxx @@ -32,13 +32,9 @@ #ifndef LONG_MAX #include <limits.h> #endif -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif #include <tools/solar.h> // UINTXX -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <tools/datetime.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> @@ -47,9 +43,7 @@ #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#ifndef WW8STRUC_HXX #include <ww8struc.hxx> // FIB, STSHI, STD -#endif #include <ww8scan.hxx> diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx index 46aa1d0d71a8..79c991b8316f 100644 --- a/sw/source/filter/ww8/escher.hxx +++ b/sw/source/filter/ww8/escher.hxx @@ -30,9 +30,7 @@ #ifndef _ESCHER_HXX #define _ESCHER_HXX -#ifndef _ESCHEREX_HXX #include <filter/msfilter/escherex.hxx> -#endif const sal_uInt32 nInlineHack = 0x00010001; class SwFrmFmt; diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index 71aa7022ed31..7909f217224e 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -29,20 +29,14 @@ #ifndef _WW8PAR2_HXX #define _WW8PAR2_HXX -#ifndef SWTYPES_HXX #include <swtypes.hxx> // enum RndStdIds -#endif #include <fmtfsize.hxx> #include <fmtornt.hxx> #include <fmtsrnd.hxx> #include <editeng/lrspitem.hxx> -#ifndef WW8SCAN_HXX #include "ww8scan.hxx" // class WW8Style -#endif -#ifndef WW8PAR_HXX #include "ww8par.hxx" // WW8_BRC5 -#endif class WW8RStyle; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index e6d8a1449683..fab121dbdb9b 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -45,9 +45,7 @@ #include "hash_wrap.hxx" #include "sortedarray.hxx" -#ifndef WW8STRUC_HXX #include "ww8struc.hxx" // FIB, STSHI, STD... -#endif #include <types.hxx> #include <unomid.h> diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index bdd68b082eb5..895835e2bbd9 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -27,9 +27,7 @@ #ifndef _XMLTEXTI_HXX #define _XMLTEXTI_HXX -#ifndef _XMLOFF_TXTIMP_HXX #include <xmloff/txtimp.hxx> -#endif #include <xmloff/functional.hxx> class XMLRedlineImportHelper; diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index af8a9f108011..11a7a82b2c5f 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -53,9 +53,7 @@ #include <editeng/svxfont.hxx> #include <vcl/print.hxx> #include <sfx2/printer.hxx> -#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> -#endif #include <editeng/scripttypeitem.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <comphelper/processfactory.hxx> diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 0623df315d39..74bb28bb9085 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -29,9 +29,7 @@ #include <sfx2/basedlgs.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> #include <swdbdata.hxx> diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index b900d7d21ff6..6a57501b371a 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -29,9 +29,7 @@ #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index 42298a463cbf..25adfe9ef98f 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -28,9 +28,7 @@ #define _CUSTOMIZEADDRESSLISTDIALOG_HXX #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index 212bb873ca4b..47bc0d039901 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -29,9 +29,7 @@ #include <sfx2/basedlgs.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <com/sun/star/uno/Sequence.h> namespace com{ namespace sun{ namespace star{ diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index eddaca225e9b..9c091e4475a9 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -28,9 +28,7 @@ #define _MAILMERGEADDRESSBLOCKPAGE_HXX #include <svtools/wizardmachine.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <mailmergehelper.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 6483025f88ed..aef803cce92b 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -30,9 +30,7 @@ #include <svtools/wizardmachine.hxx> #include <mailmergehelper.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> class SwMailMergeWizard; /*-- 02.04.2004 09:21:06--------------------------------------------------- diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 3e237d797e2f..366e8b76076f 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -29,9 +29,7 @@ #include <svtools/wizardmachine.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include <svtools/stdctrl.hxx> diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index b7dd9dfab2e6..b04dd7c8deaf 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -29,9 +29,7 @@ #include <svtools/wizardmachine.hxx> #include <mailmergehelper.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx index ad3d51260bb2..53862a453813 100644 --- a/sw/source/ui/dbui/mmmergepage.hxx +++ b/sw/source/ui/dbui/mmmergepage.hxx @@ -28,9 +28,7 @@ #define _MAILMERGEMERGEPAGE_HXX #include <svtools/wizardmachine.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <svtools/stdctrl.hxx> #include <mailmergehelper.hxx> diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index c48d6d210c4f..07ce98174c71 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -27,9 +27,7 @@ #ifndef _MAILMERGEOUTPUTPAGE_HXX #define _MAILMERGEOUTPUTPAGE_HXX #include <svtools/wizardmachine.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <vcl/combobox.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 9db02409cd1c..5e4ee210cf05 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -28,9 +28,7 @@ #define _MAILMERGEOUTPUTTYPEPAGE_HXX #include <svtools/wizardmachine.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> #include <mailmergehelper.hxx> class SwMailMergeWizard; diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx index 8fb7ad938996..51d2a44c23b7 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.hxx +++ b/sw/source/ui/dbui/mmpreparemergepage.hxx @@ -28,9 +28,7 @@ #define _MAILMERGEPREPAREMERGEPAGE_HXX #include <svtools/wizardmachine.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <svtools/stdctrl.hxx> #include <mailmergehelper.hxx> diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 25b23f692a4c..eb951df69c6b 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -29,9 +29,7 @@ #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx index 2d60689c6854..fb16b9af148b 100644 --- a/sw/source/ui/docvw/romenu.hxx +++ b/sw/source/ui/docvw/romenu.hxx @@ -28,13 +28,9 @@ #define _ROMENU_HXX -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <tools/list.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif class SwView; class SfxDispatcher; diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index f8508bb7e69a..199162d3b7aa 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -33,15 +33,9 @@ #include <svl/svstdarr.hxx> #endif #include <svtools/stdctrl.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include "envlop.hxx" diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 4c2c14fb5cd6..da862014a449 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -34,9 +34,7 @@ #include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 1f8ff491423d..f78dbad20c44 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -30,9 +30,7 @@ #include <vcl/group.hxx> #include <vcl/field.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <sfx2/tabdlg.hxx> diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 2472031777a1..dc25bdfa314f 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -29,9 +29,7 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include "condedit.hxx" diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index bd46111c0b8e..4cde2cc92f92 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -30,9 +30,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 7a63385a5935..e1125ba5e73b 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -30,9 +30,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/edit.hxx> diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 0facb24bf823..af0a8b3b2efa 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -30,9 +30,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/edit.hxx> diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index dd4665198589..b083c7ce7d3c 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -30,9 +30,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/toolbox.hxx> #include <vcl/edit.hxx> diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx index 26b01ae4accb..e24fc91894d0 100644 --- a/sw/source/ui/inc/DropDownFieldDialog.hxx +++ b/sw/source/ui/inc/DropDownFieldDialog.hxx @@ -30,9 +30,7 @@ #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwDropDownField; class SwField; diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx index dd3e7e2dce9b..ebe8d5ba6d79 100644 --- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx @@ -29,9 +29,7 @@ #define SW_SPELL_DIALOG_CHILD_WINDOW_HXX #include <svx/SpellDialogChildWindow.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif class SwWrtShell; struct SpellState; diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index 6700212aa0c3..209c0379b114 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.hxx @@ -29,17 +29,11 @@ #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /*-----------------22.02.97 15.06------------------- diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index d1e9a3d82907..9d10c53089fd 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -27,9 +27,7 @@ #ifndef _ACTCTRL_HXX #define _ACTCTRL_HXX -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swdllapi.h" /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 18eb19228fee..7bf5426638e7 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -28,9 +28,7 @@ #define _ASCFLDLG_HXX #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/basedlgs.hxx> #include <svx/txencbox.hxx> diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx index 535bc04bf9ca..eb89d875c982 100644 --- a/sw/source/ui/inc/autoedit.hxx +++ b/sw/source/ui/inc/autoedit.hxx @@ -27,9 +27,7 @@ #ifndef _AUTOEDIT_HXX #define _AUTOEDIT_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif class AutoEdit : public Edit diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index e09ae625534d..51f8fbddbd0c 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.hxx @@ -28,12 +28,8 @@ #ifndef _BMPWIN_HXX #define _BMPWIN_HXX -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif -#ifndef _BITMAPEX_HXX #include <vcl/bitmapex.hxx> -#endif #include <vcl/window.hxx> /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index 29c3173787a9..56837ebc350e 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -30,9 +30,7 @@ #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include "swlbox.hxx" // SwComboBox diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx index 447afd8ca567..96f57a80fa70 100644 --- a/sw/source/ui/inc/break.hxx +++ b/sw/source/ui/inc/break.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index 210f81907cc5..2c4e9b88b507 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -28,15 +28,9 @@ #define _CHANGEDB_HXX -#ifndef _BITMAP_HXX //autogen #include <vcl/bitmap.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> #include <svtools/svtreebx.hxx> #include <svx/stddlg.hxx> diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 85248baeed8b..1919102589ca 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -28,29 +28,17 @@ #define _SWCHARDLG_HXX #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class SwView; class SvxMacroItem; diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index 852a2f705c68..3585239c6da8 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 1cc6ecf33cb9..b4ce882c7bd9 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -29,28 +29,14 @@ #define _COLUMN_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _IMAGE_HXX //autogen #include <vcl/image.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svtools/valueset.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index bce44192ae68..f3ac989fb939 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -27,9 +27,7 @@ #ifndef _CONDEDTI_HXX #define _CONDEDTI_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/transfer.hxx> #include "swdllapi.h" diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index bfcd31dcba87..10abe486155f 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -29,9 +29,7 @@ #include <limits.h> // USHRT_MAX #include "swcont.hxx" -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif class SwWrtShell; class SwContentArr; diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index fc1879bc4f2d..f3b68fdef14e 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -28,9 +28,7 @@ #define _SW_CONVERT_HXX #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <sfx2/basedlgs.hxx> #include <textcontrolcombo.hxx> diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index edb8590d5c8f..032d30ed169d 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -29,25 +29,15 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx index c0a530de9f3a..966b2b84eaef 100644 --- a/sw/source/ui/inc/dbinsdlg.hxx +++ b/sw/source/ui/inc/dbinsdlg.hxx @@ -29,18 +29,10 @@ #define _DBINSDLG_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/lstbox.hxx> #include <svtools/svmedit.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx index 2c8e9cdf02c7..a8571d1853da 100644 --- a/sw/source/ui/inc/dbui.hxx +++ b/sw/source/ui/inc/dbui.hxx @@ -29,9 +29,7 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx index f269693975cc..28aa055de00f 100644 --- a/sw/source/ui/inc/docstdlg.hxx +++ b/sw/source/ui/inc/docstdlg.hxx @@ -29,9 +29,7 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> #include "docstat.hxx" diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx index 50140443f726..e895ff95df94 100644 --- a/sw/source/ui/inc/drpcps.hxx +++ b/sw/source/ui/inc/drpcps.hxx @@ -30,25 +30,15 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index b7ae315a9beb..14fea973d137 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -27,26 +27,16 @@ #ifndef _ENVLOP_HXX #define _ENVLOP_HXX -#ifndef _SV_MEDIT_HXX #include <svtools/svmedit.hxx> -#endif #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include "envimg.hxx" diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index c039fe512599..23f8a21c34d6 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include "toxe.hxx" diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 219f6c37a308..73820c0e7dc1 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -28,27 +28,17 @@ #ifndef _FRMPAGE_HXX #define _FRMPAGE_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <sfx2/tabdlg.hxx> #include <svx/swframeposstrings.hxx> #include <swtypes.hxx> #include <bmpwin.hxx> #include <svx/swframeexample.hxx> #include <prcntfld.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif namespace sfx2{class FileDialogHelper;} diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx index c96e4177027b..f40aa2cbb5cd 100644 --- a/sw/source/ui/inc/glosbib.hxx +++ b/sw/source/ui/inc/glosbib.hxx @@ -28,19 +28,13 @@ #ifndef _GLOSBIB_HXX #define _GLOSBIB_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svx/stddlg.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svtools/svtabbx.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> class SwGlossaryHdl; diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index 3c6ce003ca8f..38403dba6883 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -27,32 +27,20 @@ #ifndef _GLOSSARY_HXX #define _GLOSSARY_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/svtreebx.hxx> #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index f0c2f13cc6bc..ffc1fef54c76 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -29,13 +29,9 @@ #include <svx/stddlg.hxx> -#ifndef _SV_SVMEDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwInputField; class SwSetExpField; diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 8693572d167f..f3903836f5f6 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -28,16 +28,10 @@ #define SW_INPUTWIN_HXX -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <sfx2/childwin.hxx> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif class SwFldMgr; class SwWrtShell; diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index c9c51301a100..03da1ced9009 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -29,13 +29,9 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/fixed.hxx> class SwWrtShell; diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index e48eece78a9f..31eccb11fd7e 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -27,18 +27,10 @@ #ifndef _INSTABLE_HXX #define _INSTABLE_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <sfx2/basedlgs.hxx> #include <actctrl.hxx> #include <textcontrolcombo.hxx> diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index 6fecb6c82b30..ae05222df613 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -31,21 +31,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _SV_SVMEDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif class SwWrtShell; class SwFldMgr; diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index 62da2e1925ef..514866dd742b 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -33,9 +33,7 @@ #include <vcl/field.hxx> #include <numberingtypelistbox.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class Window; class SfxItemSet; diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx index e2717ebb17fa..55ca59b8437e 100644 --- a/sw/source/ui/inc/mailconfigpage.hxx +++ b/sw/source/ui/inc/mailconfigpage.hxx @@ -28,18 +28,10 @@ #define _MAILCONFIGPAGE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> class SwTestAccountSettingsDialog; diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index e1f9f355c96a..6ce93cb518ec 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -29,25 +29,15 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Reference.h> diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index 44916f5d3b1d..024afd836c10 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -27,13 +27,9 @@ #ifndef _MERGETBL_HXX #define _MERGETBL_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svx/stddlg.hxx> diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx index 7d5dae802e01..a002353cc968 100644 --- a/sw/source/ui/inc/multmrk.hxx +++ b/sw/source/ui/inc/multmrk.hxx @@ -31,19 +31,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwTOXMgr; diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx index b2b457bdd5d4..70ce3ed21a2a 100644 --- a/sw/source/ui/inc/navipi.hxx +++ b/sw/source/ui/inc/navipi.hxx @@ -29,9 +29,7 @@ // INCLUDE --------------------------------------------------------------- -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svl/lstner.hxx> #include <svtools/transfer.hxx> #include <sfx2/childwin.hxx> diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 2233f9609fe4..84fa861a00c6 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -29,25 +29,13 @@ #include <sfx2/tabdlg.hxx> -#ifndef _MENUBTN_HXX //autogen #include <vcl/menubtn.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svx/stddlg.hxx> #include <numprevw.hxx> #include "numrule.hxx" diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx index f8d748c4473c..23325d094825 100644 --- a/sw/source/ui/inc/numpara.hxx +++ b/sw/source/ui/inc/numpara.hxx @@ -32,9 +32,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /* --- class SwParagraphNumTabPage ---------------------------------------- diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 18c1175fda72..33c1fe7827d1 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -29,9 +29,7 @@ #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index d05e68588b2d..8243dfb449aa 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -28,25 +28,15 @@ #define _OPTPAGE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svx/fntctrl.hxx> #include <fontcfg.hxx> diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 65f57636c02d..dad42c1f2a83 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -32,26 +32,16 @@ #include <vcl/menu.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swtypes.hxx" //fuer MAXLEVEL #include <numprevw.hxx> diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx index 31bb0c68fc22..2540a6b7241a 100644 --- a/sw/source/ui/inc/pgfnote.hxx +++ b/sw/source/ui/inc/pgfnote.hxx @@ -29,17 +29,11 @@ #include <sfx2/tabdlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index b2e97b65fb62..be0e9b8b4295 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -29,12 +29,8 @@ #include <sfx2/tabdlg.hxx> #include <colex.hxx> -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <svtools/ctrlbox.hxx> /*-------------------------------------------------------------------- Description: TabPage Format/(Styles/)Page/Text grid diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx index bc9fa1855287..d963e8c0f2fa 100644 --- a/sw/source/ui/inc/popbox.hxx +++ b/sw/source/ui/inc/popbox.hxx @@ -28,9 +28,7 @@ #define _POPBOX_HXX -#ifndef _TOOLBOX_HXX #include <vcl/toolbox.hxx> -#endif #include <svtools/transfer.hxx> class SwNavigationPI; diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx index e506f31de708..fe9ccd98a429 100644 --- a/sw/source/ui/inc/prcntfld.hxx +++ b/sw/source/ui/inc/prcntfld.hxx @@ -27,9 +27,7 @@ #ifndef _PRCNTFLD_HXX #define _PRCNTFLD_HXX -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include "swdllapi.h" class SW_DLLPUBLIC PercentField : public MetricField diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index 152c17387072..49cc214b3ea2 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -31,9 +31,7 @@ #include <redline.hxx> #include <tools/datetime.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index e4b497246cd7..bb90e7da0328 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx index 80c57767fbe2..283050a9454f 100644 --- a/sw/source/ui/inc/scroll.hxx +++ b/sw/source/ui/inc/scroll.hxx @@ -26,9 +26,7 @@ ************************************************************************/ #ifndef _SCROLL_HXX #define _SCROLL_HXX -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif class SwScrollbar: public ScrollBar { diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index 1fa693691086..d7f875b06b28 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.hxx @@ -27,18 +27,12 @@ #ifndef _SELGLOS_HXX #define _SELGLOS_HXX -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/fixed.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwSelGlossaryDlg : public ModalDialog { diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index 9d96d6ac3a9d..52646d1fab07 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif class SwWrtShell; diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index c23ee997852d..f98f752e9cf9 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -32,9 +32,7 @@ #include <unotools/options.hxx> #include <vcl/timer.hxx> -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <svtools/xtextedt.hxx> class ScrollBar; diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index 09d91cf64195..aa0051ac2d75 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -27,18 +27,10 @@ #ifndef _SRTDLG_HXX #define _SRTDLG_HXX -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif #include <svx/stddlg.hxx> #include <svx/langbox.hxx> diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx index a761d60a12ed..fa769b50575a 100644 --- a/sw/source/ui/inc/stmenu.hxx +++ b/sw/source/ui/inc/stmenu.hxx @@ -30,16 +30,12 @@ #ifndef _STMENU_HXX #define _STMENU_HXX -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <vector> #include <com/sun/star/smarttags/XSmartTagAction.hpp> -#ifndef _COM_SUN_STAR_SMARTTAGS_XSTRINGKEYMAP_HPP_ #include <com/sun/star/container/XStringKeyMap.hpp> -#endif #include <com/sun/star/text/XTextRange.hpp> class SwView; diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 0c31a9ab977f..3e20824b2901 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -29,13 +29,9 @@ #include <svl/svarray.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include "swdllapi.h" class SwBoxEntry; diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx index 16f3d56852e6..623046eb83e2 100644 --- a/sw/source/ui/inc/swrenamexnameddlg.hxx +++ b/sw/source/ui/inc/swrenamexnameddlg.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 8c7160433837..67a4f41e970f 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -29,21 +29,13 @@ #include <svx/stddlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index 037aac07fe16..3429997d468a 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -30,30 +30,18 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif #include <svx/stddlg.hxx> -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif #include <sfx2/childwin.hxx> #include "toxe.hxx" #include <svtools/stdctrl.hxx> diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx index 0ae8c7009426..f00e5395b2bb 100644 --- a/sw/source/ui/inc/syncbtn.hxx +++ b/sw/source/ui/inc/syncbtn.hxx @@ -31,9 +31,7 @@ #ifdef _SYNCDLG #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif /*------------------------------------------------------------------------ Beschreibung: diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index 9c35450eb208..d945279b368d 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -28,25 +28,15 @@ #define SW_TAUTOFMT_HXX #include <sfx2/basedlgs.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _MOREBTN_HXX //autogen #include <vcl/morebtn.hxx> -#endif -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif class SwTableAutoFmt; class AutoFmtPreview; diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx index dbf42d86d085..9c59fdd4bf98 100644 --- a/sw/source/ui/inc/textcontrolcombo.hxx +++ b/sw/source/ui/inc/textcontrolcombo.hxx @@ -28,9 +28,7 @@ #ifndef _TEXTCONTROLCOMBO_HXX #define _TEXTCONTROLCOMBO_HXX -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif #include <vcl/field.hxx> #include "swdllapi.h" diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index 6399e2acba9e..f68d25549dff 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <actctrl.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx index a228b8bdea77..92c0e0fbdee8 100644 --- a/sw/source/ui/inc/wordcountdialog.hxx +++ b/sw/source/ui/inc/wordcountdialog.hxx @@ -28,9 +28,7 @@ #define SW_WORDCOUNTDIALOG_HXX #include <sfx2/basedlgs.hxx> #include <svtools/stdctrl.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <layout/layout.hxx> #include <layout/layout-pre.hxx> struct SwDocStat; diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index 4ca42086d93e..84521d25981b 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -30,9 +30,7 @@ #include <sfx2/tbxctrl.hxx> #include <vcl/toolbox.hxx> #include <svtools/stdctrl.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif class PopupMenu; class SwView; diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx index 7d435f90cd17..673ca87e02ec 100644 --- a/sw/source/ui/inc/wrap.hxx +++ b/sw/source/ui/inc/wrap.hxx @@ -30,21 +30,13 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif class Window; class SfxItemSet; diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index a1b305b3b7db..cfe280aaefd4 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -28,18 +28,10 @@ #define _IMPFNOTE_HXX #include <sfx2/tabdlg.hxx> -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <numberingtypelistbox.hxx> class SwWrtShell; diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 51e39a65dce9..615bef404d3d 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -27,15 +27,9 @@ #ifndef _SWTABLEPG_HXX #define _SWTABLEPG_HXX #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <actctrl.hxx> #include "prcntfld.hxx" #include "swtypes.hxx" diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx index 6ea168716e40..69e2bf0084a8 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.hxx +++ b/sw/source/ui/uno/SwXDocumentSettings.hxx @@ -32,12 +32,8 @@ #include "ui_pch.hxx" #endif -#ifndef _COMPHELPER_MASTERPROPERTYSET_HXX_ #include <comphelper/MasterPropertySet.hxx> -#endif -#ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP #include <com/sun/star/text/XTextDocument.hpp> -#endif #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weak.hxx> diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx index 2b908c453043..f343bfafd274 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx @@ -31,9 +31,7 @@ #include "ui_pch.hxx" #endif #include <comphelper/ChainablePropertySet.hxx> -#ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP #include <com/sun/star/text/XTextDocument.hpp> -#endif #include <cppuhelper/weak.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> |