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

---
 tools/inc/tools/color.hxx   | 2 --
 tools/inc/tools/debug.hxx   | 2 --
 tools/inc/tools/errcode.hxx | 2 --
 tools/inc/tools/fsys.hxx    | 2 --
 tools/inc/tools/inetmsg.hxx | 4 ----
 tools/inc/tools/ownlist.hxx | 2 --
 tools/inc/tools/pstm.hxx    | 4 ----
 tools/inc/tools/stream.hxx  | 2 --
 tools/inc/tools/string.hxx  | 4 ----
 tools/inc/tools/tenccvt.hxx | 2 --
 tools/win/inc/toolsdll.hxx  | 2 --
 11 files changed, 28 deletions(-)

(limited to 'tools')

diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index a99ad1dd11c4..5c2193356fe4 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.hxx
@@ -33,9 +33,7 @@ class SvStream;
 class ResId;
 #include <tools/solar.h>
 
-#ifndef _BGFX_COLOR_BCOLOR_HXX
 #include <basegfx/color/bcolor.hxx>
-#endif
 
 // --------------------
 // - ColorCount-Types -
diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index b8aa1c8b59fe..589017295487 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -30,9 +30,7 @@
 
 #include "tools/toolsdllapi.h"
 
-#ifndef _SAL_TYPES_H
 #include <sal/types.h>
-#endif
 #include <tools/solar.h>
 
 // ------------
diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx
index cf767b842b7a..2c02a280db4a 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/tools/inc/tools/errcode.hxx
@@ -29,10 +29,8 @@
 #define _ERRCODE_HXX
 
 #ifndef __RSC
-#ifndef _SOLAR_H
 #include <tools/solar.h>
 #endif
-#endif
 
 /*
 
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 880768c89d8c..4498abbd0d8a 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -32,9 +32,7 @@
 #include <tools/string.hxx>
 #include <tools/link.hxx>
 #include <tools/wldcrd.hxx>
-#ifndef __ERRCODE_HXX
 #include <tools/errcode.hxx>
-#endif
 #include "tools/toolsdllapi.h"
 
 #include <cstdarg>
diff --git a/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index d7619fc34a4d..930ffe57cee0 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.hxx
@@ -30,13 +30,9 @@
 #include "tools/toolsdllapi.h"
 #include <sal/types.h>
 
-#ifndef _RTL_TEXTENC_H_
 #include <rtl/textenc.h>
-#endif
 
-#ifndef _TOOLS_INETMIME_HXX
 #include <tools/inetmime.hxx>
-#endif
 #include <tools/list.hxx>
 #include <tools/stream.hxx>
 #include <tools/string.hxx>
diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx
index ac99537a9f0d..1cddfed55379 100644
--- a/tools/inc/tools/ownlist.hxx
+++ b/tools/inc/tools/ownlist.hxx
@@ -28,9 +28,7 @@
 #ifndef _TOOLS_OWNLIST_HXX
 #define _TOOLS_OWNLIST_HXX
 
-#ifndef _TOOLS_LIST_HXX //autogen
 #include <tools/list.hxx>
-#endif
 /*************************************************************************
 *************************************************************************/
 
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 0d14385e5f08..c425e2502435 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -30,13 +30,9 @@
 #include <hash_map>
 #include "tools/toolsdllapi.h"
 
-#ifndef _TABLE_HXX
 #include <tools/table.hxx>
-#endif
 
-#ifndef _INQIDX_HXX
 #include <tools/unqidx.hxx>
-#endif
 #include <tools/ref.hxx>
 #include <tools/rtti.hxx>
 #include <tools/stream.hxx>
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 61af361aa5b7..0166fc4a37ff 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -30,9 +30,7 @@
 #include "tools/toolsdllapi.h"
 #include <tools/solar.h>
 #include <tools/string.hxx>
-#ifndef _EINF_HXX
 #include <tools/errinf.hxx>
-#endif
 #include <tools/ref.hxx>
 #include <tools/rtti.hxx>
 
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 8b86a1835596..49b494c69705 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -32,12 +32,8 @@
 #include <osl/thread.h>
 #include <rtl/textenc.h>
 #include <rtl/textcvt.h>
-#ifndef _RTL_STRING_HXX
 #include <rtl/string.hxx>
-#endif
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
 #include "tools/toolsdllapi.h"
 
 /*******************************************************************************
diff --git a/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx
index e24c2e259022..52a529ea1593 100644
--- a/tools/inc/tools/tenccvt.hxx
+++ b/tools/inc/tools/tenccvt.hxx
@@ -28,9 +28,7 @@
 #define _TOOLS_TENCCVT_HXX
 
 #include <rtl/textenc.h>
-#ifndef _TOOLS_SOLAR_H
 #include <tools/solar.h>
-#endif
 #include "tools/toolsdllapi.h"
 
 // ----------------------------------------
diff --git a/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
index a6b1546763bc..7e11ab1d084f 100644
--- a/tools/win/inc/toolsdll.hxx
+++ b/tools/win/inc/toolsdll.hxx
@@ -30,9 +30,7 @@
 
 #ifdef WIN
 
-#ifndef _STRING_H
 #include <string.h>
-#endif
 #include <tools/svwin.h>
 #include <tools/solar.h>
 #include <tools/shl.hxx>
-- 
cgit