diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-04 17:00:08 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 18:22:24 +0200 |
| commit | 2d95c5e1c4c4439d1b83b0681ab87403fdbaa540 (patch) | |
| tree | e814b3383d6e97abde3925eec135a037d50afd03 /sw | |
| parent | 0f0c8591f93c568589df03eab07f08fe36ca4ac3 (diff) | |
remove include guards using fixguard.py
Diffstat (limited to 'sw')
260 files changed, 0 insertions, 1392 deletions
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index eb316eedbf..f42ab76247 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -44,9 +44,7 @@ #include <doc.hxx> #include <accmap.hxx> #include <accdoc.hxx> -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <pagefrm.hxx> const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView"; diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 567426b2a5..401f63a625 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -41,9 +41,7 @@ #include <viewsh.hxx> #include <accmap.hxx> #include "accfootnote.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index fedc0796a9..10bc71b397 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -37,9 +37,7 @@ #include <vcl/svapp.hxx> #include <hffrm.hxx> #include "accheaderfooter.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index e5b66300d5..248166535c 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -37,9 +37,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include "accpage.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <pagefrm.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index ecb45c2ab1..be8a728cf1 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -34,9 +34,7 @@ #include <txttypes.hxx> // for portion replacement in Special() -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <tools/resid.hxx> #include "viewopt.hxx" diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index cc38f1a63c..30f4029900 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -31,9 +31,7 @@ #include <vcl/svapp.hxx> #include <rtl/uuid.h> -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <accpreview.hxx> diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx index f3037addbb..97afe5fd48 100644 --- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx +++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <fmtwrapinfluenceonobjpos.hxx> -#ifndef _UNOMID_H #include <unomid.h> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx index e21ead3d00..7c35dc8496 100644 --- a/sw/source/core/attr/swatrset.cxx +++ b/sw/source/core/attr/swatrset.cxx @@ -43,9 +43,7 @@ #include <node.hxx> #include <paratr.hxx> // fuer SetModifyAtAttr #include <cellatr.hxx> // fuer SetModifyAtAttr -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <istyleaccess.hxx> #include <numrule.hxx> // --> OD 2008-03-19 #refactorlists# diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index 695db08c75..27560404bf 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -33,9 +33,7 @@ #include <vcl/svapp.hxx> #include <swmodule.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index acedf9216f..7215953adf 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -36,9 +36,7 @@ #endif #include <unotools/localedatawrapper.hxx> -#ifndef _SVX_LINGU_HXX #include <editeng/unolingu.hxx> -#endif #include <editeng/scripttypeitem.hxx> #include "swtypes.hxx" diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 728b4c63d3..43d57b25d3 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -58,9 +58,7 @@ #include <dbfld.hxx> #include <expfld.hxx> #include <usrfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <docfld.hxx> #include <swunodef.hxx> #include <swtypes.hxx> diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index b5a2895fa4..209cf6b921 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -66,9 +66,7 @@ #include <editeng/charrotateitem.hxx> #include <editeng/charreliefitem.hxx> #include <editeng/frmdiritem.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <editeng/swafopt.hxx> #include <editeng/svxacorr.hxx> #include <unotools/charclass.hxx> diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx index c7f0bd70e7..17c68036d5 100644 --- a/sw/source/core/bastyp/swrect.cxx +++ b/sw/source/core/bastyp/swrect.cxx @@ -30,10 +30,8 @@ #ifdef DBG_UTIL -#ifndef _STREAM_HXX //autogen #include <tools/stream.hxx> #endif -#endif #include <stdlib.h> #include "swrect.hxx" #include <math.h> diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx index d56c887df0..344e26b215 100644 --- a/sw/source/core/crsr/findcoll.cxx +++ b/sw/source/core/crsr/findcoll.cxx @@ -34,9 +34,7 @@ #include <pamtyp.hxx> #include <swundo.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <tools/resid.hxx> //------------------ Methoden der CrsrShell --------------------------- diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 3dc0ff9e40..517aef7695 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -58,9 +58,7 @@ #include <crsskip.hxx> #include <vcl/msgbox.hxx> #include <mdiexp.hxx> // ...Percent() -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <redline.hxx> // SwRedline diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 8e0ee58839..a602ce70ff 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -52,9 +52,7 @@ #include <ndtxt.hxx> #include <scriptinfo.hxx> #include <mdiexp.hxx> // GetSearchDialog -#ifndef _COMCORE_HRC #include <comcore.hrc> // ResId fuer Abfrage wenn zu Search & Replaces -#endif #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpaintwindow.hxx> diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 0a13cced38..ec15655062 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -34,9 +34,7 @@ #include <svl/svstdarr.hxx> #include <tools/resmgr.hxx> #include <poolfmt.hxx> -#ifndef _RDIC_HRC #include <rcid.hrc> -#endif #include <tools/debug.hxx> extern ResMgr* pSwResMgr; // Initialise UI names to 0 diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index fc88148156..6ad87d4edf 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _RTL_USTRING_HXX //autogen #include <rtl/ustring.hxx> -#endif #include <svtools/imap.hxx> #include <svtools/imapobj.hxx> #include <basic/sbx.hxx> @@ -43,9 +41,7 @@ #include <frmatr.hxx> #include <docary.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <swevent.hxx> using namespace ::com::sun::star::uno; diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx index 6d4daf8972..dfe569a0cf 100644 --- a/sw/source/core/doc/docdde.cxx +++ b/sw/source/core/doc/docdde.cxx @@ -32,9 +32,7 @@ #include <stdlib.h> -#ifndef _APP_HXX #include <vcl/svapp.hxx> -#endif #include <tools/urlobj.hxx> #define _SVSTDARR_STRINGS diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 3d599cca93..1d5b9f1a8c 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -55,9 +55,7 @@ #include <frmtool.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <ndindex.hxx> #include <ftnidx.hxx> #include <fmtftn.hxx> @@ -69,9 +67,7 @@ #include <swwait.hxx> #include <GetMetricVal.hxx> #include <unotools/syslocale.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <SwUndoPageDesc.hxx> diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index bb40bcc70c..1468142214 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -69,9 +69,7 @@ #include <authfld.hxx> #include <txtinet.hxx> #include <fmtcntnt.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> // fuer InitFldTypes -#endif #include <SwUndoField.hxx> diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 95ba6541c4..f5a10ae533 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -49,9 +49,7 @@ #include <txtfrm.hxx> #include <pamtyp.hxx> #include <redline.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <editeng/adjitem.hxx> #include <editeng/frmdiritem.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index d0324d6d06..c2192ece06 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> #include <tools/shl.hxx> -#ifndef _SFX_ITEMITER_HXX //autogen #include <svl/itemiter.hxx> -#endif #include <sfx2/app.hxx> #include <editeng/colritem.hxx> #include <editeng/udlnitem.hxx> diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 9a8d4e8e44..f6f8293b36 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -44,9 +44,7 @@ #include <paratr.hxx> //--> #outlinelevel added by zhaojianwei -#ifndef _SFXINTITEM_HXX #include <svl/intitem.hxx> -#endif //<--end TYPEINIT1( SwTxtFmtColl, SwFmtColl ); diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index d3c8d7f30c..cbc77943e1 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -34,12 +34,8 @@ #ifdef TEST_DELAYED_RESIZE #include <vcl/sound.hxx> #endif -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <sot/storage.hxx> #include <fmtornt.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 3c1d88c700..1f4021db54 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -71,9 +71,7 @@ #include <poolfmt.hxx> #include <mdiexp.hxx> #include <swwait.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <accessibilityoptions.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index ed1d795f78..5a54a4992d 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -44,9 +44,7 @@ #include <frmfmt.hxx> #include <ndtxt.hxx> #include <docary.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <SwStyleNameMapper.hxx> // --> OD 2006-06-28 #b6440955# // Needed to load default bullet list configuration diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 78bd3d5531..0906917de5 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -67,9 +67,7 @@ #include <fmtcol.hxx> #include <ndtxt.hxx> #include <fmtline.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <GetMetricVal.hxx> #include <numrule.hxx> diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx index e39626b681..2cb265b87a 100644 --- a/sw/source/core/doc/swserv.cxx +++ b/sw/source/core/doc/swserv.cxx @@ -41,9 +41,7 @@ #include <bookmrk.hxx> #include <pam.hxx> #include <shellio.hxx> -#ifndef _SWERROR_H #include <swerror.h> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index c783f9af11..9e88985d6d 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -40,9 +40,7 @@ #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> #include <svx/dialmgr.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #define READ_OLDVERS // erstmal noch alte Versionen lesen #include <swtypes.hxx> diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 1321fb3c20..30ebfad41e 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -27,9 +27,7 @@ #include "precompiled_sw.hxx" #include <finalthreadmanager.hxx> -#ifndef _OSL_THREAD_HXX_ #include <osl/thread.hxx> -#endif #include <errhdl.hxx> #include <pausethreadstarting.hxx> #include <swthreadjoiner.hxx> diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index fc8c431f52..1c362e8d0a 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -58,9 +58,7 @@ #include <node2lay.hxx> #include <doctxm.hxx> #include <fmtftntx.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif // --> OD 2005-12-01 #i27138# #include <viewsh.hxx> #include <txtfrm.hxx> diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 7029de9e0e..773332ac75 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -84,9 +84,7 @@ #include <section.hxx> #include <frmtool.hxx> #include <node2lay.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include "docsh.hxx" #include <tabcol.hxx> #include <unochart.hxx> diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx index 9269b0691c..81e59c5d80 100644 --- a/sw/source/core/docnode/retrieveinputstream.cxx +++ b/sw/source/core/docnode/retrieveinputstream.cxx @@ -27,9 +27,7 @@ #include "precompiled_sw.hxx" #include <retrieveinputstream.hxx> #include <comphelper/mediadescriptor.hxx> -#ifndef _COM_SUN_STAR_IO_XSTREAM_HXX_ #include <com/sun/star/io/XStream.hpp> -#endif /** class for a thread to retrieve an input stream given by an URL diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 73ddb89553..267599804d 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -40,9 +40,7 @@ #include <sfx2/linkmgr.hxx> #include <sfx2/objsh.hxx> #include <editeng/boxitem.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> // fuer die EventIds -#endif #include <sfx2/linkmgr.hxx> #include <svtools/soerr.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 0ac98e34df..63df26418c 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -36,9 +36,7 @@ #include <fmturl.hxx> #include <frmfmt.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <shellres.hxx> #include <viewimp.hxx> #include <pagefrm.hxx> @@ -50,9 +48,7 @@ #include <dpage.hxx> #include <dcontact.hxx> #include <dflyobj.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <usrfld.hxx> #include <flyfrm.hxx> #include <ndnotxt.hxx> diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx index af81b9d05c..6158bee2ee 100644 --- a/sw/source/core/draw/drawdoc.cxx +++ b/sw/source/core/draw/drawdoc.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <tools/stream.hxx> #include <unotools/pathoptions.hxx> #include <sot/storage.hxx> @@ -45,9 +43,7 @@ #include <rootfrm.hxx> #include <drawdoc.hxx> #include <dpage.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <shellio.hxx> #include <hintids.hxx> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index 7ab7bd26c1..50f58ae2c8 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -32,9 +32,7 @@ #define _STD_VAR_ARRAYS #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/langitem.hxx> #include <fmtinfmt.hxx> #include <txtatr.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index c5ae0bd0cf..4d10802a1b 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -72,12 +72,8 @@ #include <frmatr.hxx> #include <charatr.hxx> #include <mdiexp.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <vcl/msgbox.hxx> #include <numrule.hxx> diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index ff548882ff..1a847b7ae4 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <editsh.hxx> #include <dbfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 536a6a0b8c..11fdd28d20 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -35,9 +35,7 @@ #include <unoflatpara.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <hintids.hxx> #include <linguistic/lngprops.hxx> #include <vcl/msgbox.hxx> @@ -57,9 +55,7 @@ #include <viscrs.hxx> // SwShellCrsr #include <SwGrammarMarkUp.hxx> // SwWrongList #include <mdiexp.hxx> // Statusanzeige -#ifndef _STATSTR_HRC #include <statstr.hrc> // StatLine-String -#endif #include <cntfrm.hxx> #include <crsskip.hxx> #include <splargs.hxx> diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index a17b506749..2f6fd74a51 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -35,9 +35,7 @@ #define _SVSTDARR_ULONGS #include <svl/svstdarr.hxx> -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <vcl/window.hxx> #include <editeng/boxitem.hxx> #include <swwait.hxx> diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx index a2c5cfd363..f4ceb4f54a 100644 --- a/sw/source/core/edit/edtox.cxx +++ b/sw/source/core/edit/edtox.cxx @@ -34,9 +34,7 @@ #include <tools/urlobj.hxx> #include <svtools/txtcmp.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <sfx2/docfile.hxx> #include "editeng/unolingu.hxx" #include <swtypes.hxx> @@ -54,9 +52,7 @@ #include <doctxm.hxx> #include <docary.hxx> #include <mdiexp.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <bookmrk.hxx> #include <xmloff/odffields.hxx> diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 92dd8a5d62..dd88e33e7c 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -40,9 +40,7 @@ #include <editeng/langitem.hxx> #include <swtypes.hxx> #include <tools/resid.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <authfld.hxx> #include <expfld.hxx> #include <pam.hxx> @@ -54,9 +52,7 @@ #include <txtfld.hxx> #include <ndtxt.hxx> #include <doc.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <unoprnms.hxx> #include <unomid.h> diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index b673a8e6c1..a15396a459 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -36,9 +36,7 @@ #include <ndtxt.hxx> #include <chpfld.hxx> #include <expfld.hxx> // fuer GetBodyTxtNode -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <numrule.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index da19af7786..fd45b29ca1 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -44,15 +44,11 @@ #include <pam.hxx> #include <ndtxt.hxx> #include <dbfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <docfld.hxx> #include <expfld.hxx> #include <txtatr.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif using namespace ::com::sun::star::sdbc; diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 6eb7211994..6aff1e848f 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -40,9 +40,7 @@ #include <swtable.hxx> #include <swbaslnk.hxx> #include <swddetbl.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <hints.hxx> using rtl::OUString; diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 6e79643e4e..a1c31e2e3e 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -35,9 +35,7 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <editeng/unolingu.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <doc.hxx> #include <editsh.hxx> #include <frame.hxx> @@ -53,9 +51,7 @@ #include <expfld.hxx> #include <shellres.hxx> #include <calc.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <math.h> #ifdef MAC diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 83cfcfc5bf..097b50f76c 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -36,9 +36,7 @@ #endif #include <svl/poolitem.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <unoprnms.hxx> using namespace com::sun::star; diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index 86f9546e7d..c199871aa9 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -32,9 +32,7 @@ #include <hintids.hxx> #include <doc.hxx> #include <docufld.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 12475e3528..9dbff9633d 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -62,18 +62,12 @@ // <-- #include <ftnidx.hxx> #include <viewsh.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif #include <SwStyleNameMapper.hxx> #include <shellres.hxx> #include <poolfmt.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <numrule.hxx> #include <SwNodeNum.hxx> diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index aa3cb8ee89..ee8215d074 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -30,12 +30,8 @@ #include <docufld.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <tools/resid.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 8fb12bb089..727665191e 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -37,9 +37,7 @@ #include <txtfld.hxx> #include <expfld.hxx> #include <docfld.hxx> // fuer _SetGetExpFld -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index a5e9b37b33..2554129ede 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -40,9 +40,7 @@ #include <doc.hxx> #include <editsh.hxx> #include <dpage.hxx> -#ifndef _UNOFLDMID_H #include <unofldmid.h> -#endif using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index d2523b70e0..75edaf7b71 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" #include <com/sun/star/embed/EmbedStates.hpp> -#ifndef _SFX_CLIENTSH_HXX #include <sfx2/ipclient.hxx> -#endif #include <sfx2/viewsh.hxx> #include <sfx2/app.hxx> #include <unotools/moduleoptions.hxx> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 2eb597f887..6ab2823a4b 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -52,9 +52,7 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> // fuer InitFldTypes -#endif #include <frmfmt.hxx> #include <frmatr.hxx> #include <fmtfsize.hxx> diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 9d868d9110..521d554cd9 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -34,9 +34,7 @@ #include <tools/errinf.hxx> #include <vcl/svapp.hxx> #include <basegfx/vector/b2dvector.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <editeng/protitem.hxx> #include <editeng/brshitem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx index 1540098437..eb9f533f7e 100644 --- a/sw/source/core/graphic/grfatr.cxx +++ b/sw/source/core/graphic/grfatr.cxx @@ -47,12 +47,8 @@ #include <grfatr.hxx> #include <swunohelper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _UNOMID_H #include <unomid.h> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index cc62d29893..cd3127243b 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -31,9 +31,7 @@ #include <vcl/salbtype.hxx> // FRound #include <tools/urlobj.hxx> #include <svl/undo.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <svtools/imap.hxx> #include <svtools/filter.hxx> #include <sot/storage.hxx> diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 7e02d111f7..b804a5a93d 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -106,9 +106,7 @@ #include <cmdid.h> #include <unomid.h> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <svx/svdundo.hxx> // #111827# // OD 2004-05-24 #i28701# #include <sortedobjs.hxx> diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 2d1291a7b2..ff28b85d11 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -75,9 +75,7 @@ #include <fmtanchr.hxx> #include <tools/shl.hxx> #include <sfx2/progress.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include "swmodule.hxx" #include "fmtline.hxx" diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 7a432fd78f..ef0705fcfa 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -33,9 +33,7 @@ #include <hintids.hxx> -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <tools/poly.hxx> #define _SVSTDARR_LONGS #include <svl/svstdarr.hxx> @@ -49,9 +47,7 @@ // --> collapsing borders FME 2005-05-27 #i29550# #include <svx/framelink.hxx> // <-- -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svx/svdpagv.hxx> #include <tgrditem.hxx> @@ -59,9 +55,7 @@ #include <fmtsrnd.hxx> #include <fmtclds.hxx> #include <tools/shl.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <swmodule.hxx> #include <rootfrm.hxx> #include <pagefrm.hxx> @@ -89,15 +83,11 @@ #include <ptqueue.hxx> #include <noteurl.hxx> #include <virtoutp.hxx> -#ifndef _LINEINFO_HXX #include <lineinfo.hxx> -#endif #include <dbg_lay.hxx> #include <accessibilityoptions.hxx> // OD 20.12.2002 #94627# -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif // OD 28.02.2003 #b4779636#, #107692# #include <swtable.hxx> // OD 02.07.2003 #108784# diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index ce96a8809c..58a1f5326e 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -36,9 +36,7 @@ #include <txtfrm.hxx> #include <pagefrm.hxx> #include <frmtool.hxx> -#ifndef _SVX_SVDOBJ_HXX #include <svx/svdobj.hxx> -#endif #include <dflyobj.hxx> #include <dcontact.hxx> #include <frmfmt.hxx> diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index f8b2db9b55..7291fe87ec 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -31,9 +31,7 @@ #include <frame.hxx> #include <txtfrm.hxx> #include <flyfrms.hxx> -#ifndef _SVX_SVDOBJ_HXX #include <svx/svdobj.hxx> -#endif #include <dcontact.hxx> #include <frmfmt.hxx> #include <frmatr.hxx> diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index 4dfadf0222..86d183d2c5 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -31,9 +31,7 @@ #include <anchoredobject.hxx> #include <frame.hxx> #include <pagefrm.hxx> -#ifndef _SVX_SVDOBJ_HXX #include <svx/svdobj.hxx> -#endif #include <frmfmt.hxx> #include <fmtanchr.hxx> #include <fmtornt.hxx> diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index a901d3c7c7..d4813a785d 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -47,9 +47,7 @@ #include <sfx2/app.hxx> #include <sfx2/linkmgr.hxx> #include <unotools/configitem.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <fmtanchr.hxx> #include <frmfmt.hxx> #include <doc.hxx> @@ -58,9 +56,7 @@ #include <section.hxx> #include <cntfrm.hxx> #include <frmatr.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <ndole.hxx> #include <comphelper/classids.hxx> @@ -68,9 +64,7 @@ #include <sot/formats.hxx> #include <unotools/ucbstreamhelper.hxx> #include <svtools/filter.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif using rtl::OUString; using namespace utl; diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index 93b6c52e85..4258704093 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -33,12 +33,8 @@ #include <swacorr.hxx> #include <swblocks.hxx> #include "SwXMLTextBlocks.hxx" -#ifndef _SWSERROR_H #include <swerror.h> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <editsh.hxx> #include <sot/storage.hxx> diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index fc23257abb..2cf85a64f5 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -30,9 +30,7 @@ #include <SwXMLBlockImport.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> -#ifndef _SW_XMLBLOCKLIST_CONTEXT_HXX #include <SwXMLBlockListContext.hxx> -#endif #include <SwXMLTextBlocks.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 8c078d53aa..c4093992fa 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -39,9 +39,7 @@ #include <comphelper/storagehelper.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <pam.hxx> #include <swblocks.hxx> #include <ndtxt.hxx> diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx index dac78f4e59..e4a320b1dc 100644 --- a/sw/source/core/swg/SwXMLTextBlocks1.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <shellio.hxx> #include <SwXMLTextBlocks.hxx> #include <SwXMLBlockImport.hxx> diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index 120a25cb65..2670fc5f7e 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -32,9 +32,7 @@ #include <sfx2/docfilt.hxx> #include <sot/storage.hxx> #include <tools/urlobj.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <svl/macitem.hxx> #include <unotools/charclass.hxx> #include <frmfmt.hxx> @@ -46,14 +44,10 @@ #include <ndtxt.hxx> #include <mdiexp.hxx> // Progress #include <SwXMLTextBlocks.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <swunohelper.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <swerror.h> SV_IMPL_OP_PTRARR_SORT( SwBlockNames, SwBlockName* ); diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 4b0246c6b3..e7ea358c20 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -38,12 +38,8 @@ #include <tgrditem.hxx> #include <paratr.hxx> -#ifndef _FMTLINE_HXX #include <fmtline.hxx> -#endif -#ifndef _LINEINFO_HXX #include <lineinfo.hxx> -#endif #include <charfmt.hxx> #include <pagefrm.hxx> #include <viewsh.hxx> // ViewShell diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 96b211e4a6..2b5235e43c 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -42,9 +42,7 @@ #include <editeng/splwrap.hxx> #include <editeng/pgrditem.hxx> // --> OD 2008-01-17 #newlistlevelattrs# -#ifndef _SVX_TSTPITEM_HXX #include <editeng/tstpitem.hxx> -#endif // <-- #include <SwSmartTagMgr.hxx> @@ -61,9 +59,7 @@ #include <viewopt.hxx> // SwViewOptions #include <frmtool.hxx> // DrawGraphic #include <IDocumentSettingAccess.hxx> -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <paratr.hxx> // SwFmtDrop #include <rootfrm.hxx> // SwRootFrm #include <inftxt.hxx> // SwTxtInfo diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index dc11a8e456..223b9fb54a 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -35,16 +35,10 @@ #include <com/sun/star/i18n/ScriptType.hdl> #endif -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <editeng/brshitem.hxx> -#ifndef _METRIC_HXX //autogen #include <vcl/metric.hxx> -#endif -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <viewopt.hxx> // SwViewOptions #include <txtcfg.hxx> #include <SwPortionHandler.hxx> @@ -54,9 +48,7 @@ #include <blink.hxx> // pBlink #include <frmtool.hxx> // DrawGraphic #include <viewsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <doc.hxx> #include <breakit.hxx> #include <porrst.hxx> diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index 71f2c20b83..9c0a14db6b 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <SwPortionHandler.hxx> #include "errhdl.hxx" // ASSERT diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 4257c7ad23..ef874a1082 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -48,9 +48,7 @@ #include <vcl/cmdevt.hxx> #include <vcl/settings.hxx> #include <txtfrm.hxx> // SwTxtFrm -#ifndef _APP_HXX //autogen #include <vcl/svapp.hxx> -#endif #include <redlnitr.hxx> #include <extinput.hxx> #include <sfx2/printer.hxx> diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 7f9bf2fcf4..d89f2ed195 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -30,9 +30,7 @@ #include "hintids.hxx" #include <editeng/lrspitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <IDocumentSettingAccess.hxx> #include <frmatr.hxx> #include <SwPortionHandler.hxx> diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 92b1f70b14..a2de023963 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -39,9 +39,7 @@ #include <ndtxt.hxx> #include <txttxmrk.hxx> #include <tox.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <doc.hxx> #include <docary.hxx> #include <paratr.hxx> diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx index 50d1d3b804..269e4c3b8b 100644 --- a/sw/source/core/tox/toxhlp.cxx +++ b/sw/source/core/tox/toxhlp.cxx @@ -31,9 +31,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#ifndef _COM_SUN_STAR_I18N_XINDEXENTRYSUPPLIER_HPP_ #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp> -#endif #include <tools/string.hxx> #include <tools/debug.hxx> #include <toxwrap.hxx> diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index e3d80b4af6..eb95b15cdd 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -51,9 +51,7 @@ #include <authfld.hxx> #include <toxwrap.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <numrule.hxx> extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, xub_StrLen nMySttPos, diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index f88df01a6d..ea6e98c52b 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -29,16 +29,10 @@ #include "precompiled_sw.hxx" -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif -#ifndef _PRINT_HXX //autogen #include <vcl/print.hxx> -#endif #include <vcl/lineinfo.hxx> -#ifndef _METRIC_HXX //autogen #include <vcl/metric.hxx> -#endif #include <vcl/window.hxx> #include <vcl/svapp.hxx> #ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ @@ -68,9 +62,7 @@ #include <doc.hxx> #include <editeng/fhgtitem.hxx> #include <docsh.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 6ea87114f7..aad1c45bd3 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -32,9 +32,7 @@ #include <hintids.hxx> #include <editeng/cmapitem.hxx> -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #ifndef _COM_SUN_STAR_I18N_CHARTYPE_HDL #include <com/sun/star/i18n/CharType.hdl> #endif @@ -42,9 +40,7 @@ #include <com/sun/star/i18n/WordType.hdl> #endif -#ifndef _PRINT_HXX //autogen #include <vcl/print.hxx> -#endif #include <errhdl.hxx> #include <fntcache.hxx> #include <swfont.hxx> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 66508628c1..f312631e91 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -34,9 +34,7 @@ #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> #endif -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <unotools/localedatawrapper.hxx> #include <editeng/unolingu.hxx> #include <editeng/brshitem.hxx> @@ -50,9 +48,7 @@ #include <editeng/akrnitem.hxx> #include <editeng/shdditem.hxx> #include <editeng/charreliefitem.hxx> -#ifndef _SVX_CNTRITEM_HXX //autogen #include <editeng/cntritem.hxx> -#endif #include <editeng/colritem.hxx> #include <editeng/cscoitem.hxx> #include <editeng/crsditem.hxx> @@ -61,9 +57,7 @@ #include <editeng/postitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> -#ifndef _SVX_EMPHITEM_HXX //autogen #include <editeng/emphitem.hxx> -#endif #include <editeng/charscaleitem.hxx> #include <editeng/charrotateitem.hxx> #include <editeng/twolinesitem.hxx> diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index f596898aae..85ecd16735 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -38,9 +38,7 @@ #include <undobj.hxx> #include <rolbck.hxx> #include <docary.hxx> -#ifndef _UNDO_HRC #include <undo.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 9526112d0e..185ae72671 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -59,13 +59,9 @@ #include <undobj.hxx> // fuer UndoDelete #include <IMark.hxx> // fuer SwBookmark #include <charfmt.hxx> // #i27615# -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <tools/resid.hxx> -#ifndef _UNDO_HRC #include <undo.hrc> -#endif #include <editeng/brkitem.hxx> #include <bookmrk.hxx> diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 02156626ab..8b54a68df5 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -45,12 +45,8 @@ #include <mvsave.hxx> #include <redline.hxx> #include <crossrefbookmark.hxx> -#ifndef _UNDO_HRC #include <undo.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <docsh.hxx> class SwRedlineSaveData : public SwUndRng, public SwRedlineData, diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx index 9405a491c8..4dcde4c042 100644 --- a/sw/source/core/undo/unsort.cxx +++ b/sw/source/core/undo/unsort.cxx @@ -34,9 +34,7 @@ #include <ndtxt.hxx> #include <undobj.hxx> #include <sortopt.hxx> -#ifndef _DOCSORT_HXX #include <docsort.hxx> -#endif #include <redline.hxx> #include <node2lay.hxx> diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 19b77914df..82425dea38 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -42,9 +42,7 @@ #include <doc.hxx> #include <docary.hxx> #include <swundo.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <undobj.hxx> #include <docsh.hxx> diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 480288810a..eca6b75969 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -56,9 +56,7 @@ #include <ndole.hxx> #include <swtable.hxx> #include <swtypes.hxx> -#ifndef _UNOCORE_HRC #include <unocore.hrc> -#endif #include <docary.hxx> diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 85c6b3f356..2cdb02dec5 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -31,9 +31,7 @@ #include <swtypes.hxx> #include <cmdid.h> #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <doc.hxx> #include <docary.hxx> #include <fmtcol.hxx> diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx index 8115ba8780..d9e07306b9 100644 --- a/sw/source/core/unocore/unoevent.cxx +++ b/sw/source/core/unocore/unoevent.cxx @@ -36,15 +36,11 @@ #include "unostyle.hxx" #include "swevent.hxx" #include "docstyle.hxx" -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "fmtinfmt.hxx" #include <svl/macitem.hxx> #include <rtl/ustrbuf.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP #include <com/sun/star/beans/PropertyValue.hpp> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 358fe44ed9..f63dfc7930 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -66,9 +66,7 @@ #include <fmtfld.hxx> #include <fmtpdsc.hxx> #include <pagedesc.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <poolfmt.hxx> #include <edimp.hxx> #include <fchrfmt.hxx> diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index bb6a072198..fdd2c86fe5 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <pagepreviewlayout.hxx> -#ifndef _PREVWPAGE_HXX #include <prevwpage.hxx> -#endif #include <algorithm> #include <vcl/window.hxx> @@ -40,9 +38,7 @@ #include <viewimp.hxx> #include <viewopt.hxx> #include <swregion.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <frmtool.hxx> #include <svx/zoomitem.hxx> #include <printdata.hxx> diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index fe6f1cc334..13199faa23 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -48,12 +48,8 @@ #include <hints.hxx> #include <fntcache.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // Text fuer SfxProgress -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <IDocumentFieldsAccess.hxx> #include <IDocumentDeviceAccess.hxx> diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index cb351bad8d..cb2d2cb41f 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -60,9 +60,7 @@ #include <fntcache.hxx> #include <ptqueue.hxx> #include <tabfrm.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <pagedesc.hxx> #include <ndole.hxx> #include <ndindex.hxx> @@ -70,12 +68,8 @@ #include <svtools/colorcfg.hxx> #include <svtools/accessibilityoptions.hxx> #include <accessibilityoptions.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <pagepreviewlayout.hxx> #include <sortedobjs.hxx> #include <anchoredobject.hxx> diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index e464ba6a4d..e33e30d386 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -32,9 +32,7 @@ #include <sfx2/printer.hxx> #include <rtl/logfile.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <viewsh.hxx> #include <rootfrm.hxx> #include <viewimp.hxx> diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 7e7e224fc5..a94ab3b240 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -48,9 +48,7 @@ #include <pagedesc.hxx> #include <breakit.hxx> #include <swerror.h> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <mdiexp.hxx> // ...Percent() #include <poolfmt.hxx> diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index bc4882cfd1..7173396649 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -39,9 +39,7 @@ #include <frmfmt.hxx> #include <wrtasc.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif //----------------------------------------------------------------- diff --git a/sw/source/filter/basflt/docfact.cxx b/sw/source/filter/basflt/docfact.cxx index d048d00778..acde923249 100644 --- a/sw/source/filter/basflt/docfact.cxx +++ b/sw/source/filter/basflt/docfact.cxx @@ -32,9 +32,7 @@ #include <doc.hxx> #include <node.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif /****************************************************************************** diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 6adf0ba2f6..a8be681a28 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -32,9 +32,7 @@ #include "hintids.hxx" #include <vcl/svapp.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <editeng/boxitem.hxx> #include <editeng/brshitem.hxx> #include <editeng/adjitem.hxx> diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index f7b577ca7d..5d170c021c 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -34,9 +34,7 @@ #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/brshitem.hxx> @@ -65,9 +63,7 @@ #include <wrthtml.hxx> #include <wrtswtbl.hxx> #ifdef DBG_UTIL -#ifndef _VIEWSH_HXX #include <viewsh.hxx> -#endif #include <viewopt.hxx> #endif diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index f1bda7dad0..b3efe873e6 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -31,9 +31,7 @@ #include <stdlib.h> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <i18npool/mslangid.hxx> #include <svtools/ctrltool.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index caa655c44d..4075dfb1bd 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -109,9 +109,7 @@ #include <sfx2/viewfrm.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <swerror.h> #define FONTSIZE_MASK 7 diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 8c84dd9777..aea2ba6583 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -80,17 +80,13 @@ #include <swtable.hxx> #include <fldbas.hxx> #include <fmtclds.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrthtml.hxx> #include <htmlnum.hxx> #include <htmlfly.hxx> #include <swmodule.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif #include <swerror.h> #define MAX_INDENT_LEVEL 20 diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx index 58f0724606..cbaf55e6ee 100644 --- a/sw/source/filter/rtf/rtffld.cxx +++ b/sw/source/filter/rtf/rtffld.cxx @@ -35,9 +35,7 @@ #ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_ #include <com/sun/star/i18n/ScriptType.hdl> #endif -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svl/urihelper.hxx> #include <svtools/rtftoken.h> #include <svl/zforlist.hxx> @@ -60,9 +58,7 @@ #include <docufld.hxx> #include <flddat.hxx> #include <charfmt.hxx> -#ifndef _fmtruby_HXX #include <fmtruby.hxx> -#endif #include <breakit.hxx> #include <reffld.hxx> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx index 07b2076c95..0ae06c1291 100644 --- a/sw/source/filter/rtf/rtfnum.cxx +++ b/sw/source/filter/rtf/rtfnum.cxx @@ -29,9 +29,7 @@ #include <charfmt.hxx> #include <charatr.hxx> #include <paratr.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <numrule.hxx> #define RTF_NUMRULE_NAME "RTF_Num" diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index 09c9f4be3d..d51bcadc6c 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -32,9 +32,7 @@ #include <string.h> #include <tools/stream.hxx> -#ifndef _W1CLASS_HXX #include <w1class.hxx> -#endif #ifdef DUMP diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 77c0f38160..a8bcf2568f 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -33,18 +33,14 @@ #include <comphelper/string.hxx> #include <editeng/paperinf.hxx> #include <svtools/filter.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <editeng/fontitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> #include <editeng/crsditem.hxx> -#ifndef _SVX_CNTRITEM_HXX //autogen #include <editeng/cntritem.hxx> -#endif #include <editeng/cmapitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/udlnitem.hxx> @@ -52,9 +48,7 @@ #include <editeng/colritem.hxx> #include <editeng/kernitem.hxx> #include <editeng/escpitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <svl/urihelper.hxx> #include <fmtfsize.hxx> #include <doc.hxx> @@ -73,9 +67,7 @@ #include <docsh.hxx> #include <swerror.h> #include <mdiexp.hxx> -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #if OSL_DEBUG_LEVEL > 1 #include <stdio.h> #endif diff --git a/sw/source/filter/ww1/w1par.cxx b/sw/source/filter/ww1/w1par.cxx index 94029769ed..cbfd80bdb0 100644 --- a/sw/source/filter/ww1/w1par.cxx +++ b/sw/source/filter/ww1/w1par.cxx @@ -34,14 +34,10 @@ #include <ndtxt.hxx> // class SwTxtNode #include <fltini.hxx> // Ww1Reader #include <w1par.hxx> -#ifndef _SWFLTOPT_HXX #include <swfltopt.hxx> -#endif #include <mdiexp.hxx> // StatLine...() #include <swerror.h> // ERR_WW1_... -#ifndef _STATSTR_HRC #include <statstr.hrc> // ResId fuer Statusleiste -#endif //---------------------------------------- // Initialisieren der Feld-FilterFlags diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index e0a73cae15..8bd6980539 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -61,9 +61,7 @@ #include "fmtornt.hxx" #include "fmtfsize.hxx" -#ifndef _FMTLSPLT_HXX #include "fmtlsplt.hxx" -#endif #include "xmlithlp.hxx" #include "fmtrowsplt.hxx" diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 0e4617e3b7..c31ccac0c3 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -53,9 +53,7 @@ #include "fmtornt.hxx" #include "fmtfsize.hxx" -#ifndef _FMTLSPLT_HXX #include "fmtlsplt.hxx" -#endif #include <xmloff/prhdlfac.hxx> #include <xmloff/xmltypes.hxx> #include "xmlithlp.hxx" diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 251b32a0d9..d4bf6d41c5 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -38,9 +38,7 @@ #include "xmlitem.hxx" #include <xmloff/i18nmap.hxx> #include <xmloff/xmluconv.hxx> -#ifndef _XMLOFF_FAMILIES_HXX #include <xmloff/families.hxx> -#endif #include <svx/unomid.hxx> #include <editeng/boxitem.hxx> #include <editeng/fontitem.hxx> @@ -55,9 +53,7 @@ #include "xmlbrshi.hxx" #include <paratr.hxx> #include <doc.hxx> -#ifndef _UNOMID_H #include <unomid.h> -#endif #include "xmlimp.hxx" using ::rtl::OUString; diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx index e82ef86449..cdee3a4a45 100644 --- a/sw/source/filter/xml/xmlitemm.cxx +++ b/sw/source/filter/xml/xmlitemm.cxx @@ -36,9 +36,7 @@ #include "xmlitmap.hxx" #include <xmloff/xmltoken.hxx> -#ifndef _UNOMID_H #include <unomid.h> -#endif using namespace ::xmloff::token; diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index c7009c43dd..7b9f616308 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -42,9 +42,7 @@ #include "fmtornt.hxx" #include "fmtfsize.hxx" -#ifndef _FMTLSPLT_HXX #include "fmtlsplt.hxx" -#endif #include <xmloff/xmluconv.hxx> using ::rtl::OUString; diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index 740916dbda..b542b5699b 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -33,9 +33,7 @@ #include <hintids.hxx> #include <xmloff/xmlnmspe.hxx> -#ifndef _XMLOFF_XMLMETAI_HXX #include <xmloff/xmlscripti.hxx> -#endif #include "xmlimp.hxx" #include "xmlexp.hxx" diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 6482238cdd..0fbe7fb6d7 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -75,15 +75,9 @@ #include <crsskip.hxx> #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _APP_HRC #include <app.hrc> -#endif -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include "swabstdlg.hxx" #include "envelp.hrc" #include "envimg.hxx" diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index acc402669f..21383ac6e3 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -71,9 +71,7 @@ #include <srcview.hxx> #include <wrtsh.hxx> #include <docsh.hxx> -#ifndef _CMDID_H #include <cmdid.h> // Funktion-Ids -#endif #include <initui.hxx> #include <uitool.hxx> #include <swmodule.hxx> @@ -87,9 +85,7 @@ #include <prtopt.hxx> #include <modcfg.hxx> #include <globals.h> // globale Konstanten z.B. -#ifndef _APP_HRC #include <app.hrc> -#endif #include <fontcfg.hxx> #include <barcfg.hxx> #include <uinums.hxx> diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index e597547d89..fe67cb8ab9 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -78,12 +78,8 @@ #include <pagedesc.hxx> #include <poolfmt.hxx> -#ifndef _APP_HRC #include <app.hrc> -#endif -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include "swabstdlg.hxx" #include "envelp.hrc" #include <misc.hrc> diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index 25c62db39f..688d84a0e3 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -28,18 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <hintids.hxx> -#ifndef _CMDID_H #include <cmdid.h> // Funktion-Ids -#endif #include <com/sun/star/i18n/ScriptType.hpp> #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/eitem.hxx> #include <sfx2/request.hxx> #include <sfx2/app.hxx> @@ -47,9 +43,7 @@ #include <svx/htmlmode.hxx> #include <sfx2/bindings.hxx> #include <editeng/brshitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <svx/optgrid.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> @@ -59,37 +53,25 @@ #include <optcomp.hxx> #include <edtwin.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <uitool.hxx> #include <initui.hxx> // fuer ::GetGlossaries() #include <fldbas.hxx> //fuer UpdateFields -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <cfgitems.hxx> #include <prtopt.hxx> -#ifndef _PVIEW_HXX #include <pview.hxx> -#endif #include <usrpref.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include <glosdoc.hxx> #include <uiitems.hxx> #include <editeng/langitem.hxx> #include <unotools/lingucfg.hxx> #include <editeng/unolingu.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <globals.h> // globale Konstanten z.B. #include <svl/slstitm.hxx> #include "swabstdlg.hxx" diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 612eff9aa6..11c350da84 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -44,9 +44,7 @@ #include <svl/zformat.hxx> #include <unotools/pathoptions.hxx> #include <svtools/transfer.hxx> -#ifndef _SFXSIDS_HRC //autogen #include <sfx2/dialogs.hrc> -#endif #include <sfx2/dinfdlg.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> @@ -57,9 +55,7 @@ #include <svtools/sfxecode.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <svx/drawitem.hxx> #include <editeng/svxacorr.hxx> #include <editeng/langitem.hxx> @@ -103,15 +99,9 @@ #include <cmdid.h> #include <globals.h> #include <helpid.h> -#ifndef _APP_HRC #include <app.hrc> -#endif -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx index fcca30ab44..12aa5a9e84 100644 --- a/sw/source/ui/app/docshdrw.cxx +++ b/sw/source/ui/app/docshdrw.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif @@ -48,9 +46,7 @@ #include <svx/svdoutl.hxx> #include <svx/xtable.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <doc.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx index 052be9d6d8..d917103c7c 100644 --- a/sw/source/ui/app/mainwn.cxx +++ b/sw/source/ui/app/mainwn.cxx @@ -33,13 +33,9 @@ #include <mdiexp.hxx> #include <tools/shl.hxx> #include <tools/string.hxx> -#ifndef _SVARRAY_HXX #include <svl/svstdarr.hxx> -#endif #include <sfx2/progress.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include <docsh.hxx> #include <swmodule.hxx> #include "swtypes.hxx" diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/ui/app/swdll.cxx index c97d18514f..be0f87bdc3 100644 --- a/sw/source/ui/app/swdll.cxx +++ b/sw/source/ui/app/swdll.cxx @@ -32,13 +32,9 @@ #include <svx/svdobj.hxx> #include <rtl/logfile.hxx> -#ifndef _GLOBDOC_HRC #include "globdoc.hrc" -#endif -#ifndef _SWDLL_HXX #include <swdll.hxx> -#endif #include <wdocsh.hxx> #include <globdoc.hxx> #include <initui.hxx> @@ -50,9 +46,7 @@ #include <unotools/moduleoptions.hxx> -#ifndef _FM_FMOBJFAC_HXX #include <svx/fmobjfac.hxx> -#endif #include <svx/svdfield.hxx> #include <svx/objfac3d.hxx> diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 545dea1c5f..b6166929f1 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -30,9 +30,7 @@ #include <hintids.hxx> -#ifndef _SWERROR_H #include <swerror.h> -#endif #include <vcl/wrkwin.hxx> #include <vcl/graph.hxx> #include <svx/galbrws.hxx> @@ -70,24 +68,18 @@ #include <com/sun/star/scanner/XScannerManager.hpp> #include <com/sun/star/container/XSet.hpp> #include <comphelper/processfactory.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <swmodule.hxx> #include <swevent.hxx> #include <swacorr.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <dobjfac.hxx> #include <init.hxx> #include <pview.hxx> #include <wview.hxx> #include <wdocsh.hxx> #include <globdoc.hxx> -#ifndef _SRCVIEW_HXX //autogen #include <srcview.hxx> -#endif #include <glshell.hxx> #include <tabsh.hxx> #include <listsh.hxx> @@ -100,21 +92,11 @@ #include <beziersh.hxx> #include <wtextsh.hxx> #include <wfrmsh.hxx> -#ifndef _DRFORMSH_HXX #include <drformsh.hxx> -#endif -#ifndef _WGRFSH_HXX #include <wgrfsh.hxx> -#endif -#ifndef _WOLESH_HXX #include <wolesh.hxx> -#endif -#ifndef _WLISTSH_HXX #include <wlistsh.hxx> -#endif -#ifndef _WTABSH_HXX #include <wtabsh.hxx> -#endif #include <navipi.hxx> #include <chartins.hxx> #include <inputwin.hxx> @@ -130,12 +112,8 @@ #include <workctrl.hxx> #include <tbxanchr.hxx> #include <fldwrap.hxx> -#ifndef _REDLNDLG_HXX #include <redlndlg.hxx> -#endif -#ifndef _SYNCBTN_HXX #include <syncbtn.hxx> -#endif #include <mailmergechildwindow.hxx> #include <modcfg.hxx> #include <fontcfg.hxx> @@ -145,18 +123,14 @@ #include <swatrset.hxx> #include <idxmrk.hxx> #include <dlelstnr.hxx> -#ifndef _BARCFG_HXX #include <barcfg.hxx> -#endif #include <svx/rubydialog.hxx> #include <svtools/colorcfg.hxx> #include <editeng/acorrcfg.hxx> #include <unotools/moduleoptions.hxx> -#ifndef _AVMEDIA_MEDIAPPLAYER_HXX #include <avmedia/mediaplayer.hxx> -#endif #include <avmedia/mediatoolbox.hxx> #include <annotsh.hxx> diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/ui/cctrl/popbox.cxx index 2d4ff3cfc3..5a70bd9d43 100644 --- a/sw/source/ui/cctrl/popbox.cxx +++ b/sw/source/ui/cctrl/popbox.cxx @@ -30,9 +30,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <popbox.hxx> #include <navipi.hxx> diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index fbc2e0cd8c..49fa879285 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -35,33 +35,21 @@ #include <sfx2/request.hxx> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <uitool.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <break.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> -#ifndef _BREAK_HRC #include <break.hrc> -#endif -#ifndef _CHRDLG_HRC #include <chrdlg.hrc> -#endif #include <SwStyleNameMapper.hxx> void SwBreakDlg::Apply() diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 907db6eacf..66d766189b 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -35,48 +35,30 @@ #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/urihelper.hxx> #include <svl/stritem.hxx> #include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> #include <svl/cjkoptions.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #include <swtypes.hxx> #include <errhdl.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <uitool.hxx> #include <fmtinfmt.hxx> #include <macassgn.hxx> -#ifndef _CHRDLG_HXX #include <chrdlg.hxx> // der Dialog -#endif #include <swmodule.hxx> #include <poolfmt.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _CHRDLG_HRC #include <chrdlg.hrc> -#endif -#ifndef _CHARDLG_HRC #include <chardlg.hrc> -#endif #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index d05fe5976e..f9560553d9 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -45,9 +45,7 @@ #include "globals.hrc" -#ifndef _METRIC_HXX //autogen #include <vcl/metric.hxx> -#endif #include <svl/stritem.hxx> #include <editeng/fontitem.hxx> #include <svx/htmlmode.hxx> diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 3742fd242c..46cf8c95e3 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -41,9 +41,7 @@ #include "helpid.h" #include <sfx2/objsh.hxx> #include <svx/htmlmode.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 96a10fd0f8..050c2f9428 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -35,16 +35,12 @@ -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svx/numinf.hxx> #include <swtypes.hxx> #include <tblnumfm.hxx> -#ifndef _CHRDLG_HRC #include <chrdlg.hrc> -#endif #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx index 352819a184..ee7eb25130 100644 --- a/sw/source/ui/config/cfgitems.cxx +++ b/sw/source/ui/config/cfgitems.cxx @@ -29,13 +29,9 @@ #include "precompiled_sw.hxx" -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <editeng/svxenum.hxx> diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index e8752bd08f..3132929d9e 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -40,9 +40,7 @@ #include <svtools/headbar.hxx> #include <mmconfigitem.hxx> #include <mailmergehelper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include "com/sun/star/mail/MailServiceType.hpp" diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index 1143d433c8..ca921f6e74 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -34,18 +34,14 @@ #include <tools/stream.hxx> #include <vcl/svapp.hxx> #include <svl/mailenum.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <editeng/svxenum.hxx> #include <tools/debug.hxx> #include <tools/globname.hxx> #include <swtypes.hxx> #include <itabenum.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include <fldupde.hxx> #include <unotools/syslocaleoptions.hxx> #include <caption.hxx> diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 53603031e1..5d27c85270 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -43,9 +43,7 @@ #include "optcomp.hrc" #include "globals.hrc" #include <tools/urlobj.hxx> -#ifndef _UTL__HXX_ #include <unotools/configmgr.hxx> -#endif #include <vcl/msgbox.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 8fe85c4cca..c3eaeca346 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -34,13 +34,9 @@ #include <tools/shl.hxx> #include <swtypes.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif #include <uiitems.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include "swmodule.hxx" #include "usrpref.hxx" #include "wrtsh.hxx" @@ -65,9 +61,7 @@ #include <sot/clsids.hxx> #include <unotools/configmgr.hxx> #include <docsh.hxx> -#ifndef _CONFIG_HRC #include <config.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <numrule.hxx> #include <SwNodeNum.hxx> @@ -77,9 +71,7 @@ using namespace ::com::sun::star; -#ifndef _SFXENUMITEM_HXX //autogen #include <svl/eitem.hxx> -#endif /* -----------------22.10.98 15:12------------------- * diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index de4f359c25..03e2f64914 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -33,9 +33,7 @@ #include <hintids.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <vcl/svapp.hxx> #ifndef _SVSTDARR_HXX #define _SVSTDARR_STRINGSDTOR @@ -55,15 +53,9 @@ #include <fmtcol.hxx> #include <charatr.hxx> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <swmodule.hxx> #include <wrtsh.hxx> #include <uitool.hxx> @@ -73,26 +65,14 @@ #include <initui.hxx> #include <optpage.hxx> #include <swprtopt.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif -#ifndef _SRCVIEW_HXX #include <srcview.hxx> -#endif #include <crstate.hxx> #include <viewopt.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _CONFIG_HRC #include <config.hrc> -#endif -#ifndef _REDLOPT_HRC #include <redlopt.hrc> -#endif -#ifndef _OPTDLG_HRC #include <optdlg.hrc> -#endif #include <svx/strarray.hxx> #include <svl/slstitm.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 6960e56ceb..4470d78ca4 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -32,25 +32,17 @@ #include <svx/htmlmode.hxx> #include <svtools/htmlcfg.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <editeng/svxenum.hxx> #include <editeng/svxacorr.hxx> #include <unotools/localedatawrapper.hxx> -#ifndef _REGION_HXX //autogen #include <vcl/region.hxx> -#endif -#ifndef _OUTDEV_HXX //autogen #include <vcl/outdev.hxx> -#endif #include <vcl/window.hxx> #include <swmodule.hxx> #include <swtypes.hxx> #include <viewopt.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <swrect.hxx> #include <crstate.hxx> #include <svtools/colorcfg.hxx> diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index c543cf702c..f8c4a0bf46 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -37,9 +37,7 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <mmaddressblockpage.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <dbconfig.hxx> #include <unotools/tempfile.hxx> #include <vcl/msgbox.hxx> @@ -55,9 +53,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSERFACTORY_HPP_ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> -#endif #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 2d0c1d0a00..a71ebef8b8 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -36,9 +36,7 @@ #include <mmconfigitem.hxx> #include <vcl/scrbar.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index 53b55be334..bcb9757b5d 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -39,9 +39,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <dbui.hrc> #include <dbtablepreviewdialog.hrc> diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 4b31760592..86a0aa9853 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -48,24 +48,16 @@ #include <cppuhelper/implbase1.hxx> #include <svx/dbaexchange.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <dbtree.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index d9a56fa166..67e9181d1a 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -31,9 +31,7 @@ #include <mailmergehelper.hxx> #include <svtools/stdctrl.hxx> #include <mmconfigitem.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> @@ -47,9 +45,7 @@ #include "com/sun/star/mail/XSmtpService.hpp" #include <comphelper/processfactory.hxx> #include <vcl/msgbox.hxx> -#ifndef _PASSWD_HXX #include <sfx2/passwd.hxx> -#endif #include <dbui.hrc> diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 4a412991e0..61e124e1dc 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -43,13 +43,9 @@ #include <mmlayoutpage.hxx> #include <mmconfigitem.hxx> #include <swabstdlg.hxx> -#ifndef _DBUI_HRC #include <dbui.hrc> -#endif #include <view.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <sfx2/viewfrm.hxx> #include <wrtsh.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx index 09c4b01d63..86d4fba963 100644 --- a/sw/source/ui/dbui/mmconfigitem.cxx +++ b/sw/source/ui/dbui/mmconfigitem.cxx @@ -47,12 +47,8 @@ #include <unotools/configitem.hxx> #include <mailmergehelper.hxx> #include <swunohelper.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <dbui.hrc> #include <vector> diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 7427bfc687..cff7d373e7 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -40,9 +40,7 @@ #include <sfx2/docfac.hxx> #include <vcl/msgbox.hxx> #include <view.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <mmdocselectpage.hxx> #include <mailmergewizard.hxx> #include <shellio.hxx> diff --git a/sw/source/ui/dbui/mmmergepage.cxx b/sw/source/ui/dbui/mmmergepage.cxx index a73a93114d..1131556480 100644 --- a/sw/source/ui/dbui/mmmergepage.cxx +++ b/sw/source/ui/dbui/mmmergepage.cxx @@ -34,9 +34,7 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <dbui.hrc> #include <mmmergepage.hrc> #include <svl/srchitem.hxx> diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 9ede2af8a0..8ef3715261 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -37,16 +37,10 @@ #include <mailconfigpage.hxx> #include <cmdid.h> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <hintids.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/langitem.hxx> @@ -66,9 +60,7 @@ //#endif #include <tools/urlobj.hxx> #include <svl/urihelper.hxx> -#ifndef _VCL_PRINT_HXX #include <vcl/print.hxx> -#endif #include <unotools/tempfile.hxx> #include <osl/file.hxx> #include <mmgreetingspage.hxx> @@ -81,9 +73,7 @@ //#ifndef _BASEDLGS_HXX //#include <sfx2/basedlgs.hxx> //#endif -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <swunohelper.hxx> #include <vos/mutex.hxx> #include <shellio.hxx> diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 3885286239..2d98b7f7c2 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -37,9 +37,7 @@ #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> #include <vcl/msgbox.hxx> -#ifndef _DBUI_HRC #include <dbui.hrc> -#endif #include <swtypes.hxx> #include <mmoutputtypepage.hrc> #include <dbui.hrc> diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx index 5fe51c094e..84d7175210 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.cxx +++ b/sw/source/ui/dbui/mmpreparemergepage.cxx @@ -34,16 +34,10 @@ #include <mmpreparemergepage.hxx> #include <mailmergewizard.hxx> #include <mmconfigitem.hxx> -#ifndef _DBUI_HRC #include <dbui.hrc> -#endif #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <wrtsh.hxx> #include <svx/dataaccessdescriptor.hxx> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 60b930162d..b00a43887f 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -51,12 +51,8 @@ #include <doc.hxx> #include <errhdl.hxx> -#ifndef _DIALOG_HRC #include <dialog.hrc> -#endif -#ifndef _ASCFLDLG_HRC #include <ascfldlg.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index b96fa4f1ee..977a08b614 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -36,32 +36,20 @@ #include <ctype.h> #include <swwait.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _PVIEW_HXX #include <pview.hxx> -#endif #include <doc.hxx> #include <docstdlg.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif // fuer Statistikfelder #include <fldmgr.hxx> #include <fldbas.hxx> -#ifndef _DOCSTDLG_HRC #include <docstdlg.hrc> -#endif /*-------------------------------------------------------------------- diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index ef83dba1a3..9bbe10d819 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -38,9 +38,7 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> #include <svx/htmlmode.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 9af9dfbd0b..a2b7a5f3c3 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -34,9 +34,7 @@ #include "swdlgfact.hxx" #include <svl/style.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include "dialog.hrc" #include "misc.hrc" #include "chrdlg.hrc" diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index c19fb0bd9d..acfe918bb9 100644 --- a/sw/source/ui/dochdl/gloshdl.cxx +++ b/sw/source/ui/dochdl/gloshdl.cxx @@ -35,12 +35,8 @@ #ifndef __RSC //autogen #include <tools/errinf.hxx> #endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/macitem.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> @@ -63,21 +59,13 @@ #include <initui.hxx> // fuer ::GetGlossaries() #include <gloslst.hxx> #include <swdtflvr.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <crsskip.hxx> -#ifndef _DOCHDL_HRC #include <dochdl.hrc> -#endif -#ifndef _SWERROR_H #include <swerror.h> -#endif #include <frmmgr.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <editeng/acorrcfg.hxx> #include "swabstdlg.hxx" diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx index 8174d81b65..f76f95dbb0 100644 --- a/sw/source/ui/docvw/edtdd.cxx +++ b/sw/source/ui/docvw/edtdd.cxx @@ -47,15 +47,11 @@ #include <frmfmt.hxx> #include <wrtsh.hxx> #include <edtwin.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <swdtflvr.hxx> #include <swmodule.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wdocsh.hxx> #include <swundo.hxx> diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 9ab1e772a2..17db7ee752 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -120,9 +120,7 @@ #include <helpid.h> #include <cmdid.h> -#ifndef _DOCVW_HRC #include <docvw.hrc> -#endif #include <uitool.hxx> // OD 18.09.2003 #i18732# #include <fmtfollowtextflow.hxx> diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 2ea48e2a7e..59a235fc28 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -30,18 +30,12 @@ #include <hintids.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <svtools/textview.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <svtools/htmltokn.h> @@ -53,15 +47,9 @@ #include <svtools/ctrltool.hxx> #include <tools/time.hxx> #include <swmodule.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _SRCVIEW_HXX #include <srcview.hxx> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif struct SwTextPortion diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 74484eb204..d723b10ece 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -43,44 +43,28 @@ #define _SVSTDARR_LONGS #include <svl/svstdarr.hxx> #include <editeng/paperinf.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/lrspitem.hxx> #include <editeng/brshitem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <frmatr.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <drpcps.hxx> #include <envfmt.hxx> #include <fmtcol.hxx> -#ifndef _PARDLG_HXX #include "swuipardlg.hxx" -#endif #include <pattern.hxx> #include <poolfmt.hxx> #include <uiborder.hxx> #include <uitool.hxx> -#ifndef _ENVFMT_HRC #include <envfmt.hrc> -#endif #include "swabstdlg.hxx" #include "chrdlg.hrc" diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 46b56f7f5a..118e31d5f3 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -42,12 +42,8 @@ #include <swtypes.hxx> #include <envimg.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _ENVELP_HRC #include <envelp.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 05c2cf90be..7e90180a70 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -42,22 +42,12 @@ #include <labfmt.hxx> #include <labprt.hxx> #include <unotools.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include "uitool.hxx" -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _LABEL_HRC #include <label.hrc> -#endif //impl in envimg.cxx extern SW_DLLPUBLIC String MakeSender(); diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index 2b436c9e7b..d70c04fcdd 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -30,9 +30,7 @@ #include <tools/stream.hxx> -#ifndef _RESID_HXX //autogen #include <tools/resid.hxx> -#endif #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <unotools/useroptions.hxx> diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 59b4d9684c..7288ca5b7e 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -40,16 +40,10 @@ #include <label.hxx> #include <labprt.hxx> #include <labimg.hxx> -#ifndef _LABIMP_HXX #include "swuilabimp.hxx" -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _LABPRT_HRC #include <labprt.hrc> -#endif // -------------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index a32e6634b2..90859b3950 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -36,17 +36,11 @@ #include <wrtsh.hxx> #include <fldbas.hxx> #include <fldmgr.hxx> -#ifndef _MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif #include <DropDownFieldDialog.hxx> #include <flddropdown.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _SW_DROPDOWNFIELDDIALOG_HRC #include <DropDownFieldDialog.hrc> -#endif using namespace ::com::sun::star; diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index bd35309e68..ea1eebf076 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -37,22 +37,16 @@ #define _CHANGEDB_CXX #include <svtools/stdctrl.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdb/XDatabaseAccess.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <fldmgr.hxx> #include <expfld.hxx> #include <txtatr.hxx> @@ -61,15 +55,9 @@ #include <dbfld.hxx> #include <changedb.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _CHANGEDB_HRC #include <changedb.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 274bbdf12f..7f4d454564 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -33,32 +33,18 @@ #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <dbfld.hxx> -#ifndef _FLDTDLG_HXX #include <fldtdlg.hxx> -#endif #include <numrule.hxx> -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDDB_HXX #include <flddb.hxx> -#endif #include <dbconfig.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index dabb6b91e5..fa3153badf 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -47,16 +47,10 @@ #include <fldui.hrc> -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _FLDDINF_HXX #include <flddinf.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 9437b1d514..0c7642b22c 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -35,23 +35,13 @@ #include <vcl/svapp.hxx> #include <flddat.hxx> #include <docufld.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <chpfld.hxx> -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDDOK_HXX #include <flddok.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <svl/zformat.hxx> diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 76f0fbcfc7..26be73290e 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -37,45 +37,23 @@ #include <sfx2/app.hxx> #include <svx/optgenrl.hxx> #include <docufld.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <dbfld.hxx> #include <wrtsh.hxx> -#ifndef _FLDDB_HXX #include <flddb.hxx> -#endif -#ifndef _FLDDINF_HXX #include <flddinf.hxx> -#endif -#ifndef _FLDVAR_HXX #include <fldvar.hxx> -#endif -#ifndef _FLDDOK_HXX #include <flddok.hxx> -#endif -#ifndef _FLDFUNC_HXX #include <fldfunc.hxx> -#endif -#ifndef _FLDREF_HXX #include <fldref.hxx> -#endif #include <fldedt.hxx> #include <crsskip.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif #include "swabstdlg.hxx" #include "dialog.hrc" diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 21b8e84cc7..523bd92c20 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -37,26 +37,16 @@ #include <basic/sbmod.hxx> #include <docsh.hxx> #include <swtypes.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <fldbas.hxx> #include <docufld.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> -#ifndef _FLDFUNC_HXX #include <fldfunc.hxx> -#endif #include <flddropdown.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 10ee25b477..3d75e1e073 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -39,21 +39,13 @@ #include <IMark.hxx> #include <expfld.hxx> #include <swmodule.hxx> -#ifndef _FLDREF_HXX #include <fldref.hxx> -#endif #include <reffld.hxx> #include <wrtsh.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif // --> OD 2007-11-14 #i83479# #include <SwNodeNum.hxx> #include <IDocumentMarkAccess.hxx> diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 7aa6cb0ad7..1bd5c39949 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -34,9 +34,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <unotools/confignode.hxx> #include <comphelper/processfactory.hxx> diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index c3a2f6dd47..200da2c5ae 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -38,27 +38,17 @@ #include <docufld.hxx> #include <expfld.hxx> #include <ddefld.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <doc.hxx> #include <docary.hxx> #include <swmodule.hxx> -#ifndef _FLDVAR_HXX #include <fldvar.hxx> -#endif #include <calc.hxx> #include <svl/zformat.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index 30d56623d8..8caba92ff1 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -30,35 +30,23 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/dispatch.hxx> #include <vcl/msgbox.hxx> #include <svx/htmlmode.hxx> #include <viewopt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <fldwrap.hxx> #include <wrtsh.hxx> #include <view.hxx> #include <swmodule.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FLDTDLG_HRC #include <fldtdlg.hrc> -#endif #include "swabstdlg.hxx" SFX_IMPL_CHILDWINDOW(SwFldDlgWrapper, FN_INSERT_FIELD) diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index 002b312af8..e834ef6cc9 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -36,9 +36,7 @@ #define _INPDLG_CXX -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> #include <wrtsh.hxx> @@ -48,12 +46,8 @@ #include <inpdlg.hxx> #include <fldmgr.hxx> -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _INPDLG_HRC #include <inpdlg.hrc> -#endif /*-------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 3d24c5d095..d21e38c286 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -39,14 +39,10 @@ #define _JAVAEDIT_CXX #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/urihelper.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <sfx2/docfile.hxx> #include <sfx2/filedlghelper.hxx> #include <docsh.hxx> @@ -55,16 +51,10 @@ #include <fldmgr.hxx> #include <docufld.hxx> #include <uitool.hxx> -#ifndef _JAVAEDIT_HXX #include <javaedit.hxx> -#endif -#ifndef _FLDUI_HRC #include <fldui.hrc> -#endif -#ifndef _JAVAEDIT_HRC #include <javaedit.hrc> -#endif // static ---------------------------------------------------------------- diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index b5765c3fb3..2ebd32490a 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -40,13 +40,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/processfactory.hxx> #include <fldmgr.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <wrtsh.hxx> // Actives Fenster -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 644565b9bb..851cb5cb6c 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -52,18 +52,12 @@ #include <swmodule.hxx> #include <errhdl.hxx> // fuer Create-Methoden #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wdocsh.hxx> #include <viewopt.hxx> #include <pgfnote.hxx> -#ifndef _PGFGRID_HXX #include <pggrid.hxx> -#endif -#ifndef _TMPDLG_HXX #include <tmpdlg.hxx> // der Dialog -#endif #include <column.hxx> // Spalten #include <drpcps.hxx> // Initialen #include <frmpage.hxx> // Rahmen @@ -78,18 +72,10 @@ #include <uitool.hxx> #include <shellres.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _FMTUI_HRC #include <fmtui.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svl/stritem.hxx> diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 158f5e34df..cdec741e70 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -33,9 +33,7 @@ -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <cption.hxx> #include <fldmgr.hxx> @@ -61,12 +59,8 @@ #include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextFrame.hpp> -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif -#ifndef _CPTION_HRC #include <cption.hrc> -#endif #include <SwStyleNameMapper.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 413845f1eb..1f422cfe26 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -39,9 +39,7 @@ #include <svx/htmlmode.hxx> #include <fmtfsize.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <docsh.hxx> #include <viewopt.hxx> #include <frmdlg.hxx> @@ -50,12 +48,8 @@ #include <column.hxx> #include <macassgn.hxx> -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <svx/svxids.hrc> #include <svx/flagsdef.hxx> #include <svx/svxdlg.hxx> diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 6eb78b7da8..45cb220ff3 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -52,9 +52,7 @@ #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <cnttab.hxx> #include <poolfmt.hxx> #include <unoprnms.hxx> @@ -63,21 +61,11 @@ #include <docsh.hxx> #include <swmodule.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _CNTTAB_HRC #include <cnttab.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <swuicnttab.hxx> #include <unomid.h> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3ede701ab6..20342d28f0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -57,20 +57,14 @@ #include <authfld.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <outline.hxx> #include <cnttab.hxx> #include <swuicnttab.hxx> #include <formedt.hxx> #include <poolfmt.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <uitool.hxx> #include <fmtcol.hxx> #include <fldbas.hxx> @@ -81,34 +75,18 @@ #include <swmodule.hxx> #include <modcfg.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _CNTTAB_HRC #include <cnttab.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> -#ifndef _TOXHLP_HXX #include <toxwrap.hxx> -#endif #include <chpfld.hxx> -#ifndef _UTLUI_HRC #include "utlui.hrc" -#endif #include <sfx2/app.hxx> diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx index 7d3e1694eb..b41346a6f9 100644 --- a/sw/source/ui/index/idxmrk.cxx +++ b/sw/source/ui/index/idxmrk.cxx @@ -30,9 +30,7 @@ #include <hintids.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif #define _SVSTDARR_STRINGSSORT #include <svl/svstdarr.hxx> #include <comphelper/processfactory.hxx> @@ -43,9 +41,7 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/dispatch.hxx> #include <svl/eitem.hxx> #include <svtools/txtcmp.hxx> @@ -56,20 +52,12 @@ #include <idxmrk.hxx> #include <txttxmrk.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <multmrk.hxx> #include <swundo.hxx> // fuer Undo-Ids -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _IDXMRK_HRC #include <idxmrk.hrc> -#endif #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index be034b3909..e343109a51 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -33,9 +33,7 @@ #include "swuiidxmrk.hxx" #include <hintids.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif #define _SVSTDARR_STRINGSSORT #include <svl/svstdarr.hxx> #include <comphelper/processfactory.hxx> @@ -46,9 +44,7 @@ #include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <svl/stritem.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/dispatch.hxx> #include <svl/eitem.hxx> #include <svtools/txtcmp.hxx> @@ -60,20 +56,12 @@ #include <idxmrk.hxx> #include <txttxmrk.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <multmrk.hxx> #include <swundo.hxx> // fuer Undo-Ids -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _INDEX_HRC #include <index.hrc> -#endif -#ifndef _IDXMRK_HRC #include <idxmrk.hrc> -#endif #include <swmodule.hxx> #include <fldmgr.hxx> #include <fldbas.hxx> diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx index f705dc0d94..84a7135b28 100644 --- a/sw/source/ui/index/toxmgr.cxx +++ b/sw/source/ui/index/toxmgr.cxx @@ -35,9 +35,7 @@ #include <crsskip.hxx> #include <doc.hxx> #include <swundo.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif /*-------------------------------------------------------------------- Beschreibung: Handhabung der Verzeichnisse durch TOXMgr diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 9d7771e11a..e44d77560b 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -33,20 +33,14 @@ #include <hintids.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swundo.hxx> // fuer Undo-Ids -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <splargs.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <editeng/unolingu.hxx> #include <editeng/langitem.hxx> #include <editeng/fontitem.hxx> @@ -69,9 +63,7 @@ #include <breakit.hxx> #include <docsh.hxx> -#ifndef _OLMENU_HRC #include <olmenu.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx index 6e2c555dd3..a6c2e8ec1b 100644 --- a/sw/source/ui/lingu/hyp.cxx +++ b/sw/source/ui/lingu/hyp.cxx @@ -36,9 +36,7 @@ #include "wrtsh.hxx" #include "globals.hrc" #include <vcl/msgbox.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <linguistic/lngprops.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <swwait.hxx> diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index 1173774d5f..ea9bab916f 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -44,13 +44,9 @@ #include <unotools/localedatawrapper.hxx> #include <sdrhhcwrap.hxx> #include <frmfmt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> // " " " -#endif #include <wrtsh.hxx> // MakeVisible -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <dcontact.hxx> // Spelling von DrawObj #include <doc.hxx> // " " " #include <docary.hxx> diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index b6f075b6b4..39a500ccd9 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -36,12 +36,8 @@ #include <svl/style.hxx> #include <errhdl.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <docfnote.hxx> #include <impfnote.hxx> #include <ftninfo.hxx> @@ -53,18 +49,10 @@ #include <uitool.hxx> #include <poolfmt.hxx> #include <swstyle.h> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _DOCFNOTE_HRC #include <docfnote.hrc> -#endif -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif #include <SwStyleNameMapper.hxx> SwFootNoteOptionDlg::SwFootNoteOptionDlg( Window *pParent, SwWrtShell &rS ) : diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 5374ddd2e2..d68831df61 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -36,9 +36,7 @@ #define _SVSTDARR_STRINGS #include <tools/urlobj.hxx> #include <tools/stream.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/help.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/tempfile.hxx> @@ -53,15 +51,9 @@ #include <glosdoc.hxx> #include <swunohelper.hxx> -#ifndef _GLOSBIB_HRC #include <glosbib.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #define PATH_CASE_SENSITIVE 0x01 diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 8c13ab80fd..508b4b2909 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -42,9 +42,7 @@ #endif #include <tools/debug.hxx> #include <svl/urihelper.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <unotools/pathoptions.hxx> #include <unotools/tempfile.hxx> #include <swtypes.hxx> @@ -56,9 +54,7 @@ #include <unoatxt.hxx> #include <swerror.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index faec81b639..e84f608859 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -39,9 +39,7 @@ #include <vcl/menu.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> -#ifndef _SVSTDARR_HXX #include <svl/svstdarr.hxx> -#endif #include <svl/stritem.hxx> #include <unotools/pathoptions.hxx> #include <unotools/lingucfg.hxx> @@ -79,15 +77,9 @@ #include <cmdid.h> #include <helpid.h> #include <swerror.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _GLOSSARY_HRC #include <glossary.hrc> -#endif #include <swmodule.hxx> #include <sfx2/filedlghelper.hxx> diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index d25c570ed0..261b8344f2 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -52,15 +52,9 @@ #include <glosdoc.hxx> #include <shellio.hxx> #include <initui.hxx> // fuer ::GetGlossaries() -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _SWERROR_H #include <swerror.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif #define SwWebGlosDocShell diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index c508f83dd2..6c83714779 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -36,9 +36,7 @@ #include "hintids.hxx" #include <svx/gallery.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <editeng/brshitem.hxx> #include <svl/urihelper.hxx> #include <vcl/graph.hxx> diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 2e9e318c76..6efca33ca1 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -37,9 +37,7 @@ #define _NUM_CXX #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <tools/urlobj.hxx> #include <sfx2/app.hxx> #include <sfx2/imgmgr.hxx> @@ -50,16 +48,10 @@ #include <swvset.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <uitool.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <uiitems.hxx> #include <docstyle.hxx> #include <charfmt.hxx> @@ -71,21 +63,11 @@ #include <viewopt.hxx> #include <frmmgr.hxx> -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _FRMUI_HRC #include <frmui.hrc> -#endif -#ifndef _NUM_HRC #include <num.hrc> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #include <SwStyleNameMapper.hxx> #include <svx/svxids.hrc> #include <svx/dialogs.hrc> diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index 86e4f12ed5..640aa24ec0 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -28,9 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" #include <numberingtypelistbox.hxx> -#ifndef _MISC_HRC #include <misc.hrc> -#endif #include <cnttab.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/text/XDefaultNumberingProvider.hpp> diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index d0bc7b5b38..c04e8d4e7f 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -32,12 +32,8 @@ #endif #include <hintids.hxx> #include <tools/shl.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/tabdlg.hxx> #include <editeng/brshitem.hxx> #include <unotools/configmgr.hxx> @@ -47,12 +43,8 @@ #define USE_NUMTABPAGES #include <num.hxx> #endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <uitool.hxx> #include <errhdl.hxx> #include <wrtsh.hxx> @@ -67,18 +59,10 @@ #include <docstyle.hxx> #include <viewopt.hxx> #include <svtools/ctrlbox.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> // fuer Vorlagenname 'keins' -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _OUTLINE_HRC #include <outline.hrc> -#endif #include <paratr.hxx> #include <unomid.h> diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index a8c75455c4..f945658a91 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -34,14 +34,10 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <tools/ref.hxx> -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include <vcl/field.hxx> #include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> @@ -55,15 +51,9 @@ #include <pgfnote.hxx> #include <uiitems.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _PGFNOTE_HRC #include <pgfnote.hrc> -#endif #define TWIP_TO_LBOX 5 /*-----------------------------------------------------#--------------- diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 9fa851542c..a440d39110 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -36,14 +36,10 @@ #include <sfx2/app.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <swtypes.hxx> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <svx/xtable.hxx> #include <uitool.hxx> #include <editeng/sizeitem.hxx> diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index e2b7e6a151..b8603367f3 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -37,9 +37,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/viewfrm.hxx> #include <sfx2/dispatch.hxx> @@ -47,9 +45,7 @@ #include <svx/postattr.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> #ifndef _REDLNDLG_HXX #define _REDLNACCEPTDLG @@ -58,21 +54,11 @@ #include <swwait.hxx> #include <uitool.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _REDLNDLG_HRC #include <redlndlg.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif // -> #111827# #include <comcore.hrc> diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index fcac632511..b125584545 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -33,9 +33,7 @@ #include "srtdlg.hxx" -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 2e11521aaa..74ba1c8630 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -41,9 +41,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/viewfrm.hxx> #include <sfx2/dispatch.hxx> @@ -51,28 +49,16 @@ #include <svx/postattr.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> #include <swwait.hxx> #include <uitool.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _REDLNDLG_HRC #include <redlndlg.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #include <vector> #ifndef _REDLNDLG_HXX diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx index ca6e437da2..6941ee351e 100644 --- a/sw/source/ui/ribbar/concustomshape.cxx +++ b/sw/source/ui/ribbar/concustomshape.cxx @@ -40,24 +40,16 @@ #include <svx/svdview.hxx> #include <svx/svdocapt.hxx> #include <editeng/outlobj.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <edtwin.hxx> #include <wrtsh.hxx> #include <viewopt.hxx> -#ifndef _DRAWBASE_HXX #include <drawbase.hxx> -#endif #include <concustomshape.hxx> #include <svx/gallery.hxx> #include <sfx2/request.hxx> -#ifndef _FM_FMMODEL_HXX #include <svx/fmmodel.hxx> -#endif #include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx index ba6865e827..8ee73d4998 100644 --- a/sw/source/ui/ribbar/tbxanchr.cxx +++ b/sw/source/ui/ribbar/tbxanchr.cxx @@ -36,9 +36,7 @@ #include <svx/htmlmode.hxx> #include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif #include <sfx2/mnumgr.hxx> diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index bb69819b8d..694d47cc24 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -35,31 +35,19 @@ #include <svx/htmlmode.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> -#ifndef _SFX_IMAGEMGR_HXX #include <sfx2/imagemgr.hxx> -#endif #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <initui.hxx> #include <viewopt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <gloshdl.hxx> #include <glosdoc.hxx> #include <gloslst.hxx> #include <workctrl.hxx> -#ifndef _WORKCTRL_HRC #include <workctrl.hrc> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif #include <wrtsh.hxx> #include <svl/imageitm.hxx> #include <vcl/lstbox.hxx> diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 025403cc08..4dbee8ecf2 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -32,9 +32,7 @@ #include <svl/urihelper.hxx> #include <svl/languageoptions.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <sfx2/linkmgr.hxx> #include <svx/htmlmode.hxx> #include <svx/imapdlg.hxx> @@ -97,15 +95,9 @@ #include <caption.hxx> #include <swwait.hxx> #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _STATSTR_HRC #include <statstr.hrc> -#endif #include <globals.h> #include <unotxdoc.hxx> #include <crsskip.hxx> @@ -121,9 +113,7 @@ #include <svx/fmshell.hxx> // for FN_XFORMS_DESIGN_MODE #include <SwRewriter.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index fad82ace6f..103655d901 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.cxx @@ -32,12 +32,8 @@ -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdview.hxx> diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 812b29b763..f7ddf8860f 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -67,19 +67,13 @@ #include <cmdid.h> #include <helpid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #define SwDrawTextShell #include <sfx2/msg.hxx> #include <swslots.hxx> -#ifndef _POPUP_HRC #include <popup.hrc> -#endif #include <uitool.hxx> #include <wview.hxx> #include <swmodule.hxx> diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 1ba55d45dd..4a8126f62f 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -31,9 +31,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index ec0cd2a6c2..db2bd0e347 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -34,42 +34,28 @@ #include <wrtsh.hxx> #include <view.hxx> #include <docary.hxx> -#ifndef _TEXTSH_HXX #include <textsh.hxx> -#endif #include <viewopt.hxx> #include <swundo.hxx> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #include <caption.hxx> #define _SVSTDARR_STRINGSSORTDTOR #include <svl/svstdarr.hxx> #include <svtools/filter.hxx> #include <svx/htmlmode.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <frmfmt.hxx> #include <frmmgr.hxx> #include <vcl/msgbox.hxx> -#ifndef _SVX_SVDOMEDIA_HXX #include <svx/svdomedia.hxx> -#endif -#ifndef _SVX_SVDVIEW_HXX #include <svx/svdview.hxx> -#endif -#ifndef _SVX_SVDPAGV_HXX #include <svx/svdpagv.hxx> -#endif #include <SwStyleNameMapper.hxx> #include <sfx2/filedlghelper.hxx> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index d5c3dd3ecd..7e43aea35a 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -31,9 +31,7 @@ -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <hintids.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -71,12 +69,8 @@ #include <usrpref.hxx> #include <edtwin.hxx> #include <swwait.hxx> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif #include <sfx2/objface.hxx> #include <svx/svdomedia.hxx> diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index 537af7b0f2..0001d26f42 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.cxx @@ -35,26 +35,14 @@ #include <sfx2/objitem.hxx> #include <wrtsh.hxx> #include <view.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <frmsh.hxx> -#ifndef _OLESH_HXX #include <olesh.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #define SwOleShell diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 67d842dde1..52fee7cc01 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -52,9 +52,7 @@ #include <editeng/wrlmitem.hxx> #include <editeng/protitem.hxx> #include <editeng/opaqitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/akrnitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/kernitem.hxx> @@ -82,9 +80,7 @@ #include <editeng/udlnitem.hxx> #include <editeng/postitem.hxx> #include <editeng/fhgtitem.hxx> -#ifndef _SVX_CNTRITEM_HXX //autogen #include <editeng/cntritem.hxx> -#endif #include <editeng/colritem.hxx> #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 3c22e8ab6f..61f087bc30 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -96,19 +96,11 @@ */ //!!! -#ifndef _POPUP_HRC #include <popup.hrc> -#endif -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <helpid.h> #include <unobaseclass.hxx> diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index e4d1bc8179..856d5de607 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -42,9 +42,7 @@ #include <swundo.hxx> #include <basesh.hxx> -#ifndef _POOLFMT_HRC #include <poolfmt.hrc> -#endif #include <docsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index e437de58d4..de1c0ec2cb 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -79,9 +79,7 @@ #include <doc.hxx> #include <uitool.hxx> #include <cmdid.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <frmmgr.hxx> #include <textsh.hxx> #include <frmfmt.hxx> @@ -100,12 +98,8 @@ #include <modcfg.hxx> #include <column.hxx> #include <edtwin.hxx> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif #include <swerror.h> #include <SwAppletImpl.hxx> #include <unochart.hxx> @@ -121,9 +115,7 @@ #include <swslots.hxx> #include <SwRewriter.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index e08db985ec..403669a6cf 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -40,9 +40,7 @@ #include <sfx2/event.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/stritem.hxx> #include <svl/itemset.hxx> #include <sfx2/request.hxx> diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 10547000c5..2f449e5773 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -31,9 +31,7 @@ #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/itemiter.hxx> @@ -52,29 +50,19 @@ #include "paratr.hxx" #include <fmtinfmt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <uitool.hxx> -#ifndef _TEXTSH_HXX #include <textsh.hxx> -#endif #include <num.hxx> #include <swundo.hxx> #include <fmtcol.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <globals.h> -#ifndef _SHELLS_HRC #include <shells.hrc> -#endif #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "chrdlg.hrc" diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index cf0a5f99ac..7763b2dd8e 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.cxx @@ -31,32 +31,22 @@ #include <sfx2/request.hxx> #include <svl/eitem.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _TEXTSH_HXX #include <textsh.hxx> -#endif #include <num.hxx> #include <edtwin.hxx> #include <crsskip.hxx> #include <doc.hxx> #include <docsh.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <globals.h> -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <svx/svdouno.hxx> #include <svx/fmshell.hxx> diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 0cdb405df7..3b31e31c0b 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -30,9 +30,7 @@ #include <hintids.hxx> -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <sfx2/request.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx index c27f206d01..bea90d7a51 100644 --- a/sw/source/ui/smartmenu/stmenu.cxx +++ b/sw/source/ui/smartmenu/stmenu.cxx @@ -36,12 +36,8 @@ #include <SwSmartTagMgr.hxx> -#ifndef _STMENU_HRC #include <stmenu.hrc> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <breakit.hxx> #define C2U(cChar) rtl::OUString::createFromAscii(cChar) diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 5649fca2b8..242219c546 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -53,9 +53,7 @@ #include <edtwin.hxx> #include <cmdid.h> -#ifndef _CHARTINS_HRC #include <chartins.hrc> -#endif #include <anchoredobject.hxx> #include <sot/clsids.hxx> diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index a5b4d9cf9c..102f11681a 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -38,27 +38,15 @@ #include <colwd.hxx> #include <tablemgr.hxx> #include <wrtsh.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> -#ifndef _MODCFG_HXX #include <modcfg.hxx> -#endif #include <usrpref.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _COLWD_HRC #include <colwd.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif IMPL_LINK_INLINE_START( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG ) diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 2e96a58846..1efbe1df08 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -35,12 +35,8 @@ #include <swtypes.hxx> #include <mergetbl.hxx> -#ifndef _MERGETBL_HRC #include <mergetbl.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif SwMergeTblDlg::SwMergeTblDlg( Window *pParent, BOOL& rWithPrev ) diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 9bfdbe74e5..ddc84c7f01 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -44,24 +44,14 @@ #include <rowht.hxx> #include <wrtsh.hxx> #include <frmatr.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <swmodule.hxx> #include <usrpref.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _ROWHT_HRC #include <rowht.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx index ae561b2bc5..e7b611a3d7 100644 --- a/sw/source/ui/table/swtablerep.cxx +++ b/sw/source/ui/table/swtablerep.cxx @@ -49,34 +49,22 @@ #include <fmtrowsplt.hxx> #include <svx/htmlmode.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <uitool.hxx> #include <frmatr.hxx> -#ifndef _TABLEPG_HXX #include <tablepg.hxx> -#endif #include <tablemgr.hxx> #include <pagedesc.hxx> #include <poolfmt.hxx> #include <SwStyleNameMapper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _TABLEDLG_HRC #include <tabledlg.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif #include "swtablerep.hxx" #ifdef DEBUG_TBLDLG diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 53eb804c59..e751cc5bba 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -53,35 +53,23 @@ #include <fmtrowsplt.hxx> #include <svx/htmlmode.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <uitool.hxx> #include <frmatr.hxx> #include <tabledlg.hxx> -#ifndef _TABLEPG_HXX #include <tablepg.hxx> -#endif #include <tablemgr.hxx> #include <pagedesc.hxx> #include <uiitems.hxx> #include <poolfmt.hxx> #include <SwStyleNameMapper.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _TABLEDLG_HRC #include <tabledlg.hrc> -#endif -#ifndef _TABLE_HRC #include <table.hrc> -#endif #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index a0a2f1c41e..1b6110371b 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -35,12 +35,8 @@ -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -51,18 +47,12 @@ #include <svx/framelinkarray.hxx> #include "swmodule.hxx" #include "swtypes.hxx" -#ifndef _VIEW_HXX #include "view.hxx" -#endif #include "wrtsh.hxx" #include "tblafmt.hxx" -#ifndef _TAUTOFMT_HXX #include "tautofmt.hxx" -#endif #include "shellres.hxx" -#ifndef _TAUTOFMT_HRC #include "tautofmt.hrc" -#endif using namespace com::sun::star; diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 64ae4a42e4..c2f5e14420 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -32,12 +32,8 @@ #include <hintids.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <format.hxx> #include <charfmt.hxx> #include <fmtcol.hxx> diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 6f10283478..faac70a60c 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -54,9 +54,7 @@ #include <svx/svdview.hxx> #include <svx/dlgutil.hxx> #include <svx/zoomslideritem.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <swwait.hxx> @@ -79,21 +77,11 @@ #include <viewfunc.hxx> -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _POPUP_HRC #include <popup.hrc> -#endif -#ifndef _PVIEW_HRC #include <pview.hrc> -#endif #define SwPagePreView #include <sfx2/msg.hxx> diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx index 996ab9b235..82b4db1cef 100644 --- a/sw/source/ui/uiview/swcli.cxx +++ b/sw/source/ui/uiview/swcli.cxx @@ -32,9 +32,7 @@ #include <wrtsh.hxx> #include <swtypes.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <edtwin.hxx> #include <swcli.hxx> diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index 94ec7895b8..676010f743 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -33,29 +33,19 @@ #include <svx/svdview.hxx> #include <svx/ruler.hxx> #include <idxmrk.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> #include <viewopt.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _GLOBDOC_HXX #include <globdoc.hxx> -#endif #include <navipi.hxx> #include <fldwrap.hxx> -#ifndef _REDLNDLG_HXX #include <redlndlg.hxx> -#endif #include <dpage.hxx> #include <edtwin.hxx> #include "formatclipboard.hxx" -#ifndef _CMDID_H #include <cmdid.h> -#endif // header for class SfxRequest #include <sfx2/request.hxx> diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 64c24f91f2..9c4603ef73 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -40,18 +40,12 @@ #include <svl/srchitem.hxx> #include <sfx2/request.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <viewopt.hxx> #include <frmatr.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <uitool.hxx> #include <edtwin.hxx> #include <pagedesc.hxx> @@ -60,25 +54,13 @@ #include <workctrl.hxx> #include <usrpref.hxx> #include <scroll.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _VIEW_HRC #include <view.hrc> -#endif -#ifndef _RIBBAR_HRC #include <ribbar.hrc> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif #include <IDocumentSettingAccess.hxx> #include <PostItMgr.hxx> diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 6137a00ab0..fc4ff8aab6 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -35,24 +35,16 @@ #include <editeng/paperinf.hxx> #include <editeng/lrspitem.hxx> #include <sfx2/bindings.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> #include <viewopt.hxx> #include <frmatr.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <edtwin.hxx> #include <scroll.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <usrpref.hxx> #include <pagedesc.hxx> #include <workctrl.hxx> diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 6c8825a467..2158d160dd 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -34,9 +34,7 @@ #include <cstdarg> #endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #ifndef _SVSTDARR_HXX #define _SVSTDARR_STRINGSDTOR diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 238202e0b9..a733ee7374 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -38,9 +38,7 @@ #include <svl/whiter.hxx> #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> -#ifndef _T2XTCMP_HXX //autogen #include <svtools/txtcmp.hxx> -#endif #include <svl/itempool.hxx> #include <svl/eitem.hxx> #include <svl/srchitem.hxx> @@ -52,27 +50,17 @@ #include <swmodule.hxx> #include <swwait.hxx> #include <workctrl.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> #include <swundo.hxx> // fuer Undo-Ids #include <uitool.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif -#ifndef _VIEW_HRC #include <view.hrc> -#endif #include <SwRewriter.hxx> #include <undobj.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include "PostItMgr.hxx" diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index 20821d5d61..118c025734 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -49,28 +49,20 @@ #include <tox.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <wrtsh.hxx> -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <uitool.hxx> #include <viewopt.hxx> #include <tablemgr.hxx> #include <pagedesc.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <globdoc.hxx> #include <svl/stritem.hxx> #include <unotools/moduleoptions.hxx> #include <svl/visitem.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <IDocumentRedlineAccess.hxx> diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx index ba39ed59a2..ab37e3cb8c 100644 --- a/sw/source/ui/uno/SwXPrintPreviewSettings.cxx +++ b/sw/source/ui/uno/SwXPrintPreviewSettings.cxx @@ -31,12 +31,8 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <pvprtdat.hxx> #include <swtypes.hxx> -#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <doc.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 5bbf2bdf07..1f583b7a1e 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -44,9 +42,7 @@ #include <com/sun/star/ucb/InteractiveAppException.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> -#ifndef _TOOLKIT_UNOHLP_HXX #include <toolkit/helper/vclunohelper.hxx> -#endif #include <ucbhelper/simpleinteractionrequest.hxx> #include <rtl/ustring.h> #include <rtl/logfile.hxx> diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 08c720d0b3..219c989a18 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -54,9 +54,7 @@ #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/XCloseable.hpp> -#ifndef _COM_SUN_STAR_UTIL_CloseVetoException_HPP_ #include <com/sun/star/util/CloseVetoException.hpp> -#endif #include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/frame/XStorable.hpp> #include "com/sun/star/mail/XSmtpService.hpp" @@ -70,9 +68,7 @@ #include <unomap.hxx> #include <swunohelper.hxx> #include <docsh.hxx> -#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED #include <IDocumentDeviceAccess.hxx> -#endif #include <view.hxx> #include <dbmgr.hxx> #include <unotxdoc.hxx> diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 98e0a4e07b..f058fad445 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -60,9 +60,7 @@ #include <charfmt.hxx> #include <fmtcol.hxx> #include <tox.hxx> -#ifndef _ATTRDESC_HRC #include <attrdesc.hrc> -#endif #include <fmtftntx.hxx> #include <fmtfollowtextflow.hxx> diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx index 4bab9e8ca1..fb7d1e74bf 100644 --- a/sw/source/ui/utlui/bookctrl.cxx +++ b/sw/source/ui/utlui/bookctrl.cxx @@ -37,15 +37,9 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _EVENT_HXX //autogen #include <vcl/event.hxx> -#endif -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include "cmdid.h" #include "errhdl.hxx" #include "swmodule.hxx" diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 8929abb006..9c4312b5ff 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -33,9 +33,7 @@ #include <sot/formats.hxx> -#ifndef _CONDEDIT_HXX #include <condedit.hxx> -#endif #include <svx/dbaexchange.hxx> using namespace ::svx; using ::rtl::OUString; diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index a59244a237..7aaf1731af 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -36,9 +36,7 @@ #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> -#ifndef _HELP_HXX #include <vcl/help.hxx> -#endif #include <sot/formats.hxx> #include <vcl/sound.hxx> #include <uiitems.hxx> @@ -47,13 +45,9 @@ #include <fmtfld.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <errhdl.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <content.hxx> #include <frmfmt.hxx> #include <fldbas.hxx> @@ -69,24 +63,12 @@ #include <doc.hxx> #include <unotools.hxx> #include <crsskip.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _NAVIPI_HRC #include <navipi.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _MISC_HRC #include <misc.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index d4e5463790..33ba33cc2b 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -66,15 +66,9 @@ #include <cmdid.h> #include <helpid.h> -#ifndef _NAVIPI_HRC #include <navipi.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <globals.hrc> #include "swabstdlg.hxx" diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index a34b874a3b..4e6b7635a3 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -37,16 +37,10 @@ #include <tools/urlobj.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef SVTOOLS_FSTATHELPER_HXX #include <svl/fstathelper.hxx> -#endif #include <unotools/pathoptions.hxx> #include <unotools/transliterationwrapper.hxx> #include <swtypes.hxx> @@ -57,12 +51,8 @@ #include <gloslst.hxx> #include <swunohelper.hxx> -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _GLOSLST_HRC #include <gloslst.hrc> -#endif #define STRING_DELIM (char)0x0A diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 65731de981..ff4f48dcae 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -38,19 +38,11 @@ #include <glosdoc.hxx> #include <gloslst.hxx> -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif -#ifndef _INITUI_HRC #include <initui.hrc> -#endif -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <authfld.hxx> -#ifndef _DBMGR_HXX #include <dbmgr.hxx> -#endif #include <unotools/syslocale.hxx> #include <unomid.h> diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 55276b7e33..1ee700ec52 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -48,14 +48,10 @@ #include <swtypes.hxx> // fuer Pathfinder #include <errhdl.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <navicfg.hxx> #include <wrtsh.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <actctrl.hxx> #include <IMark.hxx> #include <navipi.hxx> @@ -64,21 +60,11 @@ #include <section.hxx> #include <edtwin.hxx> #include <sfx2/app.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#ifndef _RIBBAR_HRC #include <ribbar.hrc> -#endif -#ifndef _NAVIPI_HRC #include <navipi.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <unomid.h> diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/ui/utlui/tmplctrl.cxx index 22b07193b2..2c7c9efb18 100644 --- a/sw/source/ui/utlui/tmplctrl.cxx +++ b/sw/source/ui/utlui/tmplctrl.cxx @@ -32,14 +32,10 @@ #include <svl/style.hxx> -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include "wrtsh.hxx" #include "view.hxx" diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 664b49f546..c266125bcb 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -38,9 +38,7 @@ #include "utlui.hrc" #include "attrdesc.hrc" -#ifndef _UNOMID_H #include <unomid.h> -#endif #include <numrule.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 08cae536d7..119592b587 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -41,17 +41,13 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <editeng/pmdlitem.hxx> -#ifndef _SVX_TSTPITEM_HXX //autogen #include <editeng/tstpitem.hxx> -#endif #include <editeng/boxitem.hxx> #include <editeng/sizeitem.hxx> #include <svx/pageitem.hxx> #include <editeng/lrspitem.hxx> #include <svl/style.hxx> -#ifndef _VCL_LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <unotools/localedatawrapper.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -66,14 +62,10 @@ #include <fmtpdsc.hxx> #include <wview.hxx> #include <uiitems.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <wrtsh.hxx> #include <swmodule.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <uitool.hxx> #include <frmatr.hxx> #include <paratr.hxx> @@ -81,18 +73,10 @@ #include <poolfmt.hxx> #include "usrpref.hxx" -#ifndef _ERROR_H #include <error.h> -#endif -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _GLOBALS_HRC #include <globals.hrc> -#endif -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <doc.hxx> #include <docary.hxx> #include <charfmt.hxx> diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/ui/utlui/viewlayoutctrl.cxx index 79751fd17d..f27eec2ff7 100644 --- a/sw/source/ui/utlui/viewlayoutctrl.cxx +++ b/sw/source/ui/utlui/viewlayoutctrl.cxx @@ -31,15 +31,11 @@ // include --------------------------------------------------------------- #include <viewlayoutctrl.hxx> -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <vcl/image.hxx> #include <svl/eitem.hxx> #include <svx/viewlayoutitem.hxx> -#ifndef _UTLUI_HRC #include <utlui.hrc> -#endif #include <swtypes.hxx> // fuer Pathfinder // STATIC DATA ----------------------------------------------------------- diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/ui/utlui/zoomctrl.cxx index 986cf6463c..bb189a3671 100644 --- a/sw/source/ui/utlui/zoomctrl.cxx +++ b/sw/source/ui/utlui/zoomctrl.cxx @@ -32,9 +32,7 @@ #include "hintids.hxx" -#ifndef _STATUS_HXX //autogen #include <vcl/status.hxx> -#endif #include <sfx2/app.hxx> #include <svl/stritem.hxx> #include <svx/zoomitem.hxx> diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/ui/web/wdocsh.cxx index 2ecbc40874..d35de6e772 100644 --- a/sw/source/ui/web/wdocsh.cxx +++ b/sw/source/ui/web/wdocsh.cxx @@ -33,9 +33,7 @@ #include <svl/srchitem.hxx> #include <sfx2/app.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <sot/clsids.hxx> #include <sfx2/objface.hxx> diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/ui/web/wformsh.cxx index b9e919f51d..8b9d525ab9 100644 --- a/sw/source/ui/web/wformsh.cxx +++ b/sw/source/ui/web/wformsh.cxx @@ -32,9 +32,7 @@ #include <sfx2/msg.hxx> -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif #include <svl/srchitem.hxx> #include <sfx2/objface.hxx> #include <tools/globname.hxx> diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/ui/web/wtextsh.cxx index 6f9aadb2f5..641879ec97 100644 --- a/sw/source/ui/web/wtextsh.cxx +++ b/sw/source/ui/web/wtextsh.cxx @@ -35,9 +35,7 @@ #include <sfx2/app.hxx> #include <svl/srchitem.hxx> //*** #include <basic/sbxvar.hxx> -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include "swtypes.hxx" #include "cmdid.h" diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx index 8a4c68cbd0..5660c299d2 100644 --- a/sw/source/ui/wrtsh/delete.cxx +++ b/sw/source/ui/wrtsh/delete.cxx @@ -34,12 +34,8 @@ #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> // #i23725# // --> OD 2006-07-10 #134369# -#ifndef _VIEW_HXX #include <view.hxx> -#endif -#ifndef _DRAWBASE_HXX #include <drawbase.hxx> -#endif // <-- inline void SwWrtShell::OpenMark() diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index 3e649a9057..2ce55b4c7e 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -31,9 +31,7 @@ #include <sfx2/bindings.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <viewopt.hxx> #include <crsskip.hxx> diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index 9f0b753c13..1942f82504 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -42,9 +42,7 @@ #include <svx/svdview.hxx> #include <sot/factory.hxx> #include <svl/itemiter.hxx> -#ifndef _SOUND_HXX //autogen #include <vcl/sound.hxx> -#endif #include <tools/bigint.hxx> #include <sot/storage.hxx> #include <svtools/insdlg.hxx> @@ -67,21 +65,13 @@ #include <svx/fontworkbar.hxx> #include <fmtftn.hxx> #include <fmtpdsc.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif -#ifndef _BASESH_HXX #include <basesh.hxx> -#endif #include <swmodule.hxx> #include <wrtsh.hxx> -#ifndef _VIEW_HXX #include <view.hxx> -#endif #include <uitool.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <pagedesc.hxx> #include <frmmgr.hxx> #include <shellio.hxx> @@ -89,9 +79,7 @@ #include <swundo.hxx> // fuer Undo-Ids #include <swcli.hxx> #include <poolfmt.hxx> -#ifndef _WVIEW_HXX #include <wview.hxx> -#endif #include <edtwin.hxx> #include <fmtcol.hxx> #include <swtable.hxx> @@ -100,9 +88,7 @@ #include <swdtflvr.hxx> #include <crsskip.hxx> #include <doc.hxx> -#ifndef _WRTSH_HRC #include <wrtsh.hrc> -#endif #include <SwStyleNameMapper.hxx> #include <sfx2/request.hxx> #include <paratr.hxx> diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index 2f277f67f2..b6983e349b 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -29,9 +29,7 @@ #include "precompiled_sw.hxx" -#ifndef _SVX_SVXIDS_HRC //autogen #include <svx/svxids.hrc> -#endif #include <sfx2/app.hxx> #include <sfx2/childwin.hxx> #include <sfx2/bindings.hxx> diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 7ea609d14e..81066db6cd 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -38,9 +38,7 @@ #include <swundo.hxx> // fuer Undo-Ids #include <swdtflvr.hxx> -#ifndef _WRTSH_HRC #include <wrtsh.hrc> -#endif #include <sfx2/sfx.hrc> |