more removed include guards using fixguard.py

23 files changed, 0 insertions, 46 deletions

diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index e821f712b3..35c64bc6d2 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -28,9 +28,7 @@
 #ifndef _XMLBACKGROUNDIMAGEEXPORT_HXX
 #define _XMLBACKGROUNDIMAGEEXPORT_HXX
 
-#ifndef _SAL_TYPES_H 
 #include <sal/types.h>
-#endif
 
 namespace rtl { class OUString; }
 namespace com { namespace sun { namespace star { namespace uno {
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index 1546b25d77..7ed76b64a6 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -30,9 +30,7 @@
 
 #include <xmloff/xmlictxt.hxx>
 
-#ifndef _XMLOFF_XMLIMP_HXX_
 #include <xmloff/xmlimp.hxx>
-#endif
 #include <rtl/ustrbuf.hxx>
 
 
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 8b6a98569a..269fa32e06 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -28,9 +28,7 @@
 #define _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
 
 
-#ifndef _XMLOFF_XMLICTXT_HXX_
 #include <xmloff/xmlictxt.hxx>
-#endif
 
 namespace com { namespace sun { namespace star { 
     namespace text { class XTextCursor; }
diff --git a/xmloff/inc/unoatrcn.hxx b/xmloff/inc/unoatrcn.hxx
index a1d2493fc1..8cc12084ec 100644
--- a/xmloff/inc/unoatrcn.hxx
+++ b/xmloff/inc/unoatrcn.hxx
@@ -33,9 +33,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 #include <cppuhelper/implbase3.hxx>
-#endif
 
 extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SvUnoAttributeContainer_CreateInstance();
 
diff --git a/xmloff/inc/xmloff/XMLFontStylesContext.hxx b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
index 7bb2d2992f..4f5dc9bea2 100644
--- a/xmloff/inc/xmloff/XMLFontStylesContext.hxx
+++ b/xmloff/inc/xmloff/XMLFontStylesContext.hxx
@@ -34,9 +34,7 @@
 #include <vector>
 #endif
 
-#ifndef _XMLOFF_XMLSTYLE_HXX_
 #include <xmloff/xmlstyle.hxx>
-#endif
 
 struct XMLPropertyState;
 class SvXMLTokenMap;
diff --git a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
index 2824f97252..0acb0eacfc 100644
--- a/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
+++ b/xmloff/inc/xmloff/XMLTextMasterPageContext.hxx
@@ -31,9 +31,7 @@
 #include "xmloff/dllapi.h"
 #include "sal/types.h"
 
-#ifndef _XMLOFF_XMLSTYLE_HXX_
 #include <xmloff/xmlstyle.hxx>
-#endif
 
 namespace com { namespace sun { namespace star {
     namespace style { class XStyle; }
diff --git a/xmloff/inc/xmloff/prstylei.hxx b/xmloff/inc/xmloff/prstylei.hxx
index 5ae9d2b60d..64df3a0d62 100644
--- a/xmloff/inc/xmloff/prstylei.hxx
+++ b/xmloff/inc/xmloff/prstylei.hxx
@@ -34,9 +34,7 @@
 #ifndef __SGI_STL_VECTOR
 #include <vector>
 #endif
-#ifndef _XMLOFF_XMLSTYLE_HXX_
 #include <xmloff/xmlstyle.hxx>
-#endif
 
 struct XMLPropertyState;
 class SvXMLStylesContext;
diff --git a/xmloff/inc/xmloff/xmlement.hxx b/xmloff/inc/xmloff/xmlement.hxx
index 8926165bb9..4263f7356c 100644
--- a/xmloff/inc/xmloff/xmlement.hxx
+++ b/xmloff/inc/xmloff/xmlement.hxx
@@ -28,9 +28,7 @@
 #ifndef _XMLOFF_XMLEMENT_HXX
 #define _XMLOFF_XMLEMENT_HXX
 
-#ifndef _SAL_TYPES_H 
 #include <sal/types.h>
-#endif
 #include <xmloff/xmltoken.hxx>
 
 /** Map an XMLTokenEnum to a sal_uInt16 value.
diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx
index 688f002a06..1932cc7b71 100644
--- a/xmloff/inc/xmloff/xmlexp.hxx
+++ b/xmloff/inc/xmloff/xmlexp.hxx
@@ -54,12 +54,8 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-#ifndef _COM_SUN_STAR_DRAWING_XGRAPHICOBJECTRESOLVER_HPP_
 #include <com/sun/star/document/XGraphicObjectResolver.hpp>
-#endif
-#ifndef _COM_SUN_STAR_DRAWING_XEMBEDDEDOBJECTRESOLVER_HPP_
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
-#endif
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
diff --git a/xmloff/inc/xmloff/xmlimppr.hxx b/xmloff/inc/xmloff/xmlimppr.hxx
index cbc4560736..07c293aecb 100644
--- a/xmloff/inc/xmloff/xmlimppr.hxx
+++ b/xmloff/inc/xmloff/xmlimppr.hxx
@@ -33,9 +33,7 @@
 #include <tools/solar.h>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _COM_SUN_STAR_BEANS_XPROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 
diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
index 6f5ffee572..6f5ffee572 100755..100644
--- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
+++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 5a250142c6..8c7de5c7ff 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -54,9 +54,7 @@
 #include <rtl/ustrbuf.hxx>
 #include "xmlnmspe.hxx"
 #include <xmloff/xmlimp.hxx>
-#ifndef _XMLOFF_NMSPMAP_HX
 #include <xmloff/nmspmap.hxx>
-#endif
 #include "SchXMLImport.hxx"
 // header for class XMLPropStyleContext
 #include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx
index f80be8bbc7..f80be8bbc7 100755..100644
--- a/xmloff/source/chart/SchXMLTextListContext.hxx
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx
index 9a3b8297b4..07a3c40052 100644
--- a/xmloff/source/style/XMLRectangleMembersHandler.cxx
+++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx
@@ -31,9 +31,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
-#ifndef _COM_SUN_STAR_AWT_RECTANGLE_HDL_ 
 #include <com/sun/star/awt/Rectangle.hdl>
-#endif
 #include "XMLRectangleMembersHandler.hxx"
 #include <xmloff/xmltypes.hxx>
 
diff --git a/xmloff/source/text/XMLAnchorTypePropHdl.hxx b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
index ab947fa614..e9d2b42516 100644
--- a/xmloff/source/text/XMLAnchorTypePropHdl.hxx
+++ b/xmloff/source/text/XMLAnchorTypePropHdl.hxx
@@ -28,9 +28,7 @@
 #ifndef _XMLOFF_XMLANCHORTYPEPROPHDL_HXX
 #define _XMLOFF_XMLANCHORTYPEPROPHDL_HXX
 
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
 #include <xmloff/xmlprhdl.hxx>
 
 
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index ed66c43555..f9a182fc93 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -28,9 +28,7 @@
 #ifndef _XMLTEXTFRAMECONTEXT_HXX
 #define _XMLTEXTFRAMECONTEXT_HXX
 
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
 #include <xmloff/xmlictxt.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index 7fdd058a54..cbfa463d9b 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -28,12 +28,8 @@
 #ifndef _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
 #define _XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
 
-#ifndef _COM_SUN_STAR_TEXT_TEXTCONTENTANCHORTYPE_HPP
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TEXT_XTEXTFRAME_HPP
 #include <com/sun/star/text/XTextFrame.hpp>
-#endif
 #include <xmloff/xmlictxt.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx
index ae4c96e687..67d349cb33 100644
--- a/xmloff/source/text/txtexppr.hxx
+++ b/xmloff/source/text/txtexppr.hxx
@@ -32,9 +32,7 @@
 #include "txtdrope.hxx"
 #include "xmltabe.hxx"
 #include "XMLTextColumnsExport.hxx"
-#ifndef _XMLOFF_XMLBACKGROUNDIMAGEEXPORT_HXX
 #include "XMLBackgroundImageExport.hxx"
-#endif
 
 class SvXMLExport;
 class XMLTextExportPropertySetMapper: public SvXMLExportPropertyMapper
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index 553d49188b..0e4ca36c02 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -33,9 +33,7 @@
 
 #include <map>
 
-#ifndef _XMLOFF_FLATTRCONTEXT_HXX
 #include "FlatTContext.hxx"
-#endif
 
 typedef ::std::multimap< ::rtl::OUString, 
                     ::rtl::Reference< XMLPersTextContentTContext >,
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 3d49e63f47..f7d1a7bd14 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include "ActionMapTypesOOo.hxx"
-#ifndef _XMLOFF_TRANSFORMERBASE_HXX_
 #include "TransformerBase.hxx"
-#endif
 
 class XMLTransformerOOoEventMap_Impl;
 
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 5d0093f851..1f5511dea9 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -29,9 +29,7 @@
 #define _XMLOFF_OASIS2OOO_HXX
 
 #include "ActionMapTypesOASIS.hxx"
-#ifndef _XMLOFF_TRANSFORMERBASE_HXX_
 #include "TransformerBase.hxx"
-#endif
 
 class XMLTransformerOASISEventMap_Impl;
 
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index ff6f615df4..6664b99a51 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -36,9 +36,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <xmloff/xmltoken.hxx>
 
-#ifndef _XMLOFF_TRANSFORMER_HXX_
 #include "Transformer.hxx"
-#endif
 
 namespace rtl { class OUString; }
 namespace com { namespace sun { namespace star {
diff --git a/xmloff/source/transform/TransformerTokenMap.hxx b/xmloff/source/transform/TransformerTokenMap.hxx
index 616b0504cc..4a235710a8 100644
--- a/xmloff/source/transform/TransformerTokenMap.hxx
+++ b/xmloff/source/transform/TransformerTokenMap.hxx
@@ -32,9 +32,7 @@
 #include <comphelper/stl_types.hxx>
 #include <hash_map>
 #include <xmloff/xmltoken.hxx>
-#ifndef _XMLOFF_TRANSFORMERTOKENMAP_HXX
 #include "TransformerTokenMap.hxx"
-#endif