Remove include guards

Change-Id: Ib4ba76d0083e5bd75cc589a55318089c004f591f

8 files changed, 1 insertions, 26 deletions

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 21b507fbf229..bbf3c76b236a 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -36,9 +36,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <svl/whiter.hxx>
-#ifndef _ZFORLIST_HXX //autogen
 #include <svl/zforlist.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <unotools/misccfg.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 69114a4c8f67..f261f7e36f0c 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -56,9 +56,7 @@
 #include <docary.hxx>            //SwCharFmts
 #include <charfmt.hxx>           //SwCharFmt
 #include <fchrfmt.hxx>           //SwFmtCharFmt
-#ifndef _UNOTOOLS_STREAMWRAP_HXX
 #include <unotools/streamwrap.hxx>
-#endif
 #include <numrule.hxx>
 
 using namespace com::sun::star;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index df0c10bc9494..d29d4f1f2816 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -53,12 +53,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <editeng/editeng.hxx>
-#ifndef _SVX_FLDITEM_HXX
-//miserable hack to get around #98519#
-
 #include <editeng/flditem.hxx>
-#endif
-
 #include <comphelper/seqstream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svx/fmglob.hxx>
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 06bd31a219cb..d6133666918f 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -161,6 +161,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog
                     SwWrtShell &);
         ~SwSvxNumBulletTabDialog();
 };
-#endif // _NUM_CXX
+#endif // _NUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 983bb7eb63c3..912b24b342de 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -21,12 +21,7 @@
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
-
-#define USE_NUMTABPAGES
-#define _NUM_CXX
 #include <hintids.hxx>
-
 #include <vcl/msgbox.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/imgmgr.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index abd58e4496a3..cfa46f51cd1c 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -37,11 +37,7 @@
 #include <editeng/brshitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <SwStyleNameMapper.hxx>
-
-#ifndef _NUM_HXX //autogen
-#define USE_NUMTABPAGES
 #include <num.hxx>
-#endif
 #include <view.hxx>
 #include <docsh.hxx>
 #include <uitool.hxx>
@@ -68,9 +64,7 @@
 #include <IDocumentOutlineNodes.hxx>
 #include <app.hrc>
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 2e14c57d991c..b1884b740ef6 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -27,10 +27,7 @@
  ************************************************************************/
 
 #include <hintids.hxx>
-
-#ifndef _ZFORLIST_HXX
 #include <svl/zforlist.hxx>
-#endif
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 880e0c4d34b0..bdf712cc2fd6 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -32,9 +32,7 @@
 #include <editeng/unolingu.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <i18npool/lang.h>
-#ifndef _ZFORMAT_HXX //autogen
 #include <svl/zformat.hxx>
-#endif
 #include <svl/eitem.hxx>
 #include <svx/svxids.hrc>
 #include <svx/numinf.hxx>