From aa42876a0e79444577cdf9a4ca4297b6dd7bf792 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 5 Oct 2010 15:55:31 +0200
Subject: more removed include guards using fixguard.py

---
 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 --
 17 files changed, 38 deletions(-)

(limited to 'sw/inc')

diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 3bd68f869097..4e3b6e9d0713 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 c5d052f660b2..41a8b276bd93 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 d91c20409d0a..eae57515c49c 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 ed6293dcd787..acb44de65839 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 3afb1647f4ad..079ea8d53809 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 2b5ad3fd5203..ca626dbd02ed 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 6b791acf178a..26343f8cfcd1 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 cca6390e9198..19d6bd4a679a 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 3968e58d14b7..544fe992abca 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 d599e1622e6b..761f8d9a9c01 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 b0e6f0fce00b..5426a3bc628e 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 3875c5b1c15e..e1acb2e1725b 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 12e245791f4c..61428a8e7b28 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 d189f3c31349..04ae8c569cc0 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 518d7885422c..ca38b28ca8b3 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 1b1316ce37d1..78e67d483379 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 1a41297abc18..77df07432e6a 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>
-- 
cgit