summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-25 19:56:20 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-25 19:58:16 +0100
commit488e6875e992e11601611a119476624822fc4635 (patch)
treeb70124749e69faf507d0e317ca9d7e26753e99a2 /framework
parent909de9de9fce6a2e8a5c4e859038d00ce3e88c15 (diff)
remove external include guards
Change-Id: If5758e02baa8e019923355b6c97043b306223fdd
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/classes/filtercache.hxx2
-rw-r--r--framework/inc/framework/toolboxconfiguration.hxx2
-rw-r--r--framework/inc/macros/debug/assertion.hxx5
-rw-r--r--framework/inc/macros/debug/event.hxx2
-rw-r--r--framework/inc/macros/debug/filterdbg.hxx2
-rw-r--r--framework/inc/macros/debug/logmechanism.hxx3
-rw-r--r--framework/inc/macros/debug/mutex.hxx2
-rw-r--r--framework/inc/macros/debug/plugin.hxx5
-rw-r--r--framework/inc/macros/debug/registration.hxx2
-rw-r--r--framework/inc/macros/debug/targeting.hxx2
-rw-r--r--framework/inc/stdtypes.h2
11 files changed, 0 insertions, 29 deletions
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>