From 488e6875e992e11601611a119476624822fc4635 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Mon, 25 Mar 2013 19:56:20 +0100
Subject: remove external include guards

Change-Id: If5758e02baa8e019923355b6c97043b306223fdd
---
 sw/inc/IDocumentContentOperations.hxx | 2 --
 sw/inc/IDocumentLineNumberAccess.hxx  | 2 --
 sw/inc/IDocumentRedlineAccess.hxx     | 6 ------
 sw/inc/IDocumentStylePoolAccess.hxx   | 2 --
 sw/inc/cmdid.h                        | 3 ---
 sw/source/filter/ww8/wrtww8.cxx       | 3 +--
 6 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'sw')

diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 998bf6f6d349..6f0bf4067b53 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -20,9 +20,7 @@
  #ifndef IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
  #define IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
 
- #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
- #endif
 
  class SwPaM;
  struct SwPosition;
diff --git a/sw/inc/IDocumentLineNumberAccess.hxx b/sw/inc/IDocumentLineNumberAccess.hxx
index d1bc64495b86..6f52af1163ad 100644
--- a/sw/inc/IDocumentLineNumberAccess.hxx
+++ b/sw/inc/IDocumentLineNumberAccess.hxx
@@ -20,9 +20,7 @@
  #ifndef IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED
  #define IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED
 
- #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
- #endif
 
 class SwLineNumberInfo;
 
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 4575cdce8318..29430cb0e17c 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -20,18 +20,12 @@
  #ifndef IDOCUMENTREDLINE_HXX_INCLUDED
  #define IDOCUMENTREDLINE_HXX_INCLUDED
 
- #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
- #endif
- #ifndef _SOLAR_H
  #include <tools/solar.h>
- #endif
 
  #include <limits.h> // USHRT_MAX
 
- #ifndef _COM_SUN_STAR_SEQUENCE_HXX_
  #include <com/sun/star/uno/Sequence.hxx>
- #endif
 
  class SwRedline;
  class SwRedlineTbl;
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index c2fde51960db..66df20626d60 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -20,9 +20,7 @@
  #ifndef IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
  #define IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
 
- #ifndef _SAL_TYPES_H_
  #include <sal/types.h>
- #endif
 
  class SwTxtFmtColl;
  class SwCharFmt;
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 0c31ee9ef930..b7186f0d4577 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -26,10 +26,7 @@ included in c-context files, so c++ style stuff will cause problems.
 #define INCLUDED_SW_CMDID_H
 
 #include <sfx2/sfx.hrc>
-
-#ifndef SW_UNOMID_H
 #include <unomid.h>
-#endif
 
 /* Flags that are being used in the slot definitions for the disable-features */
 #define SW_DISABLE_ON_PROTECTED_CURSOR  0x00000001
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 2aeaf80d5503..a666980a9f00 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -109,9 +109,8 @@
 #include <rtl/random.h>
 #include "WW8Sttbf.hxx"
 #include "WW8FibData.hxx"
-#ifndef _NUMRULE_HXX
 #include "numrule.hxx"//For i120928
-#endif
+
 using namespace sw::util;
 using namespace sw::types;
 
-- 
cgit