[ooo-build-commit] .: 2 commits - starmath/inc starmath/source sw/inc sw/source
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Oct 5 10:13:39 PDT 2010
starmath/inc/dialog.hxx | 2
starmath/inc/smmod.hxx | 4
starmath/inc/utility.hxx | 2
starmath/source/accessibility.hxx | 2
starmath/source/config.cxx | 2
starmath/source/dialog.cxx | 2
starmath/source/math_pch.cxx | 376 ----------
starmath/source/mathtype.cxx | 2
starmath/source/parse.cxx | 4
starmath/source/smdetect.cxx | 4
starmath/source/smdll.cxx | 6
starmath/source/smmod.cxx | 4
starmath/source/toolbox.cxx | 4
sw/inc/IDocumentSettingAccess.hxx | 2
sw/inc/SwAppletImpl.hxx | 2
sw/inc/ccoll.hxx | 6
sw/inc/checkit.hxx | 2
sw/inc/colwd.hxx | 2
sw/inc/docary.hxx | 2
sw/inc/dpage.hxx | 2
sw/inc/drawdoc.hxx | 2
sw/inc/flddropdown.hxx | 2
sw/inc/hints.hxx | 2
sw/inc/io.hxx | 2
sw/inc/shellres.hxx | 2
sw/inc/sw_primitivetypes2d.hxx | 2
sw/inc/swabstdlg.hxx | 2
sw/inc/swcli.hxx | 2
sw/inc/swtable.hxx | 2
sw/inc/tblafmt.hxx | 2
sw/source/core/access/accdoc.cxx | 2
sw/source/core/access/accdoc.hxx | 2
sw/source/core/access/accfootnote.cxx | 2
sw/source/core/access/accheaderfooter.cxx | 2
sw/source/core/access/accheaderfooter.hxx | 2
sw/source/core/access/accpage.cxx | 2
sw/source/core/access/accpage.hxx | 2
sw/source/core/access/accportions.cxx | 2
sw/source/core/access/accpreview.cxx | 2
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 2
sw/source/core/attr/hints.cxx | 2
sw/source/core/attr/swatrset.cxx | 2
sw/source/core/bastyp/SwSmartTagMgr.cxx | 2
sw/source/core/bastyp/breakit.cxx | 4
sw/source/core/bastyp/calc.cxx | 2
sw/source/core/bastyp/init.cxx | 2
sw/source/core/bastyp/swrect.cxx | 2
sw/source/core/crsr/callnk.cxx | 2
sw/source/core/crsr/findcoll.cxx | 2
sw/source/core/crsr/swcrsr.cxx | 2
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/SwStyleNameMapper.cxx | 2
sw/source/core/doc/docbasic.cxx | 4
sw/source/core/doc/docdde.cxx | 2
sw/source/core/doc/docdesc.cxx | 4
sw/source/core/doc/docfld.cxx | 2
sw/source/core/doc/docnum.cxx | 2
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/docruby.cxx | 4
sw/source/core/doc/fmtcol.cxx | 2
sw/source/core/doc/htmltbl.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/number.cxx | 2
sw/source/core/doc/poolfmt.cxx | 2
sw/source/core/doc/swserv.cxx | 2
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/docnode/finalthreadmanager.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/retrieveinputstream.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/draw/dpage.cxx | 4
sw/source/core/draw/drawdoc.cxx | 4
sw/source/core/edit/acorrect.cxx | 2
sw/source/core/edit/autofmt.cxx | 4
sw/source/core/edit/edfldexp.cxx | 2
sw/source/core/edit/edlingu.cxx | 4
sw/source/core/edit/edtab.cxx | 2
sw/source/core/edit/edtox.cxx | 4
sw/source/core/fields/authfld.cxx | 4
sw/source/core/fields/chpfld.cxx | 2
sw/source/core/fields/dbfld.cxx | 4
sw/source/core/fields/ddefld.cxx | 2
sw/source/core/fields/fldbas.cxx | 4
sw/source/core/fields/flddropdown.cxx | 2
sw/source/core/fields/macrofld.cxx | 2
sw/source/core/fields/reffld.cxx | 6
sw/source/core/fields/scrptfld.cxx | 4
sw/source/core/fields/tblcalc.cxx | 2
sw/source/core/fields/usrfld.cxx | 2
sw/source/core/frmedt/feflyole.cxx | 2
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/graphic/grfatr.cxx | 4
sw/source/core/graphic/ndgrf.cxx | 2
sw/source/core/inc/SwXTextDefaults.hxx | 2
sw/source/core/inc/drawdev.hxx | 2
sw/source/core/inc/mvsave.hxx | 2
sw/source/core/inc/observablethread.hxx | 2
sw/source/core/inc/retrievedinputstreamdata.hxx | 2
sw/source/core/inc/retrieveinputstream.hxx | 2
sw/source/core/inc/retrieveinputstreamconsumer.hxx | 2
sw/source/core/inc/swblocks.hxx | 2
sw/source/core/inc/swcache.hxx | 2
sw/source/core/inc/swfont.hxx | 2
sw/source/core/inc/wrong.hxx | 2
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/layact.cxx | 2
sw/source/core/layout/paintfrm.cxx | 10
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 2
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 2
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 2
sw/source/core/ole/ndole.cxx | 6
sw/source/core/sw3io/swacorr.cxx | 4
sw/source/core/swg/SwXMLBlockImport.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/swg/SwXMLTextBlocks1.cxx | 2
sw/source/core/swg/swblocks.cxx | 6
sw/source/core/text/frmpaint.cxx | 4
sw/source/core/text/inftxt.cxx | 4
sw/source/core/text/inftxt.hxx | 2
sw/source/core/text/itradj.cxx | 2
sw/source/core/text/itrform2.cxx | 2
sw/source/core/text/porfld.cxx | 10
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/portxt.cxx | 2
sw/source/core/text/redlnitr.cxx | 4
sw/source/core/text/redlnitr.hxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtftn.cxx | 2
sw/source/core/text/txttab.cxx | 2
sw/source/core/tox/tox.cxx | 2
sw/source/core/tox/toxhlp.cxx | 2
sw/source/core/tox/txmsrt.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 12
sw/source/core/txtnode/fntcap.cxx | 8
sw/source/core/txtnode/swfont.cxx | 8
sw/source/core/txtnode/txatritr.cxx | 2
sw/source/core/undo/docundo.cxx | 2
sw/source/core/undo/rolbck.cxx | 4
sw/source/core/undo/undobj.cxx | 4
sw/source/core/undo/unsort.cxx | 2
sw/source/core/unocore/swunohelper.cxx | 2
sw/source/core/unocore/unobkm.cxx | 2
sw/source/core/unocore/unochart.cxx | 2
sw/source/core/unocore/unocoll.cxx | 2
sw/source/core/unocore/unoevent.cxx | 4
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 4
sw/source/core/view/viewpg.cxx | 4
sw/source/core/view/viewsh.cxx | 6
sw/source/core/view/vnew.cxx | 2
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/ascii/wrtasc.cxx | 2
sw/source/filter/basflt/docfact.cxx | 2
sw/source/filter/html/htmlfly.hxx | 2
sw/source/filter/html/htmltab.cxx | 2
sw/source/filter/html/htmltabw.cxx | 4
sw/source/filter/html/svxcss1.cxx | 2
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/html/wrthtml.cxx | 4
sw/source/filter/rtf/rtffld.cxx | 6
sw/source/filter/rtf/rtfnum.cxx | 2
sw/source/filter/ww1/w1class.cxx | 2
sw/source/filter/ww1/w1class.hxx | 2
sw/source/filter/ww1/w1filter.cxx | 8
sw/source/filter/ww1/w1par.cxx | 4
sw/source/filter/ww1/w1par.hxx | 2
sw/source/filter/ww8/dump/ww8scan.hxx | 6
sw/source/filter/ww8/escher.hxx | 2
sw/source/filter/ww8/ww8par2.hxx | 6
sw/source/filter/ww8/ww8scan.hxx | 2
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlimpit.cxx | 2
sw/source/filter/xml/xmlitemi.cxx | 4
sw/source/filter/xml/xmlitemm.cxx | 2
sw/source/filter/xml/xmlithlp.cxx | 2
sw/source/filter/xml/xmlscript.cxx | 2
sw/source/filter/xml/xmltexti.hxx | 2
sw/source/ui/app/appenv.cxx | 6
sw/source/ui/app/apphdl.cxx | 4
sw/source/ui/app/applab.cxx | 4
sw/source/ui/app/appopt.cxx | 18
sw/source/ui/app/docsh2.cxx | 10
sw/source/ui/app/docshdrw.cxx | 4
sw/source/ui/app/mainwn.cxx | 4
sw/source/ui/app/swdll.cxx | 6
sw/source/ui/app/swmodule.cxx | 26
sw/source/ui/cctrl/popbox.cxx | 2
sw/source/ui/chrdlg/break.cxx | 12
sw/source/ui/chrdlg/chardlg.cxx | 18
sw/source/ui/chrdlg/drpcps.cxx | 4
sw/source/ui/chrdlg/numpara.cxx | 2
sw/source/ui/chrdlg/tblnumfm.cxx | 4
sw/source/ui/config/cfgitems.cxx | 4
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/modcfg.cxx | 4
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 8
sw/source/ui/config/optpage.cxx | 20
sw/source/ui/config/viewopt.cxx | 8
sw/source/ui/dbui/addresslistdialog.cxx | 4
sw/source/ui/dbui/addresslistdialog.hxx | 2
sw/source/ui/dbui/createaddresslistdialog.cxx | 2
sw/source/ui/dbui/createaddresslistdialog.hxx | 2
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 2
sw/source/ui/dbui/dbtablepreviewdialog.cxx | 2
sw/source/ui/dbui/dbtablepreviewdialog.hxx | 2
sw/source/ui/dbui/dbtree.cxx | 8
sw/source/ui/dbui/mailmergehelper.cxx | 4
sw/source/ui/dbui/mailmergewizard.cxx | 4
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dbui/mmconfigitem.cxx | 4
sw/source/ui/dbui/mmdocselectpage.cxx | 2
sw/source/ui/dbui/mmdocselectpage.hxx | 2
sw/source/ui/dbui/mmgreetingspage.hxx | 2
sw/source/ui/dbui/mmlayoutpage.hxx | 2
sw/source/ui/dbui/mmmergepage.cxx | 2
sw/source/ui/dbui/mmmergepage.hxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 10
sw/source/ui/dbui/mmoutputpage.hxx | 2
sw/source/ui/dbui/mmoutputtypepage.cxx | 2
sw/source/ui/dbui/mmoutputtypepage.hxx | 2
sw/source/ui/dbui/mmpreparemergepage.cxx | 6
sw/source/ui/dbui/mmpreparemergepage.hxx | 2
sw/source/ui/dbui/selectdbtabledialog.hxx | 2
sw/source/ui/dialog/ascfldlg.cxx | 4
sw/source/ui/dialog/docstdlg.cxx | 12
sw/source/ui/dialog/macassgn.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/dochdl/gloshdl.cxx | 12
sw/source/ui/docvw/edtdd.cxx | 4
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/docvw/romenu.hxx | 4
sw/source/ui/docvw/srcedtw.cxx | 12
sw/source/ui/envelp/envfmt.cxx | 16
sw/source/ui/envelp/envfmt.hxx | 6
sw/source/ui/envelp/envimg.cxx | 4
sw/source/ui/envelp/envprt.hxx | 2
sw/source/ui/envelp/label1.cxx | 10
sw/source/ui/envelp/labimg.cxx | 2
sw/source/ui/envelp/labprt.cxx | 6
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/fldui/DropDownFieldDialog.cxx | 6
sw/source/ui/fldui/changedb.cxx | 12
sw/source/ui/fldui/flddb.cxx | 14
sw/source/ui/fldui/flddb.hxx | 2
sw/source/ui/fldui/flddinf.cxx | 6
sw/source/ui/fldui/flddok.cxx | 10
sw/source/ui/fldui/flddok.hxx | 2
sw/source/ui/fldui/fldedt.cxx | 22
sw/source/ui/fldui/fldfunc.cxx | 10
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldref.cxx | 8
sw/source/ui/fldui/fldref.hxx | 2
sw/source/ui/fldui/fldtdlg.cxx | 2
sw/source/ui/fldui/fldvar.cxx | 10
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/fldui/fldwrap.cxx | 12
sw/source/ui/fldui/inpdlg.cxx | 6
sw/source/ui/fldui/javaedit.cxx | 10
sw/source/ui/fldui/xfldui.cxx | 4
sw/source/ui/fmtui/tmpdlg.cxx | 14
sw/source/ui/frmdlg/cption.cxx | 6
sw/source/ui/frmdlg/frmdlg.cxx | 6
sw/source/ui/inc/DropDownFieldDialog.hxx | 2
sw/source/ui/inc/SwSpellDialogChildWindow.hxx | 2
sw/source/ui/inc/abstract.hxx | 6
sw/source/ui/inc/actctrl.hxx | 2
sw/source/ui/inc/ascfldlg.hxx | 2
sw/source/ui/inc/autoedit.hxx | 2
sw/source/ui/inc/bmpwin.hxx | 4
sw/source/ui/inc/bookmark.hxx | 2
sw/source/ui/inc/break.hxx | 8
sw/source/ui/inc/changedb.hxx | 6
sw/source/ui/inc/chrdlg.hxx | 12
sw/source/ui/inc/cnttab.hxx | 8
sw/source/ui/inc/column.hxx | 14
sw/source/ui/inc/condedit.hxx | 2
sw/source/ui/inc/content.hxx | 2
sw/source/ui/inc/convert.hxx | 2
sw/source/ui/inc/cption.hxx | 10
sw/source/ui/inc/dbinsdlg.hxx | 8
sw/source/ui/inc/dbui.hxx | 2
sw/source/ui/inc/docstdlg.hxx | 2
sw/source/ui/inc/drpcps.hxx | 10
sw/source/ui/inc/envlop.hxx | 10
sw/source/ui/inc/formedt.hxx | 8
sw/source/ui/inc/frmpage.hxx | 10
sw/source/ui/inc/glosbib.hxx | 6
sw/source/ui/inc/glossary.hxx | 12
sw/source/ui/inc/inpdlg.hxx | 4
sw/source/ui/inc/inputwin.hxx | 6
sw/source/ui/inc/insfnote.hxx | 4
sw/source/ui/inc/instable.hxx | 8
sw/source/ui/inc/javaedit.hxx | 8
sw/source/ui/inc/linenum.hxx | 2
sw/source/ui/inc/mailconfigpage.hxx | 8
sw/source/ui/inc/mailmrge.hxx | 10
sw/source/ui/inc/mergetbl.hxx | 4
sw/source/ui/inc/multmrk.hxx | 6
sw/source/ui/inc/navipi.hxx | 2
sw/source/ui/inc/num.hxx | 12
sw/source/ui/inc/numpara.hxx | 2
sw/source/ui/inc/optload.hxx | 2
sw/source/ui/inc/optpage.hxx | 10
sw/source/ui/inc/outline.hxx | 10
sw/source/ui/inc/pgfnote.hxx | 6
sw/source/ui/inc/pggrid.hxx | 4
sw/source/ui/inc/popbox.hxx | 2
sw/source/ui/inc/prcntfld.hxx | 2
sw/source/ui/inc/redlndlg.hxx | 2
sw/source/ui/inc/rowht.hxx | 8
sw/source/ui/inc/scroll.hxx | 2
sw/source/ui/inc/selglos.hxx | 6
sw/source/ui/inc/split.hxx | 8
sw/source/ui/inc/srcedtw.hxx | 2
sw/source/ui/inc/srtdlg.hxx | 8
sw/source/ui/inc/stmenu.hxx | 4
sw/source/ui/inc/swlbox.hxx | 4
sw/source/ui/inc/swrenamexnameddlg.hxx | 2
sw/source/ui/inc/swuicnttab.hxx | 8
sw/source/ui/inc/swuiidxmrk.hxx | 12
sw/source/ui/inc/syncbtn.hxx | 2
sw/source/ui/inc/tautofmt.hxx | 10
sw/source/ui/inc/textcontrolcombo.hxx | 2
sw/source/ui/inc/unotools.hxx | 2
sw/source/ui/inc/wordcountdialog.hxx | 2
sw/source/ui/inc/workctrl.hxx | 2
sw/source/ui/inc/wrap.hxx | 8
sw/source/ui/index/cntex.cxx | 12
sw/source/ui/index/cnttab.cxx | 22
sw/source/ui/index/idxmrk.cxx | 12
sw/source/ui/index/swuiidxmrk.cxx | 12
sw/source/ui/index/toxmgr.cxx | 2
sw/source/ui/lingu/hhcwrp.cxx | 8
sw/source/ui/lingu/hyp.cxx | 2
sw/source/ui/lingu/sdrhhcwrap.cxx | 4
sw/source/ui/misc/docfnote.cxx | 12
sw/source/ui/misc/glosbib.cxx | 8
sw/source/ui/misc/glosdoc.cxx | 4
sw/source/ui/misc/glossary.cxx | 8
sw/source/ui/misc/glshell.cxx | 6
sw/source/ui/misc/impfnote.hxx | 8
sw/source/ui/misc/insrule.cxx | 2
sw/source/ui/misc/num.cxx | 18
sw/source/ui/misc/numberingtypelistbox.cxx | 2
sw/source/ui/misc/outline.cxx | 16
sw/source/ui/misc/pgfnote.cxx | 10
sw/source/ui/misc/pggrid.cxx | 4
sw/source/ui/misc/redlndlg.cxx | 14
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 14
sw/source/ui/ribbar/concustomshape.cxx | 8
sw/source/ui/ribbar/tbxanchr.cxx | 2
sw/source/ui/ribbar/workctrl.cxx | 12
sw/source/ui/shells/basesh.cxx | 10
sw/source/ui/shells/drawdlg.cxx | 4
sw/source/ui/shells/drwtxtsh.cxx | 6
sw/source/ui/shells/grfsh.cxx | 2
sw/source/ui/shells/grfshex.cxx | 14
sw/source/ui/shells/mediash.cxx | 6
sw/source/ui/shells/olesh.cxx | 12
sw/source/ui/shells/slotadd.cxx | 4
sw/source/ui/shells/tabsh.cxx | 8
sw/source/ui/shells/textdrw.cxx | 2
sw/source/ui/shells/textsh.cxx | 8
sw/source/ui/shells/textsh2.cxx | 2
sw/source/ui/shells/txtattr.cxx | 12
sw/source/ui/shells/txtcrsr.cxx | 10
sw/source/ui/shells/txtnum.cxx | 2
sw/source/ui/smartmenu/stmenu.cxx | 4
sw/source/ui/table/chartins.cxx | 2
sw/source/ui/table/colwd.cxx | 12
sw/source/ui/table/mergetbl.cxx | 4
sw/source/ui/table/rowht.cxx | 10
sw/source/ui/table/swtablerep.cxx | 12
sw/source/ui/table/tabledlg.cxx | 12
sw/source/ui/table/tablepg.hxx | 6
sw/source/ui/table/tautofmt.cxx | 10
sw/source/ui/uiview/formatclipboard.cxx | 4
sw/source/ui/uiview/pview.cxx | 12
sw/source/ui/uiview/swcli.cxx | 2
sw/source/ui/uiview/view1.cxx | 10
sw/source/ui/uiview/viewmdi.cxx | 18
sw/source/ui/uiview/viewport.cxx | 8
sw/source/ui/uiview/viewprt.cxx | 2
sw/source/ui/uiview/viewsrch.cxx | 12
sw/source/ui/uiview/viewstat.cxx | 8
sw/source/ui/uno/SwXDocumentSettings.hxx | 4
sw/source/ui/uno/SwXPrintPreviewSettings.cxx | 4
sw/source/ui/uno/SwXPrintPreviewSettings.hxx | 2
sw/source/ui/uno/swdetect.cxx | 4
sw/source/ui/uno/unomailmerge.cxx | 4
sw/source/ui/utlui/attrdesc.cxx | 2
sw/source/ui/utlui/bookctrl.cxx | 6
sw/source/ui/utlui/condedit.cxx | 2
sw/source/ui/utlui/content.cxx | 18
sw/source/ui/utlui/glbltree.cxx | 6
sw/source/ui/utlui/gloslst.cxx | 10
sw/source/ui/utlui/initui.cxx | 8
sw/source/ui/utlui/navipi.cxx | 14
sw/source/ui/utlui/tmplctrl.cxx | 4
sw/source/ui/utlui/uiitems.cxx | 2
sw/source/ui/utlui/uitool.cxx | 16
sw/source/ui/utlui/viewlayoutctrl.cxx | 4
sw/source/ui/utlui/zoomctrl.cxx | 2
sw/source/ui/web/wdocsh.cxx | 2
sw/source/ui/web/wformsh.cxx | 2
sw/source/ui/web/wtextsh.cxx | 2
sw/source/ui/wrtsh/delete.cxx | 4
sw/source/ui/wrtsh/move.cxx | 2
sw/source/ui/wrtsh/wrtsh1.cxx | 14
sw/source/ui/wrtsh/wrtsh3.cxx | 2
sw/source/ui/wrtsh/wrtundo.cxx | 2
415 files changed, 2372 deletions(-)
New commits:
commit 0f85353addf5fa26ede1dfa00eae4243a9cd4812
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Oct 5 15:55:31 2010 +0200
more removed include guards using fixguard.py
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 239b3c2..ab17da1 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -30,9 +30,7 @@
#include <vcl/image.hxx>
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/image.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/combobox.hxx>
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index e5718a0..e61c640 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -28,18 +28,14 @@
#ifndef _SMMOD_HXX
#define _SMMOD_HXX
-#ifndef _SV_RESARY_HXX
#include <tools/resary.hxx>
-#endif
#include <svl/lstner.hxx>
#include <svtools/colorcfg.hxx>
#include <tools/shl.hxx>
#include <sfx2/module.hxx>
-#ifndef _STARMATH_HRC
#include "starmath.hrc"
-#endif
#include <unotools/options.hxx>
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 7ccf6fa..ee97aaa 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -28,9 +28,7 @@
#define UTILITY_HXX
#include <sfx2/minarray.hxx>
-#ifndef _FONT_HXX //autogen
#include <vcl/font.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 44ffcaa..2f4b849 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -38,9 +38,7 @@
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#ifndef _COM_SUN_STAR_lang_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <com/sun/star/uno/Reference.h>
#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.h>
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 0a9039d..3853e63 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -29,9 +29,7 @@
#define IDOCUMENTSETTINGACCESS_HXX_INCLUDED
#include <tools/solar.h>
-#ifndef _VOS_REF_HXX
#include <vos/ref.hxx>
-#endif
#include <chcmprse.hxx>
#include <fldupde.hxx>
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 13e395a..7830f63 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -39,9 +39,7 @@
#include <tools/string.hxx>
#include <sfx2/frmhtml.hxx>
#include <sfx2/frmhtmlw.hxx>
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
#include <sot/storage.hxx>
#include <svl/itemset.hxx>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index a8546b8..468677f 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -31,18 +31,12 @@
#include <tools/string.hxx>
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <svtools/svtabbx.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <tools/resary.hxx>
#include "swdllapi.h"
#include "cmdid.h"
diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx
index 0aed8c9..e594646 100644
--- a/sw/inc/checkit.hxx
+++ b/sw/inc/checkit.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/uno/Reference.h>
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
/*************************************************************************
* class SwCheckIt
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index ba121cd..620e2ca 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -31,9 +31,7 @@
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 7db04d9..fbbad3d 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -44,9 +44,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
struct ForbiddenCharacters; // comes from the I18N UNO interface
}}}}
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <swtypes.hxx>
#include <svl/svarray.hxx>
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 0f53829..27be357 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -27,9 +27,7 @@
#ifndef _DPAGE_HXX
#define _DPAGE_HXX
-#ifndef _FM_FMPAGE_HXX
#include <svx/fmpage.hxx>
-#endif
#include <svx/svdobj.hxx>
class SdrPageGridFrameList;
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index cf2336e..ff39d79 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -27,9 +27,7 @@
#ifndef _DRAWDOC_HXX
#define _DRAWDOC_HXX
-#ifndef _FM_FMMODEL_HXX
#include <svx/fmmodel.hxx>
-#endif
class SwDoc;
class SwDocShell;
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 938d825..c0f7b57 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -27,9 +27,7 @@
#ifndef _FLDDROPDOWN_HXX
#define _FLDDROPDOWN_HXX
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX
#include "com/sun/star/uno/Sequence.hxx"
-#endif
#include "swdllapi.h"
#include "fldbas.hxx"
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index e4ba71c..e9cb398 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -27,9 +27,7 @@
#ifndef _HINTS_HXX
#define _HINTS_HXX
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <swatrset.hxx>
class SwFmt;
diff --git a/sw/inc/io.hxx b/sw/inc/io.hxx
index 731d2e6..9828b62 100644
--- a/sw/inc/io.hxx
+++ b/sw/inc/io.hxx
@@ -42,9 +42,7 @@
#include <sys/stat.h>
-#ifndef _KEYCOD_HXX //autogen
#include <vcl/keycod.hxx>
-#endif
#include <tools/stream.hxx>
/*$
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 6541294..02cafc1 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -30,9 +30,7 @@
#include <tools/string.hxx>
-#ifndef _BITMAP_HXX //autogen
#include <vcl/bitmap.hxx>
-#endif
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_STRINGSDTOR
diff --git a/sw/inc/sw_primitivetypes2d.hxx b/sw/inc/sw_primitivetypes2d.hxx
index 12e2457..61428a8 100644
--- a/sw/inc/sw_primitivetypes2d.hxx
+++ b/sw/inc/sw_primitivetypes2d.hxx
@@ -28,9 +28,7 @@
#ifndef INCLUDED_SW_PRIMITIVETYPES2D_HXX
#define INCLUDED_SW_PRIMITIVETYPES2D_HXX
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVETYPES2D_HXX
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#endif
//////////////////////////////////////////////////////////////////////////////
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 1c21989..ddd12e6 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -34,9 +34,7 @@
#include <sfx2/sfxdlg.hxx>
#include <svx/svxdlg.hxx>
#include <vcl/syswin.hxx>
-#ifndef _GLOBALS_HRC
#include <globals.hrc>
-#endif
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index de9a6ea..d2bd85a 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -30,9 +30,7 @@
#include <svtools/embedhlp.hxx>
-#ifndef _SFX_CLIENTSH_HXX //autogen
#include <sfx2/ipclient.hxx>
-#endif
class SwView;
class SwEditWin;
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 04812ae..5f595ff 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -27,9 +27,7 @@
#ifndef _SWTABLE_HXX
#define _SWTABLE_HXX
#include <tools/mempool.hxx>
-#ifndef _TOOLS_REF_HXX
#include <tools/ref.hxx>
-#endif
#include <svl/svarray.hxx>
#include <tblenum.hxx>
#include <swtypes.hxx>
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 36864e2..4e18a24 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -53,9 +53,7 @@ JP 20.07.95:
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/crsditem.hxx>
-#ifndef _SVX_CNTRTITEM_HXX //autogen
#include <editeng/cntritem.hxx>
-#endif
#include <editeng/shdditem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/boxitem.hxx>
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 38f5c12..76815cc 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -26,9 +26,7 @@
************************************************************************/
#ifndef _ACCDOC_HXX
#define _ACCDOC_HXX
-#ifndef _ACCCONTEXT_HXX
#include "acccontext.hxx"
-#endif
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <accselectionhelper.hxx>
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 1b3b4a6..0ca57bb 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -26,9 +26,7 @@
************************************************************************/
#ifndef _ACCHEADERFOOTER_HXX
#define _ACCHEADERFOOTER_HXX
-#ifndef _ACCCONTEXT_HXX
#include "acccontext.hxx"
-#endif
class SwHeaderFrm;
class SwFooterFrm;
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index dc364f7..b649b8e 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -27,9 +27,7 @@
#ifndef _ACCPAGE_HXX
#define _ACCPAGE_HXX
-#ifndef _ACCCONTEXT_HXX
#include "acccontext.hxx"
-#endif
/**
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index ac452a0..e518288 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -29,9 +29,7 @@
#include "precompiled_sw.hxx"
#include <hints.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <editeng/scripttypeitem.hxx>
#include <hintids.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 7215953..0431f28 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -31,9 +31,7 @@
#include "breakit.hxx"
#include <unicode/uchar.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <unotools/localedatawrapper.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index f72be56..f3d9124 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -31,9 +31,7 @@
#include <hintids.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <fmtcntnt.hxx>
#include <txatbase.hxx>
#include <frmatr.hxx>
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 2ef195e..5ee61ef 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -32,12 +32,8 @@
#include <string.h> // fuer strchr()
#include <hintids.hxx>
-#ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL
#include <com/sun/star/i18n/UnicodeType.hdl>
-#endif
-#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL
#include <com/sun/star/i18n/WordType.hdl>
-#endif
#include <unotools/charclass.hxx>
#include <doc.hxx>
#include <docary.hxx>
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 6776017..cd2dacd 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -30,9 +30,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
-#ifndef _COM_SUN_STAR_BEANS_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
#include <svl/itemprop.hxx>
class SwDoc;
diff --git a/sw/source/core/inc/drawdev.hxx b/sw/source/core/inc/drawdev.hxx
index d7e1b5c..d5ab882 100644
--- a/sw/source/core/inc/drawdev.hxx
+++ b/sw/source/core/inc/drawdev.hxx
@@ -30,9 +30,7 @@
#include "swrect.hxx"
-#ifndef _OUTDEV_HXX //autogen
#include <vcl/outdev.hxx>
-#endif
/*************************************************************************
* class SwDrawDev
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 0f82184..71f28cf 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -29,9 +29,7 @@
#include <tools/string.hxx>
-#ifndef _KEYCOD_HXX //autogen
#include <vcl/keycod.hxx>
-#endif
#include <svl/svarray.hxx>
#include <IDocumentMarkAccess.hxx>
#include <vector>
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index 9d4beb1..d8c10e4 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -27,9 +27,7 @@
#ifndef _OBSERVABLETHREAD_HXX
#define _OBSERVABLETHREAD_HXX
-#ifndef _OSL_THREAD_HXX_
#include <osl/thread.hxx>
-#endif
#include <rtl/ref.hxx>
#include <osl/interlck.h>
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index c1dac2c..03062a0 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -31,9 +31,7 @@
#include <sal/types.h>
#include <osl/mutex.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_
#include <com/sun/star/io/XInputStream.hpp>
-#endif
#include <map>
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index 86d22fc..7b0646a 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -32,9 +32,7 @@
//#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
//#include <com/sun/star/uno/Reference.hxx>
//#endif
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_
#include <com/sun/star/io/XInputStream.hpp>
-#endif
#include <retrievedinputstreamdata.hxx>
/** class for a thread to retrieve an input stream given by an URL
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index e49dbe6..1bc6321 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -28,9 +28,7 @@
#define _RETRIEVEINPUTSTREAMCONSUMER_HXX
#include <com/sun/star/uno/Reference.hxx>
-#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HXX_
#include <com/sun/star/io/XInputStream.hpp>
-#endif
#include <osl/interlck.h>
#include <retrievedinputstreamdata.hxx>
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index e0a699c..bd7bda8 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -29,9 +29,7 @@
#include <tools/string.hxx>
-#ifndef _DATE_HXX //autogen
#include <tools/datetime.hxx>
-#endif
#include <svl/svarray.hxx>
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 73cd1ec..ac6bf6a 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -58,10 +58,8 @@
*/
#ifdef DBG_UTIL
-#ifndef _STRING_HXX //autogen
#include <tools/string.hxx>
#endif
-#endif
#ifndef _SVSTDARR_HXX
#define _SVSTDARR_USHORTS
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 5953ec7..edcc219 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -29,9 +29,7 @@
#include <i18npool/lang.h>
#include <tools/color.hxx>
-#ifndef _TOOLS_STREAM_HXX //autogen
#include <tools/stream.hxx>
-#endif
#include <editeng/svxfont.hxx>
#include <swtypes.hxx>
#include <drawfont.hxx> // SwDrawTextInfo
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index ddea82f..792283a 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -28,9 +28,7 @@
#ifndef _WRONG_HXX
#define _WRONG_HXX
-#ifndef _COM_SUN_STAR_SMARTTAGS_XSMARTTAGPROPERTIES_HPP_
#include <com/sun/star/container/XStringKeyMap.hpp>
-#endif
#include <vector>
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index b15c7fe..7b50c22 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -29,9 +29,7 @@
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include <com/sun/star/beans/PropertyValues.hpp>
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include "swtypes.hxx"
#include "txttypes.hxx"
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index a38d137..8e11232 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -27,9 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <vcl/outdev.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 209520a..2c82242 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -30,9 +30,7 @@
#include "hintids.hxx"
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <editeng/lspcitem.hxx>
#include <txtftn.hxx>
#include <fmtftn.hxx>
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 223b9fb..8cc89d2 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -31,9 +31,7 @@
#include <hintids.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <vcl/graph.hxx>
#include <editeng/brshitem.hxx>
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index b66a6e3..0118e1e 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -31,9 +31,7 @@
#include <ctype.h>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <hintids.hxx> // CH_TXTATR
#include <errhdl.hxx> // ASSERT
#include <SwPortionHandler.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index ef874a1..2e9e5fa 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -32,9 +32,7 @@
#include "hintids.hxx"
#include <svl/whiter.hxx>
#include <tools/shl.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <swmodule.hxx>
#include <redline.hxx> // SwRedline
#include <txtatr.hxx> // SwTxt ...
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 756ef61..4028a41 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -29,9 +29,7 @@
#include "ndhints.hxx"
-#ifndef IDOCUMENTREDLINEACCESS_HXX_INCLUDED
#include <IDocumentRedlineAccess.hxx>
-#endif
#include "swfont.hxx"
#ifndef _SVSTDARR_USHORTS
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 445a136..ab2e9d7 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -43,9 +43,7 @@
#include <txtpaint.hxx> // SwSaveClip
#include <blink.hxx> // pBlink
#include <breakit.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <com/sun/star/i18n/WordType.hpp>
#include <editeng/langitem.hxx>
#include <charatr.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 27c4569..e4b6fc8 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -43,9 +43,7 @@
#include <editeng/brshitem.hxx>
#include <editeng/charrotateitem.hxx>
#include <breakit.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <tabfrm.hxx>
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index ea6e98c..60348c2 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -35,12 +35,8 @@
#include <vcl/metric.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
-#ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_
#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
-#endif
-#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL
#include <com/sun/star/i18n/WordType.hdl>
-#endif
#include <breakit.hxx>
#include <viewsh.hxx> // Bildschirmabgleich
#include <viewopt.hxx> // Bildschirmabgleich abschalten, ViewOption
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index aad1c45..4e0dbd9 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -33,12 +33,8 @@
#include <editeng/cmapitem.hxx>
#include <vcl/outdev.hxx>
-#ifndef _COM_SUN_STAR_I18N_CHARTYPE_HDL
#include <com/sun/star/i18n/CharType.hdl>
-#endif
-#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HDL
#include <com/sun/star/i18n/WordType.hdl>
-#endif
#include <vcl/print.hxx>
#include <errhdl.hxx>
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index f312631..0644029 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -31,9 +31,7 @@
#include <hintids.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <vcl/outdev.hxx>
#include <unotools/localedatawrapper.hxx>
#include <editeng/unolingu.hxx>
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index 6dea1a8..295ad67 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -31,9 +31,7 @@
#include <hintids.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <tools/string.hxx>
#include <editeng/langitem.hxx>
#include <txatritr.hxx>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 969d499..bca3223 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -35,9 +35,7 @@
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
-#ifndef _COM_SUN_STAR_UCB_NAMECLASH_HDL_
#include <com/sun/star/ucb/NameClash.hdl>
-#endif
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 16c0405..27a64ae 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -31,9 +31,7 @@
#include <tools/solar.h>
#include <tools/string.hxx>
-#ifndef _SVARRAY_H
#include <svl/svarray.hxx>
-#endif
class SdrObject;
class SwFrmFmt;
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index cbaf55e..56355d6 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -32,9 +32,7 @@
#include <ctype.h>
#include <hintids.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <vcl/graph.hxx>
#include <svl/urihelper.hxx>
#include <svtools/rtftoken.h>
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 990b8e6..8275796 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -28,9 +28,7 @@
#include <tools/debug.hxx>
// local
-#ifndef _W1STRUCT_HXX
#include <w1struct.hxx>
-#endif
#ifdef DUMP
#include <fstream.h>
diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx
index 5f7e88b..9d58478 100644
--- a/sw/source/filter/ww1/w1par.hxx
+++ b/sw/source/filter/ww1/w1par.hxx
@@ -29,9 +29,7 @@
#define _W1PAR_HXX
#include <fltshell.hxx>
-#ifndef _W1CLASS_HXX
#include <w1class.hxx>
-#endif
////////////////////////////////////////////////////////////// Ww1Shell
class Ww1Shell : public SwFltShell
diff --git a/sw/source/filter/ww8/dump/ww8scan.hxx b/sw/source/filter/ww8/dump/ww8scan.hxx
index 2f79221..c8eec7f 100644
--- a/sw/source/filter/ww8/dump/ww8scan.hxx
+++ b/sw/source/filter/ww8/dump/ww8scan.hxx
@@ -32,13 +32,9 @@
#ifndef LONG_MAX
#include <limits.h>
#endif
-#ifndef _SAL_TYPES_H
#include <sal/types.h>
-#endif
#include <tools/solar.h> // UINTXX
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <tools/datetime.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
@@ -47,9 +43,7 @@
#define _SVSTDARR_STRINGS
#include <svl/svstdarr.hxx>
-#ifndef WW8STRUC_HXX
#include <ww8struc.hxx> // FIB, STSHI, STD
-#endif
#include <ww8scan.hxx>
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index 46aa1d0..79c991b 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -30,9 +30,7 @@
#ifndef _ESCHER_HXX
#define _ESCHER_HXX
-#ifndef _ESCHEREX_HXX
#include <filter/msfilter/escherex.hxx>
-#endif
const sal_uInt32 nInlineHack = 0x00010001;
class SwFrmFmt;
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 2da82b3..2d7c121 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -29,20 +29,14 @@
#ifndef _WW8PAR2_HXX
#define _WW8PAR2_HXX
-#ifndef SWTYPES_HXX
#include <swtypes.hxx> // enum RndStdIds
-#endif
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
#include <fmtsrnd.hxx>
#include <editeng/lrspitem.hxx>
-#ifndef WW8SCAN_HXX
#include "ww8scan.hxx" // class WW8Style
-#endif
-#ifndef WW8PAR_HXX
#include "ww8par.hxx" // WW8_BRC5
-#endif
class WW8RStyle;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 7844860..437eddf 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -45,9 +45,7 @@
#include "hash_wrap.hxx"
#include "sortedarray.hxx"
-#ifndef WW8STRUC_HXX
#include "ww8struc.hxx" // FIB, STSHI, STD...
-#endif
#include <types.hxx>
#include <unomid.h>
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 1e3ea92..b709ae7 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -27,9 +27,7 @@
#ifndef _XMLTEXTI_HXX
#define _XMLTEXTI_HXX
-#ifndef _XMLOFF_TXTIMP_HXX
#include <xmloff/txtimp.hxx>
-#endif
#include <xmloff/functional.hxx>
class XMLRedlineImportHelper;
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index f956055..8e596a7 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -53,9 +53,7 @@
#include <editeng/svxfont.hxx>
#include <vcl/print.hxx>
#include <sfx2/printer.hxx>
-#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
#include <com/sun/star/i18n/ScriptType.hdl>
-#endif
#include <editeng/scripttypeitem.hxx>
#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 30f0e26..be8a26e 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -29,9 +29,7 @@
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <swdbdata.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 39cd1bc..dcbb025 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -29,9 +29,7 @@
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 6813982..981a58b 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -28,9 +28,7 @@
#define _CUSTOMIZEADDRESSLISTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index e121c3f..f7bac54 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -29,9 +29,7 @@
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <com/sun/star/uno/Sequence.h>
namespace com{ namespace sun{ namespace star{
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 2436a17..c546b36 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -28,9 +28,7 @@
#define _MAILMERGEADDRESSBLOCKPAGE_HXX
#include <svtools/wizardmachine.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <mailmergehelper.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 363aecd..4646d8b 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -30,9 +30,7 @@
#include <svtools/wizardmachine.hxx>
#include <mailmergehelper.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
class SwMailMergeWizard;
/*-- 02.04.2004 09:21:06---------------------------------------------------
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 230beab..09116f2 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -29,9 +29,7 @@
#include <svtools/wizardmachine.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
#include <svtools/stdctrl.hxx>
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 137eb7b..bbb73e2 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -29,9 +29,7 @@
#include <svtools/wizardmachine.hxx>
#include <mailmergehelper.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/dbui/mmmergepage.hxx b/sw/source/ui/dbui/mmmergepage.hxx
index 2b8ade7..c6343e9 100644
--- a/sw/source/ui/dbui/mmmergepage.hxx
+++ b/sw/source/ui/dbui/mmmergepage.hxx
@@ -28,9 +28,7 @@
#define _MAILMERGEMERGEPAGE_HXX
#include <svtools/wizardmachine.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <svtools/stdctrl.hxx>
#include <mailmergehelper.hxx>
diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx
index f6e3987..ef539ab 100644
--- a/sw/source/ui/dbui/mmoutputpage.hxx
+++ b/sw/source/ui/dbui/mmoutputpage.hxx
@@ -27,9 +27,7 @@
#ifndef _MAILMERGEOUTPUTPAGE_HXX
#define _MAILMERGEOUTPUTPAGE_HXX
#include <svtools/wizardmachine.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 9486b05..29a7bf1 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -28,9 +28,7 @@
#define _MAILMERGEOUTPUTTYPEPAGE_HXX
#include <svtools/wizardmachine.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <mailmergehelper.hxx>
class SwMailMergeWizard;
diff --git a/sw/source/ui/dbui/mmpreparemergepage.hxx b/sw/source/ui/dbui/mmpreparemergepage.hxx
index 53494b3..99f44a3 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.hxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.hxx
@@ -28,9 +28,7 @@
#define _MAILMERGEPREPAREMERGEPAGE_HXX
#include <svtools/wizardmachine.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/field.hxx>
#include <svtools/stdctrl.hxx>
#include <mailmergehelper.hxx>
diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx
index fe3721c..9bf0ce5 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.hxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.hxx
@@ -29,9 +29,7 @@
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index 55f238f..38e9528 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.hxx
@@ -28,13 +28,9 @@
#define _ROMENU_HXX
-#ifndef _GRAPH_HXX //autogen
#include <vcl/graph.hxx>
-#endif
#include <tools/list.hxx>
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
class SwView;
class SfxDispatcher;
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 9c45d6b..762b4be 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -33,15 +33,9 @@
#include <svl/svstdarr.hxx>
#endif
#include <svtools/stdctrl.hxx>
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _MENUBTN_HXX //autogen
#include <vcl/menubtn.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#include "envlop.hxx"
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 0ac2d90..cebbf0a 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -34,9 +34,7 @@
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index e64f7d7..9697ca5 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -30,9 +30,7 @@
#include <vcl/group.hxx>
#include <vcl/field.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 88ffe34..52333c8 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -29,9 +29,7 @@
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include "condedit.hxx"
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 655a1e7..cd816b9 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -30,9 +30,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index baa011f..86b29a7 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -30,9 +30,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/edit.hxx>
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index b7024d6..6c41f4a 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -30,9 +30,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/edit.hxx>
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 01d07e8..f55230a 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -30,9 +30,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/group.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/edit.hxx>
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/ui/inc/DropDownFieldDialog.hxx
index 3308f5e..37ee285 100644
--- a/sw/source/ui/inc/DropDownFieldDialog.hxx
+++ b/sw/source/ui/inc/DropDownFieldDialog.hxx
@@ -30,9 +30,7 @@
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
class SwDropDownField;
class SwField;
diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
index cc7462f..0117331 100644
--- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
@@ -29,9 +29,7 @@
#define SW_SPELL_DIALOG_CHILD_WINDOW_HXX
#include <svx/SpellDialogChildWindow.hxx>
-#ifndef _VIEW_HXX
#include <view.hxx>
-#endif
class SwWrtShell;
struct SpellState;
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx
index 2df6f6c..aefe8eb 100644
--- a/sw/source/ui/inc/abstract.hxx
+++ b/sw/source/ui/inc/abstract.hxx
@@ -29,17 +29,11 @@
#include <sfx2/basedlgs.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
/*-----------------22.02.97 15.06-------------------
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx
index 3015667..bd97846 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/ui/inc/actctrl.hxx
@@ -27,9 +27,7 @@
#ifndef _ACTCTRL_HXX
#define _ACTCTRL_HXX
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include "swdllapi.h"
/*--------------------------------------------------------------------
diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx
index 0bdec40..7ae9102 100644
--- a/sw/source/ui/inc/ascfldlg.hxx
+++ b/sw/source/ui/inc/ascfldlg.hxx
@@ -28,9 +28,7 @@
#define _ASCFLDLG_HXX
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <sfx2/basedlgs.hxx>
#include <svx/txencbox.hxx>
diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/ui/inc/autoedit.hxx
index ab9a16f..3ca677c 100644
--- a/sw/source/ui/inc/autoedit.hxx
+++ b/sw/source/ui/inc/autoedit.hxx
@@ -27,9 +27,7 @@
#ifndef _AUTOEDIT_HXX
#define _AUTOEDIT_HXX
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
class AutoEdit : public Edit
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx
index 8f60ed3..83f3baf 100644
--- a/sw/source/ui/inc/bmpwin.hxx
+++ b/sw/source/ui/inc/bmpwin.hxx
@@ -28,12 +28,8 @@
#ifndef _BMPWIN_HXX
#define _BMPWIN_HXX
-#ifndef _GRAPH_HXX //autogen
#include <vcl/graph.hxx>
-#endif
-#ifndef _BITMAPEX_HXX
#include <vcl/bitmapex.hxx>
-#endif
#include <vcl/window.hxx>
/*--------------------------------------------------------------------
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index b6678c4..2caca8f 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -30,9 +30,7 @@
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include "swlbox.hxx" // SwComboBox
diff --git a/sw/source/ui/inc/break.hxx b/sw/source/ui/inc/break.hxx
index eab0047..462ad41 100644
--- a/sw/source/ui/inc/break.hxx
+++ b/sw/source/ui/inc/break.hxx
@@ -29,21 +29,13 @@
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
class SwWrtShell;
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index 7720f6e..90c34fa 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.hxx
@@ -28,15 +28,9 @@
#define _CHANGEDB_HXX
-#ifndef _BITMAP_HXX //autogen
#include <vcl/bitmap.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include <svtools/svtreebx.hxx>
#include <svx/stddlg.hxx>
diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx
index 7381eb3..078a79b 100644
--- a/sw/source/ui/inc/chrdlg.hxx
+++ b/sw/source/ui/inc/chrdlg.hxx
@@ -28,29 +28,17 @@
#define _SWCHARDLG_HXX
#include <sfx2/tabdlg.hxx>
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
class SwView;
class SvxMacroItem;
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index 9697900..3581440 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.hxx
@@ -29,21 +29,13 @@
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 7da3712..838ef81 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -29,28 +29,14 @@
#define _COLUMN_HXX
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
#include <svtools/ctrlbox.hxx>
#include <svtools/valueset.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx
index ad8c9b1..575667f 100644
--- a/sw/source/ui/inc/condedit.hxx
+++ b/sw/source/ui/inc/condedit.hxx
@@ -27,9 +27,7 @@
#ifndef _CONDEDTI_HXX
#define _CONDEDTI_HXX
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <svtools/transfer.hxx>
#include "swdllapi.h"
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 12d4f35..8b7f398 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -29,9 +29,7 @@
#include <limits.h> // USHRT_MAX
#include "swcont.hxx"
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
class SwWrtShell;
class SwContentArr;
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx
index 5b80bdc..8503f67 100644
--- a/sw/source/ui/inc/convert.hxx
+++ b/sw/source/ui/inc/convert.hxx
@@ -28,9 +28,7 @@
#define _SW_CONVERT_HXX
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <sfx2/basedlgs.hxx>
#include <textcontrolcombo.hxx>
diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx
index 96b0bd0..856042c 100644
--- a/sw/source/ui/inc/cption.hxx
+++ b/sw/source/ui/inc/cption.hxx
@@ -29,25 +29,15 @@
#include <svx/stddlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <actctrl.hxx>
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 737825f..b3dd9f3 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -29,18 +29,10 @@
#define _DBINSDLG_HXX
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <svtools/svmedit.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/ui/inc/dbui.hxx
index fda4821..8b096e9 100644
--- a/sw/source/ui/inc/dbui.hxx
+++ b/sw/source/ui/inc/dbui.hxx
@@ -29,9 +29,7 @@
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/ui/inc/docstdlg.hxx
index db7d707..44fd105 100644
--- a/sw/source/ui/inc/docstdlg.hxx
+++ b/sw/source/ui/inc/docstdlg.hxx
@@ -29,9 +29,7 @@
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/stdctrl.hxx>
#include "docstat.hxx"
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/ui/inc/drpcps.hxx
index 4213263..1ff2462 100644
--- a/sw/source/ui/inc/drpcps.hxx
+++ b/sw/source/ui/inc/drpcps.hxx
@@ -30,25 +30,15 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
class SwWrtShell;
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx
index 0e9f584..491cfa3 100644
--- a/sw/source/ui/inc/envlop.hxx
+++ b/sw/source/ui/inc/envlop.hxx
@@ -27,26 +27,16 @@
#ifndef _ENVLOP_HXX
#define _ENVLOP_HXX
-#ifndef _SV_MEDIT_HXX
#include <svtools/svmedit.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
#include "envimg.hxx"
diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx
index 5efa162..1c8cb02 100644
--- a/sw/source/ui/inc/formedt.hxx
+++ b/sw/source/ui/inc/formedt.hxx
@@ -29,21 +29,13 @@
#include <svx/stddlg.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include "toxe.hxx"
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx
index a858c23..c900861 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/ui/inc/frmpage.hxx
@@ -28,27 +28,17 @@
#ifndef _FRMPAGE_HXX
#define _FRMPAGE_HXX
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <sfx2/tabdlg.hxx>
#include <svx/swframeposstrings.hxx>
#include <swtypes.hxx>
#include <bmpwin.hxx>
#include <svx/swframeexample.hxx>
#include <prcntfld.hxx>
-#ifndef _GLOBALS_HRC
#include <globals.hrc>
-#endif
namespace sfx2{class FileDialogHelper;}
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index ee8b73a..7464249 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -28,19 +28,13 @@
#ifndef _GLOSBIB_HXX
#define _GLOSBIB_HXX
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <svx/stddlg.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <svtools/svtabbx.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
class SwGlossaryHdl;
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index 369b4d1..b1e32d8 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -27,32 +27,20 @@
#ifndef _GLOSSARY_HXX
#define _GLOSSARY_HXX
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <svtools/svtreebx.hxx>
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
-#ifndef _MENUBTN_HXX //autogen
#include <vcl/menubtn.hxx>
-#endif
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx
index 5c19fcc..dbfea2f 100644
--- a/sw/source/ui/inc/inpdlg.hxx
+++ b/sw/source/ui/inc/inpdlg.hxx
@@ -29,13 +29,9 @@
#include <svx/stddlg.hxx>
-#ifndef _SV_SVMEDIT_HXX //autogen
#include <svtools/svmedit.hxx>
-#endif
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
class SwInputField;
class SwSetExpField;
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx
index 5b88d13..99395a1 100644
--- a/sw/source/ui/inc/inputwin.hxx
+++ b/sw/source/ui/inc/inputwin.hxx
@@ -28,16 +28,10 @@
#define SW_INPUTWIN_HXX
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
#include <sfx2/childwin.hxx>
-#ifndef _TOOLBOX_HXX //autogen
#include <vcl/toolbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
class SwFldMgr;
class SwWrtShell;
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx
index 7ff65ce..01ec9a6 100644
--- a/sw/source/ui/inc/insfnote.hxx
+++ b/sw/source/ui/inc/insfnote.hxx
@@ -29,13 +29,9 @@
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <vcl/fixed.hxx>
class SwWrtShell;
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx
index 4782108..9408a87 100644
--- a/sw/source/ui/inc/instable.hxx
+++ b/sw/source/ui/inc/instable.hxx
@@ -27,18 +27,10 @@
#ifndef _INSTABLE_HXX
#define _INSTABLE_HXX
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
#include <actctrl.hxx>
#include <textcontrolcombo.hxx>
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index 7eadaa7..9d63bc0 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -31,21 +31,13 @@
#include <svx/stddlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _SV_SVMEDIT_HXX //autogen
#include <svtools/svmedit.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
class SwWrtShell;
class SwFldMgr;
diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx
index 75b358d..7d6d0aa 100644
--- a/sw/source/ui/inc/linenum.hxx
+++ b/sw/source/ui/inc/linenum.hxx
@@ -33,9 +33,7 @@
#include <vcl/field.hxx>
#include <numberingtypelistbox.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
class Window;
class SfxItemSet;
diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/ui/inc/mailconfigpage.hxx
index ef0d409..0316cf0 100644
--- a/sw/source/ui/inc/mailconfigpage.hxx
+++ b/sw/source/ui/inc/mailconfigpage.hxx
@@ -28,18 +28,10 @@
#define _MAILCONFIGPAGE_HXX
#include <sfx2/tabdlg.hxx>
-#ifndef _BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
#include <sfx2/basedlgs.hxx>
class SwTestAccountSettingsDialog;
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx
index 6c43449..b1ef415 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/ui/inc/mailmrge.hxx
@@ -29,25 +29,15 @@
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Reference.h>
diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx
index 0f57a98..df73a8b 100644
--- a/sw/source/ui/inc/mergetbl.hxx
+++ b/sw/source/ui/inc/mergetbl.hxx
@@ -27,13 +27,9 @@
#ifndef _MERGETBL_HXX
#define _MERGETBL_HXX
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svx/stddlg.hxx>
diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/ui/inc/multmrk.hxx
index e42c072..9051096 100644
--- a/sw/source/ui/inc/multmrk.hxx
+++ b/sw/source/ui/inc/multmrk.hxx
@@ -31,19 +31,13 @@
#include <svx/stddlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
class SwTOXMgr;
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 9e38b25..4588124 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -29,9 +29,7 @@
// INCLUDE ---------------------------------------------------------------
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <svl/lstner.hxx>
#include <svtools/transfer.hxx>
#include <sfx2/childwin.hxx>
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 4dd77ff..4b38769 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -29,25 +29,13 @@
#include <sfx2/tabdlg.hxx>
-#ifndef _MENUBTN_HXX //autogen
#include <vcl/menubtn.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
#include <svx/stddlg.hxx>
#include <numprevw.hxx>
#include "numrule.hxx"
diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/ui/inc/numpara.hxx
index 6b62baa..76cc42f 100644
--- a/sw/source/ui/inc/numpara.hxx
+++ b/sw/source/ui/inc/numpara.hxx
@@ -32,9 +32,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
/* --- class SwParagraphNumTabPage ----------------------------------------
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 2e17cb6..86b76ee 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -29,9 +29,7 @@
#include <sfx2/tabdlg.hxx>
-#ifndef _GROUP_HXX
#include <vcl/group.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index 60e15f8..f0aba90 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -28,25 +28,15 @@
#define _OPTPAGE_HXX
#include <sfx2/tabdlg.hxx>
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <svtools/ctrlbox.hxx>
#include <svx/fntctrl.hxx>
#include <fontcfg.hxx>
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index dbe36d9..16c614b 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -32,26 +32,16 @@
#include <vcl/menu.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <svtools/stdctrl.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include "swtypes.hxx" //fuer MAXLEVEL
#include <numprevw.hxx>
diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/ui/inc/pgfnote.hxx
index 9f7a324..5c1787d 100644
--- a/sw/source/ui/inc/pgfnote.hxx
+++ b/sw/source/ui/inc/pgfnote.hxx
@@ -29,17 +29,11 @@
#include <sfx2/tabdlg.hxx>
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
#include <svtools/ctrlbox.hxx>
/*--------------------------------------------------------------------
diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx
index 5317f48..9da32b6 100644
--- a/sw/source/ui/inc/pggrid.hxx
+++ b/sw/source/ui/inc/pggrid.hxx
@@ -29,12 +29,8 @@
#include <sfx2/tabdlg.hxx>
#include <colex.hxx>
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
#include <svtools/ctrlbox.hxx>
/*--------------------------------------------------------------------
Description: TabPage Format/(Styles/)Page/Text grid
diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/ui/inc/popbox.hxx
index 378961f..35bf55e 100644
--- a/sw/source/ui/inc/popbox.hxx
+++ b/sw/source/ui/inc/popbox.hxx
@@ -28,9 +28,7 @@
#define _POPBOX_HXX
-#ifndef _TOOLBOX_HXX
#include <vcl/toolbox.hxx>
-#endif
#include <svtools/transfer.hxx>
class SwNavigationPI;
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/ui/inc/prcntfld.hxx
index f535623..1b9c482 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/ui/inc/prcntfld.hxx
@@ -27,9 +27,7 @@
#ifndef _PRCNTFLD_HXX
#define _PRCNTFLD_HXX
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include "swdllapi.h"
class SW_DLLPUBLIC PercentField : public MetricField
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx
index 5c70eea..cae806f 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/ui/inc/redlndlg.hxx
@@ -31,9 +31,7 @@
#include <redline.hxx>
#include <tools/datetime.hxx>
#include <vcl/msgbox.hxx>
-#ifndef _SVSTDARR_HXX
#include <svl/svstdarr.hxx>
-#endif
#include <svl/eitem.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx
index 5e6e650..3c1c529 100644
--- a/sw/source/ui/inc/rowht.hxx
+++ b/sw/source/ui/inc/rowht.hxx
@@ -29,21 +29,13 @@
#include <svx/stddlg.hxx>
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
class SwWrtShell;
diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/ui/inc/scroll.hxx
index dec1460..2196e86 100644
--- a/sw/source/ui/inc/scroll.hxx
+++ b/sw/source/ui/inc/scroll.hxx
@@ -26,9 +26,7 @@
************************************************************************/
#ifndef _SCROLL_HXX
#define _SCROLL_HXX
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
class SwScrollbar: public ScrollBar
{
diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx
index b5f8190..e6ee79c 100644
--- a/sw/source/ui/inc/selglos.hxx
+++ b/sw/source/ui/inc/selglos.hxx
@@ -27,18 +27,12 @@
#ifndef _SELGLOS_HXX
#define _SELGLOS_HXX
-#ifndef _DIALOG_HXX //autogen
#include <vcl/dialog.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <vcl/fixed.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
class SwSelGlossaryDlg : public ModalDialog
{
diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx
index d058276..99f4bef 100644
--- a/sw/source/ui/inc/split.hxx
+++ b/sw/source/ui/inc/split.hxx
@@ -29,21 +29,13 @@
#include <svx/stddlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
class SwWrtShell;
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx
index 4df24ce..8decd6c 100644
--- a/sw/source/ui/inc/srcedtw.hxx
+++ b/sw/source/ui/inc/srcedtw.hxx
@@ -32,9 +32,7 @@
#include <unotools/options.hxx>
#include <vcl/timer.hxx>
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <svtools/xtextedt.hxx>
class ScrollBar;
diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx
index 76cc70b..caa1e6f 100644
--- a/sw/source/ui/inc/srtdlg.hxx
+++ b/sw/source/ui/inc/srtdlg.hxx
@@ -27,18 +27,10 @@
#ifndef _SRTDLG_HXX
#define _SRTDLG_HXX
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
#include <svx/stddlg.hxx>
#include <svx/langbox.hxx>
diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/ui/inc/stmenu.hxx
index 553f86f..632983c 100644
--- a/sw/source/ui/inc/stmenu.hxx
+++ b/sw/source/ui/inc/stmenu.hxx
@@ -30,16 +30,12 @@
#ifndef _STMENU_HXX
#define _STMENU_HXX
-#ifndef _MENU_HXX //autogen
#include <vcl/menu.hxx>
-#endif
#include <vector>
#include <com/sun/star/smarttags/XSmartTagAction.hpp>
-#ifndef _COM_SUN_STAR_SMARTTAGS_XSTRINGKEYMAP_HPP_
#include <com/sun/star/container/XStringKeyMap.hpp>
-#endif
#include <com/sun/star/text/XTextRange.hpp>
class SwView;
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 5488f0e..0c6de8f 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -29,13 +29,9 @@
#include <svl/svarray.hxx>
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
#include "swdllapi.h"
class SwBoxEntry;
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/ui/inc/swrenamexnameddlg.hxx
index b4dbfae..ff1dbb7 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/ui/inc/swrenamexnameddlg.hxx
@@ -31,9 +31,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <actctrl.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 5bb2471..4b32970 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -29,21 +29,13 @@
#include <svx/stddlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _EDIT_HXX //autogen
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index de05db1..a23f8ed 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.hxx
@@ -30,30 +30,18 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <sfx2/basedlgs.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
#include <vcl/lstbox.hxx>
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
#include <svx/stddlg.hxx>
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
#include <vcl/group.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
#include <sfx2/childwin.hxx>
#include "toxe.hxx"
#include <svtools/stdctrl.hxx>
diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/ui/inc/syncbtn.hxx
index bd99b18..e8fc502 100644
--- a/sw/source/ui/inc/syncbtn.hxx
+++ b/sw/source/ui/inc/syncbtn.hxx
@@ -31,9 +31,7 @@
#ifdef _SYNCDLG
#include <sfx2/basedlgs.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
/*------------------------------------------------------------------------
Beschreibung:
diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx
index ca455b4..0b9e728 100644
--- a/sw/source/ui/inc/tautofmt.hxx
+++ b/sw/source/ui/inc/tautofmt.hxx
@@ -28,25 +28,15 @@
#define SW_TAUTOFMT_HXX
#include <sfx2/basedlgs.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _MOREBTN_HXX //autogen
#include <vcl/morebtn.hxx>
-#endif
-#ifndef _VIRDEV_HXX //autogen
#include <vcl/virdev.hxx>
-#endif
class SwTableAutoFmt;
class AutoFmtPreview;
diff --git a/sw/source/ui/inc/textcontrolcombo.hxx b/sw/source/ui/inc/textcontrolcombo.hxx
index d367cf3..a4de5af 100644
--- a/sw/source/ui/inc/textcontrolcombo.hxx
+++ b/sw/source/ui/inc/textcontrolcombo.hxx
@@ -28,9 +28,7 @@
#ifndef _TEXTCONTROLCOMBO_HXX
#define _TEXTCONTROLCOMBO_HXX
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
#include <vcl/field.hxx>
#include "swdllapi.h"
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx
index 007860d..3d08b6c 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/ui/inc/unotools.hxx
@@ -31,9 +31,7 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <actctrl.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/ui/inc/wordcountdialog.hxx
index d3d7a7d..1102500 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/ui/inc/wordcountdialog.hxx
@@ -28,9 +28,7 @@
#define SW_WORDCOUNTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <layout/layout.hxx>
#include <layout/layout-pre.hxx>
struct SwDocStat;
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 6996ea1..66cf6e9 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -30,9 +30,7 @@
#include <sfx2/tbxctrl.hxx>
#include <vcl/toolbox.hxx>
#include <svtools/stdctrl.hxx>
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
class PopupMenu;
class SwView;
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/ui/inc/wrap.hxx
index 4748606..d37cee6 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/ui/inc/wrap.hxx
@@ -30,21 +30,13 @@
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
class Window;
class SfxItemSet;
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 0ea2140..36450eb 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -28,18 +28,10 @@
#define _IMPFNOTE_HXX
#include <sfx2/tabdlg.hxx>
-#ifndef _BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
#include <vcl/field.hxx>
-#endif
#include <numberingtypelistbox.hxx>
class SwWrtShell;
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index f4b00f5..82d172b 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -27,15 +27,9 @@
#ifndef _SWTABLEPG_HXX
#define _SWTABLEPG_HXX
#include <sfx2/tabdlg.hxx>
-#ifndef _FIXED_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _IMAGEBTN_HXX //autogen
#include <vcl/imagebtn.hxx>
-#endif
-#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
-#endif
#include <actctrl.hxx>
#include "prcntfld.hxx"
#include "swtypes.hxx"
diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/ui/uno/SwXDocumentSettings.hxx
index b9eb996..ea5c80b 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.hxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.hxx
@@ -32,12 +32,8 @@
#include "ui_pch.hxx"
#endif
-#ifndef _COMPHELPER_MASTERPROPERTYSET_HXX_
#include <comphelper/MasterPropertySet.hxx>
-#endif
-#ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP
#include <com/sun/star/text/XTextDocument.hpp>
-#endif
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx>
diff --git a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
index 8cbc3e0..6c408ae 100644
--- a/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
+++ b/sw/source/ui/uno/SwXPrintPreviewSettings.hxx
@@ -31,9 +31,7 @@
#include "ui_pch.hxx"
#endif
#include <comphelper/ChainablePropertySet.hxx>
-#ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP
#include <com/sun/star/text/XTextDocument.hpp>
-#endif
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
commit 2d95c5e1c4c4439d1b83b0681ab87403fdbaa540
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Oct 4 17:00:08 2010 +0200
remove include guards using fixguard.py
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index b06be09..0aba7b0 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -44,9 +44,7 @@
#include "config.hxx"
#include "format.hxx"
#include "smmod.hxx"
-#ifndef _STARMATH_HRC
#include "starmath.hrc"
-#endif
/////////////////////////////////////////////////////////////////
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index a929045..de245e3 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -52,9 +52,7 @@
#include "config.hxx"
#include "dialog.hxx"
-#ifndef _STARMATH_HRC
#include "starmath.hrc"
-#endif
#include "dialog.hrc"
#include "smmod.hxx"
diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx
index 95eb42a..288e5ea 100644
--- a/starmath/source/math_pch.cxx
+++ b/starmath/source/math_pch.cxx
@@ -167,570 +167,194 @@
#include <svx/xpoly.hxx>
#include <rect.hxx>
#include <vcl/outdev.hxx>
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HXX_
#include <smart/com/sun/star/frame/XDispatchProviderInterceptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCH_HXX_
#include <smart/com/sun/star/frame/XDispatch.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HXX_
#include <smart/com/sun/star/frame/XDispatchProvider.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XSTATUSLISTENER_HXX_
#include <smart/com/sun/star/frame/XStatusListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HXX_
#include <smart/com/sun/star/frame/FrameSearchFlag.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTION_HXX_
#include <smart/com/sun/star/frame/XDispatchProviderInterception.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FEATURESTATEEVENT_HXX_
#include <smart/com/sun/star/frame/FeatureStateEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_DISPATCHDESCRIPTOR_HXX_
#include <smart/com/sun/star/frame/DispatchDescriptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAMEACTIONLISTENER_HXX_
#include <smart/com/sun/star/frame/XFrameActionListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HXX_
#include <smart/com/sun/star/frame/XComponentLoader.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XFRAME_HXX_
#include <smart/com/sun/star/frame/XFrame.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTIONEVENT_HXX_
#include <smart/com/sun/star/frame/FrameActionEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_FRAMEACTION_HXX_
#include <smart/com/sun/star/frame/FrameAction.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_UTIL_XURLTRANSFORMER_HXX_
#include <smart/com/sun/star/util/XURLTransformer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORFACTORY_HXX_
#include <smart/com/sun/star/task/XStatusIndicatorFactory.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATORSUPPLIER_HXX_
#include <smart/com/sun/star/task/XStatusIndicatorSupplier.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_TASK_XSTATUSINDICATOR_HXX_
#include <smart/com/sun/star/task/XStatusIndicator.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_FRAME_XBROWSEHISTORYREGISTRY_HXX_
#include <smart/com/sun/star/frame/XBrowseHistoryRegistry.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_BUFFERSIZEEXCEEDEDEXCEPTION_HXX_
#include <smart/com/sun/star/io/BufferSizeExceededException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_NOTCONNECTEDEXCEPTION_HXX_
#include <smart/com/sun/star/io/NotConnectedException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_IOEXCEPTION_HXX_
#include <smart/com/sun/star/io/IOException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_UNEXPECTEDEOFEXCEPTION_HXX_
#include <smart/com/sun/star/io/UnexpectedEOFException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_IO_WRONGFORMATEXCEPTION_HXX_
#include <smart/com/sun/star/io/WrongFormatException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HXX_
#include <smart/com/sun/star/lang/ServiceNotRegisteredException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NULLPOINTEREXCEPTION_HXX_
#include <smart/com/sun/star/lang/NullPointerException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_CLASSNOTFOUNDEXCEPTION_HXX_
#include <smart/com/sun/star/lang/ClassNotFoundException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHMETHODEXCEPTION_HXX_
#include <smart/com/sun/star/lang/NoSuchMethodException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_SECURITYEXCEPTION_HXX_
#include <smart/com/sun/star/lang/SecurityException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NOSUCHFIELDEXCEPTION_HXX_
#include <smart/com/sun/star/lang/NoSuchFieldException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HXX_
#include <smart/com/sun/star/lang/DisposedException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_ARRAYINDEXOUTOFBOUNDSEXCEPTION_HXX_
#include <smart/com/sun/star/lang/ArrayIndexOutOfBoundsException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HXX_
#include <smart/com/sun/star/lang/IllegalAccessException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_INDEXOUTOFBOUNDSEXCEPTION_HXX_
#include <smart/com/sun/star/lang/IndexOutOfBoundsException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HXX_
#include <smart/com/sun/star/lang/IllegalArgumentException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_NOSUPPORTEXCEPTION_HXX_
#include <smart/com/sun/star/lang/NoSupportException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_WRAPPEDTARGETEXCEPTION_HXX_
#include <smart/com/sun/star/lang/WrappedTargetException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMINFO_HXX_
#include <smart/com/sun/star/reflection/ParamInfo.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLARRAY_HXX_
#include <smart/com/sun/star/reflection/XIdlArray.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASSPROVIDER_HXX_
#include <smart/com/sun/star/reflection/XIdlClassProvider.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_FIELDACCESSMODE_HXX_
#include <smart/com/sun/star/reflection/FieldAccessMode.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLCLASS_HXX_
#include <smart/com/sun/star/reflection/XIdlClass.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLFIELD_HXX_
#include <smart/com/sun/star/reflection/XIdlField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_PARAMMODE_HXX_
#include <smart/com/sun/star/reflection/ParamMode.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_METHODMODE_HXX_
#include <smart/com/sun/star/reflection/MethodMode.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMEMBER_HXX_
#include <smart/com/sun/star/reflection/XIdlMember.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLREFLECTION_HXX_
#include <smart/com/sun/star/reflection/XIdlReflection.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_XIDLMETHOD_HXX_
#include <smart/com/sun/star/reflection/XIdlMethod.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_REFLECTION_INVOCATIONTARGETEXCEPTION_HXX_
#include <smart/com/sun/star/reflection/InvocationTargetException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUES_HXX_
#include <smart/com/sun/star/beans/PropertyValues.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSET_HXX_
#include <smart/com/sun/star/beans/XPropertySet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_
#include <smart/com/sun/star/beans/PropertyValue.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATE_HXX_
#include <smart/com/sun/star/beans/PropertyState.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HXX_
#include <smart/com/sun/star/beans/XPropertySetInfo.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XMULTIPROPERTYSET_HXX_
#include <smart/com/sun/star/beans/XMultiPropertySet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HXX_
#include <smart/com/sun/star/beans/XFastPropertySet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HXX_
#include <smart/com/sun/star/beans/XVetoableChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATE_HXX_
#include <smart/com/sun/star/beans/XPropertyState.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYSTATECHANGELISTENER_HXX_
#include <smart/com/sun/star/beans/XPropertyStateChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HXX_
#include <smart/com/sun/star/beans/PropertyAttribute.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTIESCHANGELISTENER_HXX_
#include <smart/com/sun/star/beans/XPropertiesChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HXX_
#include <smart/com/sun/star/beans/XPropertyChangeListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYACCESS_HXX_
#include <smart/com/sun/star/beans/XPropertyAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HXX_
#include <smart/com/sun/star/beans/XPropertyContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYSTATECHANGEEVENT_HXX_
#include <smart/com/sun/star/beans/PropertyStateChangeEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYCHANGEEVENT_HXX_
#include <smart/com/sun/star/beans/PropertyChangeEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_UNKNOWNPROPERTYEXCEPTION_HXX_
#include <smart/com/sun/star/beans/UnknownPropertyException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_INTROSPECTIONEXCEPTION_HXX_
#include <smart/com/sun/star/beans/IntrospectionException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYEXISTEXCEPTION_HXX_
#include <smart/com/sun/star/beans/PropertyExistException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_ILLEGALTYPEEXCEPTION_HXX_
#include <smart/com/sun/star/beans/IllegalTypeException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_BEANS_PROPERTYVETOEXCEPTION_HXX_
#include <smart/com/sun/star/beans/PropertyVetoException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HXX_
#include <smart/com/sun/star/container/XEnumerationAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HXX_
#include <smart/com/sun/star/container/XHierarchicalNameAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XNAMEACCESS_HXX_
#include <smart/com/sun/star/container/XNameAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCONTENTENUMERATIONACCESS_HXX_
#include <smart/com/sun/star/container/XContentEnumerationAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XENUMERATION_HXX_
#include <smart/com/sun/star/container/XEnumeration.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XELEMENTACCESS_HXX_
#include <smart/com/sun/star/container/XElementAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XINDEXACCESS_HXX_
#include <smart/com/sun/star/container/XIndexAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_XEVENTLISTENER_HXX_
#include <smart/com/sun/star/lang/XEventListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_EVENTOBJECT_HXX_
#include <smart/com/sun/star/lang/EventObject.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENERADAPTERSERVICE_HXX_
#include <smart/com/sun/star/script/XAllListenerAdapterService.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_SCRIPT_XALLLISTENER_HXX_
#include <smart/com/sun/star/script/XAllListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_SCRIPT_ALLEVENTOBJECT_HXX_
#include <smart/com/sun/star/script/AllEventObject.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATION_HXX_
#include <smart/com/sun/star/container/XComponentEnumeration.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_XCOMPONENT_HXX_
#include <smart/com/sun/star/lang/XComponent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_XCOMPONENTENUMERATIONACCESS_HXX_
#include <smart/com/sun/star/container/XComponentEnumerationAccess.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_LISTENEREXISTEXCEPTION_HXX_
#include <smart/com/sun/star/lang/ListenerExistException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_ELEMENTEXISTEXCEPTION_HXX_
#include <smart/com/sun/star/container/ElementExistException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_LANG_INVALIDLISTENEREXCEPTION_HXX_
#include <smart/com/sun/star/lang/InvalidListenerException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_CONTAINER_NOSUCHELEMENTEXCEPTION_HXX_
#include <smart/com/sun/star/container/NoSuchElementException.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XKEYLISTENER_HXX_
#include <smart/com/sun/star/awt/XKeyListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPAINTLISTENER_HXX_
#include <smart/com/sun/star/awt/XPaintListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYEVENT_HXX_
#include <smart/com/sun/star/awt/KeyEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYMODIFIER_HXX_
#include <smart/com/sun/star/awt/KeyModifier.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSEMOTIONLISTENER_HXX_
#include <smart/com/sun/star/awt/XMouseMotionListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSEVENT_HXX_
#include <smart/com/sun/star/awt/FocusEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWLISTENER_HXX_
#include <smart/com/sun/star/awt/XWindowListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XACTIVATELISTENER_HXX_
#include <smart/com/sun/star/awt/XActivateListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEEVENT_HXX_
#include <smart/com/sun/star/awt/MouseEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOWLISTENER_HXX_
#include <smart/com/sun/star/awt/XTopWindowListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_PAINTEVENT_HXX_
#include <smart/com/sun/star/awt/PaintEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_INPUTEVENT_HXX_
#include <smart/com/sun/star/awt/InputEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYGROUP_HXX_
#include <smart/com/sun/star/awt/KeyGroup.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEY_HXX_
#include <smart/com/sun/star/awt/Key.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWEVENT_HXX_
#include <smart/com/sun/star/awt/WindowEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XMOUSELISTENER_HXX_
#include <smart/com/sun/star/awt/XMouseListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_KEYFUNCTION_HXX_
#include <smart/com/sun/star/awt/KeyFunction.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FOCUSCHANGEREASON_HXX_
#include <smart/com/sun/star/awt/FocusChangeReason.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_MOUSEBUTTON_HXX_
#include <smart/com/sun/star/awt/MouseButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFOCUSLISTENER_HXX_
#include <smart/com/sun/star/awt/XFocusListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XADJUSTMENTLISTENER_HXX_
#include <smart/com/sun/star/awt/XAdjustmentListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XACTIONLISTENER_HXX_
#include <smart/com/sun/star/awt/XActionListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLISTENER_HXX_
#include <smart/com/sun/star/awt/XTextListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSPINLISTENER_HXX_
#include <smart/com/sun/star/awt/XSpinListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XITEMLISTENER_HXX_
#include <smart/com/sun/star/awt/XItemListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERLISTENER_HXX_
#include <smart/com/sun/star/awt/XVclContainerListener.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFILEDIALOG_HXX_
#include <smart/com/sun/star/awt/XFileDialog.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTCOMPONENT_HXX_
#include <smart/com/sun/star/awt/XTextComponent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XLISTBOX_HXX_
#include <smart/com/sun/star/awt/XListBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSMONITOR_HXX_
#include <smart/com/sun/star/awt/XProgressMonitor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_TEXTALIGN_HXX_
#include <smart/com/sun/star/awt/TextAlign.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSCROLLBAR_HXX_
#include <smart/com/sun/star/awt/XScrollBar.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINERPEER_HXX_
#include <smart/com/sun/star/awt/XVclContainerPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLERMODEL_HXX_
#include <smart/com/sun/star/awt/XTabControllerModel.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XMESSAGEBOX_HXX_
#include <smart/com/sun/star/awt/XMessageBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTEDITFIELD_HXX_
#include <smart/com/sun/star/awt/XTextEditField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_STYLE_HXX_
#include <smart/com/sun/star/awt/Style.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTIMEFIELD_HXX_
#include <smart/com/sun/star/awt/XTimeField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLWINDOWPEER_HXX_
#include <smart/com/sun/star/awt/XVclWindowPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLMODEL_HXX_
#include <smart/com/sun/star/awt/XControlModel.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSPINFIELD_HXX_
#include <smart/com/sun/star/awt/XSpinField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XUNOCONTROLCONTAINER_HXX_
#include <smart/com/sun/star/awt/XUnoControlContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTLAYOUTCONSTRAINS_HXX_
#include <smart/com/sun/star/awt/XTextLayoutConstrains.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XNUMERICFIELD_HXX_
#include <smart/com/sun/star/awt/XNumericField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XBUTTON_HXX_
#include <smart/com/sun/star/awt/XButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTEXTAREA_HXX_
#include <smart/com/sun/star/awt/XTextArea.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XIMAGEBUTTON_HXX_
#include <smart/com/sun/star/awt/XImageButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFIXEDTEXT_HXX_
#include <smart/com/sun/star/awt/XFixedText.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROLCONTAINER_HXX_
#include <smart/com/sun/star/awt/XControlContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XDIALOG_HXX_
#include <smart/com/sun/star/awt/XDialog.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SCROLLBARORIENTATION_HXX_
#include <smart/com/sun/star/awt/ScrollBarOrientation.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XRADIOBUTTON_HXX_
#include <smart/com/sun/star/awt/XRadioButton.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCURRENCYFIELD_HXX_
#include <smart/com/sun/star/awt/XCurrencyField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPATTERNFIELD_HXX_
#include <smart/com/sun/star/awt/XPatternField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_VCLWINDOWPEERATTRIBUTE_HXX_
#include <smart/com/sun/star/awt/VclWindowPeerAttribute.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTABCONTROLLER_HXX_
#include <smart/com/sun/star/awt/XTabController.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVCLCONTAINER_HXX_
#include <smart/com/sun/star/awt/XVclContainer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XDATEFIELD_HXX_
#include <smart/com/sun/star/awt/XDateField.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCOMBOBOX_HXX_
#include <smart/com/sun/star/awt/XComboBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCONTROL_HXX_
#include <smart/com/sun/star/awt/XControl.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XCHECKBOX_HXX_
#include <smart/com/sun/star/awt/XCheckBox.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_MESSAGEBOXCOMMAND_HXX_
#include <smart/com/sun/star/awt/MessageBoxCommand.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XLAYOUTCONSTRAINS_HXX_
#include <smart/com/sun/star/awt/XLayoutConstrains.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPROGRESSBAR_HXX_
#include <smart/com/sun/star/awt/XProgressBar.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SIMPLEFONTMETRIC_HXX_
#include <smart/com/sun/star/awt/SimpleFontMetric.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTWEIGHT_HXX_
#include <smart/com/sun/star/awt/FontWeight.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTSLANT_HXX_
#include <smart/com/sun/star/awt/FontSlant.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_CHARSET_HXX_
#include <smart/com/sun/star/awt/CharSet.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTDESCRIPTOR_HXX_
#include <smart/com/sun/star/awt/FontDescriptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTWIDTH_HXX_
#include <smart/com/sun/star/awt/FontWidth.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XFONT_HXX_
#include <smart/com/sun/star/awt/XFont.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTTYPE_HXX_
#include <smart/com/sun/star/awt/FontType.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTUNDERLINE_HXX_
#include <smart/com/sun/star/awt/FontUnderline.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTSTRIKEOUT_HXX_
#include <smart/com/sun/star/awt/FontStrikeout.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTFAMILY_HXX_
#include <smart/com/sun/star/awt/FontFamily.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_FONTPITCH_HXX_
#include <smart/com/sun/star/awt/FontPitch.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTOPWINDOW_HXX_
#include <smart/com/sun/star/awt/XTopWindow.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOW_HXX_
#include <smart/com/sun/star/awt/XWindow.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_POSSIZE_HXX_
#include <smart/com/sun/star/awt/PosSize.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_VCLCONTAINEREVENT_HXX_
#include <smart/com/sun/star/awt/VclContainerEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ITEMEVENT_HXX_
#include <smart/com/sun/star/awt/ItemEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SPINEVENT_HXX_
#include <smart/com/sun/star/awt/SpinEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_TEXTEVENT_HXX_
#include <smart/com/sun/star/awt/TextEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTTYPE_HXX_
#include <smart/com/sun/star/awt/AdjustmentType.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ACTIONEVENT_HXX_
#include <smart/com/sun/star/awt/ActionEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_ADJUSTMENTEVENT_HXX_
#include <smart/com/sun/star/awt/AdjustmentEvent.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_RECTANGLE_HXX_
#include <smart/com/sun/star/awt/Rectangle.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SELECTION_HXX_
#include <smart/com/sun/star/awt/Selection.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SIZE_HXX_
#include <smart/com/sun/star/awt/Size.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWDESCRIPTOR_HXX_
#include <smart/com/sun/star/awt/WindowDescriptor.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_INVALIDATESTYLE_HXX_
#include <smart/com/sun/star/awt/InvalidateStyle.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XTOOLKIT_HXX_
#include <smart/com/sun/star/awt/XToolkit.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XWINDOWPEER_HXX_
#include <smart/com/sun/star/awt/XWindowPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWCLASS_HXX_
#include <smart/com/sun/star/awt/WindowClass.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XSYSTEMDEPENDENTWINDOWPEER_HXX_
#include <smart/com/sun/star/awt/XSystemDependentWindowPeer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_WINDOWATTRIBUTE_HXX_
#include <smart/com/sun/star/awt/WindowAttribute.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XPOINTER_HXX_
#include <smart/com/sun/star/awt/XPointer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_SYSTEMPOINTER_HXX_
#include <smart/com/sun/star/awt/SystemPointer.hxx>
-#endif
-#ifndef _SMART_COM_SUN_STAR_AWT_XVIEW_HXX_
#include <smart/com/sun/star/awt/XView.hxx>
-#endif
#include <usr/refl.hxx>
#include <sfx2/msg.hxx>
#include <svl/itemset.hxx>
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 46088ee..6afd069 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -31,9 +31,7 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include <mathtype.hxx>
-#ifndef _TOOLS_DEBUG_H
#include <tools/debug.hxx>
-#endif
#include <sfx2/docfile.hxx>
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 4409d4f..17df7d2 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -39,12 +39,8 @@
#include <editeng/unolingu.hxx>
#include <unotools/syslocale.hxx>
#include "parse.hxx"
-#ifndef _STARMATH_HRC
#include "starmath.hrc"
-#endif
-#ifndef _SMDLL_HXX
#include "smdll.hxx"
-#endif
#include "smmod.hxx"
#include "config.hxx"
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 8f39de2..423b489 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -37,9 +37,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -50,9 +48,7 @@
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <framework/interaction.hxx>
-#ifndef _TOOLKIT_UNOHLP_HXX
#include <toolkit/helper/vclunohelper.hxx>
-#endif
#include <ucbhelper/simpleinteractionrequest.hxx>
#include <rtl/ustring.h>
diff --git a/starmath/source/smdll.cxx b/starmath/source/smdll.cxx
index 20c0713..3807814 100644
--- a/starmath/source/smdll.cxx
+++ b/starmath/source/smdll.cxx
@@ -30,9 +30,7 @@
#include <sot/factory.hxx>
-#ifndef _SVX_SVXIDS_HRC //autogen
#include <svx/svxids.hrc>
-#endif
#include <svx/modctrl.hxx>
#include <svx/zoomctrl.hxx>
#include <sfx2/docfac.hxx>
@@ -42,16 +40,12 @@
#include <sfx2/app.hxx>
#include <sfx2/taskpane.hxx>
-#ifndef _SMDLL_HXX
#include <smdll.hxx>
-#endif
#include <document.hxx>
#include <toolbox.hxx>
#include <view.hxx>
-#ifndef _STARMATH_HRC
#include <starmath.hrc>
-#endif
#include <svx/xmlsecctrl.hxx>
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 076136a..6b62627 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -39,9 +39,7 @@
#include <sfx2/sfx.hrc>
#include <sfx2/viewsh.hxx>
#include <vcl/wrkwin.hxx>
-#ifndef _SVX_SVXIDS_HRC //autogen
#include <svx/svxids.hrc>
-#endif
#include <vcl/msgbox.hxx>
#include <vcl/virdev.hxx>
#include <unotools/syslocale.hxx>
@@ -49,9 +47,7 @@
#include "smmod.hxx"
#include "symbol.hxx"
#include "config.hxx"
-#ifndef _DIALOG_HXX
#include "dialog.hxx"
-#endif
#include "edit.hxx"
#include "view.hxx"
#include "starmath.hrc"
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index d5995e1..5afa0f7 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -38,12 +38,8 @@
#include <sfx2/imgmgr.hxx>
#include <vcl/wrkwin.hxx>
#include "toolbox.hxx"
-#ifndef _STARMATH_HRC
#include "starmath.hrc"
-#endif
-#ifndef _TOOLBOX_HRC_
#include "toolbox.hrc"
-#endif
#include "view.hxx"
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index eb316ee..f42ab76 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 567426b..401f63a 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 fedc079..10bc71b 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;
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list