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
---
 framework/inc/classes/filtercache.hxx            | 2 --
 framework/inc/framework/toolboxconfiguration.hxx | 2 --
 framework/inc/macros/debug/assertion.hxx         | 5 -----
 framework/inc/macros/debug/event.hxx             | 2 --
 framework/inc/macros/debug/filterdbg.hxx         | 2 --
 framework/inc/macros/debug/logmechanism.hxx      | 3 ---
 framework/inc/macros/debug/mutex.hxx             | 2 --
 framework/inc/macros/debug/plugin.hxx            | 5 -----
 framework/inc/macros/debug/registration.hxx      | 2 --
 framework/inc/macros/debug/targeting.hxx         | 2 --
 framework/inc/stdtypes.h                         | 2 --
 11 files changed, 29 deletions(-)

(limited to 'framework')

diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 9fe0fe5744ce..c4521d1aaa76 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -45,9 +45,7 @@
 #include <rtl/ustring.hxx>
 
 #ifdef ENABLE_GENERATEFILTERCACHE
-    #ifndef _RTL_USTRBUF_HXX_
     #include <rtl/ustrbuf.hxx>
-    #endif
 #endif
 
 namespace framework{
diff --git a/framework/inc/framework/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx
index b8282bc0b99f..a296231a07ea 100644
--- a/framework/inc/framework/toolboxconfiguration.hxx
+++ b/framework/inc/framework/toolboxconfiguration.hxx
@@ -22,9 +22,7 @@
 #include <framework/fwedllapi.h>
 #include <vcl/bitmap.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
-#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_
 #include <com/sun/star/io/XOutputStream.hpp>
-#endif
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index 28988ec5d3d1..9e890070d4fe 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -22,13 +22,8 @@
 
 #if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS )
 
-    #ifndef _OSL_DIAGNOSE_H_
     #include <osl/diagnose.h>
-    #endif
-
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 
 #endif
 
diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx
index 72865cf87a53..4a7a05f05508 100644
--- a/framework/inc/macros/debug/event.hxx
+++ b/framework/inc/macros/debug/event.hxx
@@ -26,9 +26,7 @@
 
 #ifdef  ENABLE_EVENTDEBUG
 
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_EVENTDEBUG
diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx
index ffcc4413097c..05790dba03ba 100644
--- a/framework/inc/macros/debug/filterdbg.hxx
+++ b/framework/inc/macros/debug/filterdbg.hxx
@@ -28,9 +28,7 @@
 
 #ifdef  ENABLE_FILTERDBG
 
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_FILTERDBG
diff --git a/framework/inc/macros/debug/logmechanism.hxx b/framework/inc/macros/debug/logmechanism.hxx
index 59c177a5ddad..dd3be0f1a596 100644
--- a/framework/inc/macros/debug/logmechanism.hxx
+++ b/framework/inc/macros/debug/logmechanism.hxx
@@ -26,10 +26,7 @@
 
 #ifdef  ENABLE_LOGMECHANISM
 
-    #ifndef _RTL_STRING_HXX_
     #include <rtl/string.hxx>
-    #endif
-
     #include <stdio.h>
 
     /*_____________________________________________________________________________________________________________
diff --git a/framework/inc/macros/debug/mutex.hxx b/framework/inc/macros/debug/mutex.hxx
index e212f99416e6..b7c1b7d5409e 100644
--- a/framework/inc/macros/debug/mutex.hxx
+++ b/framework/inc/macros/debug/mutex.hxx
@@ -26,9 +26,7 @@
 
 #ifdef  ENABLE_MUTEXDEBUG
 
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_MUTEX
diff --git a/framework/inc/macros/debug/plugin.hxx b/framework/inc/macros/debug/plugin.hxx
index afef0c97f4b1..f4cfb0a5e833 100644
--- a/framework/inc/macros/debug/plugin.hxx
+++ b/framework/inc/macros/debug/plugin.hxx
@@ -26,13 +26,8 @@
 
 #ifdef  ENABLE_PLUGINDEBUG
 
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
-
-    #ifndef _RTL_STRING_HXX_
     #include <rtl/string.hxx>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_PLUGIN
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index 0b936dd4ab99..1d6fc24cd815 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -26,9 +26,7 @@
 
 #ifdef  ENABLE_REGISTRATIONDEBUG
 
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_ASSERTIONS
diff --git a/framework/inc/macros/debug/targeting.hxx b/framework/inc/macros/debug/targeting.hxx
index 1e8b54afa411..0c168985a560 100644
--- a/framework/inc/macros/debug/targeting.hxx
+++ b/framework/inc/macros/debug/targeting.hxx
@@ -26,9 +26,7 @@
 
 #ifdef  ENABLE_TARGETINGDEBUG
 
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 
     /*_____________________________________________________________________________________________________________
         LOGFILE_TARGETING
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 7cb7bfd9948c..c73f0ebb7031 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -26,9 +26,7 @@
 
 #include <general.h>
 
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
 #include <com/sun/star/awt/KeyEvent.hpp>
-#endif
 
 #include <comphelper/sequenceasvector.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
-- 
cgit