fixincludeguards.sh: xmloff

Change-Id: I0e7d9daac1ad88fad8d240373e91ef323966bb47

62 files changed, 152 insertions, 152 deletions

diff --git a/xmloff/inc/AttributeContainerHandler.hxx b/xmloff/inc/AttributeContainerHandler.hxx
index 2cd36e1e08ac..d434d943581b 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX
-#define _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -36,6 +36,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_ATTRIBUTECONTAINERHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_ATTRIBUTECONTAINERHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 34dc52a849ae..0de3c493cfe6 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_DOMBUILDERCONTEXT_HXX
-#define _XMLOFF_DOMBUILDERCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_DOMBUILDERCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_DOMBUILDERCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index a1b0b799e344..6f88dc3bafb9 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_DOMEXPORT_HXX
-#define _XMLOFF_DOMEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_DOMEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_DOMEXPORT_HXX
 
 // the Solaris compiler apparently needs the following include:
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx b/xmloff/inc/EnhancedCustomShapeToken.hxx
index 573bd917e993..dafe8b8ec8ec 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCED_CUSTOMSHAPE_TOKEN_HXX
-#define _ENHANCED_CUSTOMSHAPE_TOKEN_HXX
+#ifndef INCLUDED_XMLOFF_INC_ENHANCEDCUSTOMSHAPETOKEN_HXX
+#define INCLUDED_XMLOFF_INC_ENHANCEDCUSTOMSHAPETOKEN_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/inc/MetaExportComponent.hxx b/xmloff/inc/MetaExportComponent.hxx
index f9cd2af67982..54d6ca69f538 100644
--- a/xmloff/inc/MetaExportComponent.hxx
+++ b/xmloff/inc/MetaExportComponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_METAEXPORTCOMPONENT_HXX
-#define _XMLOFF_METAEXPORTCOMPONENT_HXX
+#ifndef INCLUDED_XMLOFF_INC_METAEXPORTCOMPONENT_HXX
+#define INCLUDED_XMLOFF_INC_METAEXPORTCOMPONENT_HXX
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index 42b53aed3fe5..dc03112d85b3 100644
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_METAIMPORTCOMPONENT_HXX
-#define _XMLOFF_METAIMPORTCOMPONENT_HXX
+#ifndef INCLUDED_XMLOFF_INC_METAIMPORTCOMPONENT_HXX
+#define INCLUDED_XMLOFF_INC_METAIMPORTCOMPONENT_HXX
 
 #include <xmloff/xmlimp.hxx>
 
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index c73ebd7fc220..a6d6da846069 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_CONDITIONALMULTIPROPERTYSETHELPER_HXX
-#define _XMLOFF_CONDITIONALMULTIPROPERTYSETHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_MULTIPROPERTYSETHELPER_HXX
+#define INCLUDED_XMLOFF_INC_MULTIPROPERTYSETHELPER_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx
index 7cfc6142a93b..752e12c8baba 100644
--- a/xmloff/inc/PageMasterImportContext.hxx
+++ b/xmloff/inc/PageMasterImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PAGEMASTERIMPORTCONTEXT_HXX
-#define _XMLOFF_PAGEMASTERIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_PAGEMASTERIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_PAGEMASTERIMPORTCONTEXT_HXX
 
 #include <xmloff/prstylei.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index 3b622757c5c5..ff966caa2054 100644
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_PROPERTYSETMERGER_HXX_
-#define _XMLOFF_PROPERTYSETMERGER_HXX_
+#ifndef INCLUDED_XMLOFF_INC_PROPERTYSETMERGER_HXX
+#define INCLUDED_XMLOFF_INC_PROPERTYSETMERGER_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/xmloff/inc/RDFaExportHelper.hxx b/xmloff/inc/RDFaExportHelper.hxx
index 2dd144089e78..dbc01337277b 100644
--- a/xmloff/inc/RDFaExportHelper.hxx
+++ b/xmloff/inc/RDFaExportHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RDFAEXPORTHELPER_HXX
-#define RDFAEXPORTHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_RDFAEXPORTHELPER_HXX
+#define INCLUDED_XMLOFF_INC_RDFAEXPORTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.h>
 
@@ -66,6 +66,6 @@ public:
 
 } // namespace xmloff
 
-#endif // RDFAEXPORTHELPER_HXX
+#endif // INCLUDED_XMLOFF_INC_RDFAEXPORTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/RDFaImportHelper.hxx b/xmloff/inc/RDFaImportHelper.hxx
index 6d710aa97fe3..9fdeaaaf98bd 100644
--- a/xmloff/inc/RDFaImportHelper.hxx
+++ b/xmloff/inc/RDFaImportHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef RDFAIMPORTHELPER_HXX
-#define RDFAIMPORTHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX
+#define INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX
 
 #include <vector>
 
@@ -90,6 +90,6 @@ public:
 
 } // namespace xmloff
 
-#endif // RDFAIMPORTHELPER_HXX
+#endif // INCLUDED_XMLOFF_INC_RDFAIMPORTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 9c97966f2455..01dea842f25a 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SCH_XMLEXPORT_HXX_
-#define SCH_XMLEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_SCHXMLEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_SCHXMLEXPORT_HXX
 
 #include <xmloff/SchXMLExportHelper.hxx>
 #include "SchXMLAutoStylePoolP.hxx"
@@ -63,6 +63,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
 };
 
-#endif  // SCH_XMLEXPORT_HXX_
+#endif // INCLUDED_XMLOFF_INC_SCHXMLEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index b9e3c0aabe84..f531de380e39 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SCH_XMLIMPORT_HXX_
-#define SCH_XMLIMPORT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
+#define INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
 
 #include <xmloff/SchXMLImportHelper.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -178,6 +178,6 @@ public:
     virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 };
 
-#endif  // SCH_XMLIMPORT_HXX_
+#endif // INCLUDED_XMLOFF_INC_SCHXMLIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index f71b530a45f6..3425a0520928 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_STYLEMAP_HXX
-#define _XMLOFF_STYLEMAP_HXX
+#ifndef INCLUDED_XMLOFF_INC_STYLEMAP_HXX
+#define INCLUDED_XMLOFF_INC_STYLEMAP_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -83,6 +83,6 @@ public:
                 const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-#endif  //  _XMLOFF_STYLEMAP_HXX
+#endif // INCLUDED_XMLOFF_INC_STYLEMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index f991cc83089b..5acdceeab1b8 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TRANSGRADIENTSTYLE_HXX
-#define _XMLOFF_TRANSGRADIENTSTYLE_HXX
+#ifndef INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
+#define INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
 
 
 #include <sal/types.h>
@@ -59,6 +59,6 @@ public:
     sal_Bool exportXML( const OUString& rStrName, const ::com::sun::star::uno::Any& rValue );
 };
 
-#endif // _XMLOFF_TRANSGRADIENTSTYLE_HXX
+#endif // INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 1f84f6520ed0..b4c7b732eb4f 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLBACKGROUNDIMAGECONTEXT_HXX
-#define _XMLBACKGROUNDIMAGECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGECONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGECONTEXT_HXX
 
 #include <com/sun/star/style/GraphicLocation.hpp>
 #include "XMLElementPropertyContext.hxx"
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index 3a2d8ed3d130..36c2291a3b0f 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLBACKGROUNDIMAGEEXPORT_HXX
-#define _XMLBACKGROUNDIMAGEEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGEEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGEEXPORT_HXX
 
 #include <sal/types.h>
 
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index 42b2ec05f1f4..d73df0ab3810 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLBASE64EXPORT_HXX
-#define _XMLOFF_XMLBASE64EXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBASE64EXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLBASE64EXPORT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 
diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx
index 1bd2c2ec46dc..62deddc47194 100644
--- a/xmloff/inc/XMLBasicExportFilter.hxx
+++ b/xmloff/inc/XMLBasicExportFilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBASICEXPORTFILTER_HXX
-#define _XMLOFF_XMLBASICEXPORTFILTER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
+#define INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -58,6 +58,6 @@ public:
         throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _XMLOFF_XMLBASICEXPORTFILTER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
index e6e591a7944e..76d737a86ac3 100644
--- a/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -50,6 +50,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLBITMAPLOGICALSIZEPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index 2429a9ce9b1a..693e769701ed 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLBITMAPREPEATOFFSETPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLChartPropertySetMapper.hxx b/xmloff/inc/XMLChartPropertySetMapper.hxx
index f2726baf09ed..90438273f57b 100644
--- a/xmloff/inc/XMLChartPropertySetMapper.hxx
+++ b/xmloff/inc/XMLChartPropertySetMapper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_CHARTPROPERTYSETMAPPER_HXX_
-#define _XMLOFF_CHARTPROPERTYSETMAPPER_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
+#define INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
 
 #include <xmloff/uniref.hxx>
 #include <xmloff/xmlprmap.hxx>
@@ -111,6 +111,6 @@ public:
         sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const;
 };
 
-#endif  // _XMLOFF_CHARTPROPERTYSETMAPPER_HXX_
+#endif // INCLUDED_XMLOFF_INC_XMLCHARTPROPERTYSETMAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx
index 3caac13fd6c0..ca66f896cedb 100644
--- a/xmloff/inc/XMLChartStyleContext.hxx
+++ b/xmloff/inc/XMLChartStyleContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
-#define _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
 
 #include <xmloff/XMLShapeStyleContext.hxx>
 
@@ -56,6 +56,6 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );
 };
 
-#endif  // _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
+#endif // INCLUDED_XMLOFF_INC_XMLCHARTSTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index c690218bd7b8..2fe39d3047b0 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLCLIPPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLCLIPPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -37,6 +37,6 @@ public:
     virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_PROPERTYHANDLER_BASICTYPES_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLCLIPPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 5ce75fc013e8..49cdb131d248 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLELEMENTPROPERTYCONTEXT_HXX
-#define _XMLOFF_XMLELEMENTPROPERTYCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLELEMENTPROPERTYCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLELEMENTPROPERTYCONTEXT_HXX
 
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 4c3d08b6df43..f32ee8ae83c0 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlictxt.hxx>
@@ -67,6 +67,6 @@ public:
 
 };
 
-#endif  //  _XMLOFF_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLEMBEDDEDOBJECTIMPORTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLEventImportHelper.hxx b/xmloff/inc/XMLEventImportHelper.hxx
index 3ee55bc0e419..4dca7093f4d1 100644
--- a/xmloff/inc/XMLEventImportHelper.hxx
+++ b/xmloff/inc/XMLEventImportHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_EVENTIMPORTHELPER_HXX
-#define _XMLOFF_EVENTIMPORTHELPER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLEVENTIMPORTHELPER_HXX
+#define INCLUDED_XMLOFF_INC_XMLEVENTIMPORTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <xmloff/xmlevent.hxx>
diff --git a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
index 95dc21575573..f17d691e2c1c 100644
--- a/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
+++ b/xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -50,6 +50,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLFILLBITMAPSIZEPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index a5e2fb272c5f..2822538c1c17 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlstyle.hxx>
 
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index ffacc723f735..d97b33560efe 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLIMAGEMAPCONTEXT_HXX_
-#define _XMLOFF_XMLIMAGEMAPCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLIMAGEMAPCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLIMAGEMAPCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index ceb132bbb731..3cdcef2837cb 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLIMAGEMAPEXPORT_HXX_
-#define _XMLOFF_XMLIMAGEMAPEXPORT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLIMAGEMAPEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLIMAGEMAPEXPORT_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index cc0234e21ed0..8cd974bded71 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX_
-#define _XMLOFF_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLINDEXBIBLIOGRAPHYCONFIGURATIONCONTEXT_HXX
 
 #include <xmloff/xmlstyle.hxx>
 #include <xmloff/languagetagodf.hxx>
diff --git a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
index b7d4e74bd21c..6af26b385b08 100644
--- a/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
+++ b/xmloff/inc/XMLIsPercentagePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLISPERCENTAGEPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLISPERCENTAGEPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLISPERCENTAGEPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLISPERCENTAGEPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index ae3e6dd17016..5eb2cf4b0e01 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLLINENUMBERINGIMPORTCONTEXT_HXX_
-#define _XMLOFF_XMLLINENUMBERINGIMPORTCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLLINENUMBERINGIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLLINENUMBERINGIMPORTCONTEXT_HXX
 
 #include <xmloff/xmlstyle.hxx>
 #include <rtl/ustring.hxx>
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index c7a2c941d01f..cf4c69996d2f 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_NUMBERSTYLESIMPORT_HXX
-#define _XMLOFF_NUMBERSTYLESIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
 
 #include <xmloff/xmlnumfi.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -64,6 +64,6 @@ public:
     sal_Int32 GetDrawKey() const { return mnKey; }
 };
 
-#endif  //  _XMLOFF_NUMBERSTYLESIMPORT_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index 1b4e0e7735ba..995c95287896 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLPERCENTORMEASUREPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index e216daf43a37..3e52e9336c63 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLRECTANGLEMEMBERSHANDLER_HXX
-#define _XMLOFF_XMLRECTANGLEMEMBERSHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
@@ -52,6 +52,6 @@ public:
             const SvXMLUnitConverter& rUnitConverter ) const;
 };
 
-#endif      // _XMLOFF_XMLRECTANGLEMEMBERSHANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLRECTANGLEMEMBERSHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 419693d7784d..01035b094be7 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLREPLACEMENTIMAGECONTEXT_HXX
-#define _XMLOFF_XMLREPLACEMENTIMAGECONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlictxt.hxx>
@@ -60,6 +60,6 @@ public:
 
 };
 
-#endif  //  _XMLOFF_XMLREPLACEMENTIMAGECONTEXT_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLScriptContextFactory.hxx b/xmloff/inc/XMLScriptContextFactory.hxx
index d189a65b7db4..cbfe7c53a299 100644
--- a/xmloff/inc/XMLScriptContextFactory.hxx
+++ b/xmloff/inc/XMLScriptContextFactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX
-#define _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
+#define INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <xmloff/xmlevent.hxx>
@@ -55,6 +55,6 @@ public:
                   const OUString & rLanguage);
 };
 
-#endif // _XMLOFF_XMLSCRIPTCONTEXTFACTORY_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLSCRIPTCONTEXTFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index e1963e7e83c6..36380943893f 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSCRIPTEXPORTHANDLER_HXX
-#define _XMLOFF_XMLSCRIPTEXPORTHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSCRIPTEXPORTHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLSCRIPTEXPORTHANDLER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx
index 54c28ca372c2..b66bec224c58 100644
--- a/xmloff/inc/XMLShapePropertySetContext.hxx
+++ b/xmloff/inc/XMLShapePropertySetContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLSHAPEPROPERTYSETCONTEXT_HXX
-#define _XMLOFF_XMLSHAPEPROPERTYSETCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSHAPEPROPERTYSETCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLSHAPEPROPERTYSETCONTEXT_HXX
 
 
 #include <xmloff/xmlprcon.hxx>
diff --git a/xmloff/inc/XMLStarBasicContextFactory.hxx b/xmloff/inc/XMLStarBasicContextFactory.hxx
index a1db7963096f..9ce7aa60e869 100644
--- a/xmloff/inc/XMLStarBasicContextFactory.hxx
+++ b/xmloff/inc/XMLStarBasicContextFactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSTARBASICCONTEXTFACTORY_HXX
-#define _XMLOFF_XMLSTARBASICCONTEXTFACTORY_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSTARBASICCONTEXTFACTORY_HXX
+#define INCLUDED_XMLOFF_INC_XMLSTARBASICCONTEXTFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <xmloff/xmlevent.hxx>
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 1ba34a9577ab..5d983c5d290c 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLSTARBASICEXPORTHANDLER_HXX
-#define _XMLOFF_XMLSTARBASICEXPORTHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSTARBASICEXPORTHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLSTARBASICEXPORTHANDLER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx
index d710de80e13e..378b4986c874 100644
--- a/xmloff/inc/XMLStringBufferImportContext.hxx
+++ b/xmloff/inc/XMLStringBufferImportContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
-#define _XMLOFF_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLSTRINGBUFFERIMPORTCONTEXT_HXX
 
 
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 9ef0fc09e234..7f91a6e49ec6 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLTEXTCOLUMNSCONTEXT_HXX
-#define _XMLTEXTCOLUMNSCONTEXT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSCONTEXT_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index c931b92298a1..65aaf09b6114 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLTEXTCOLUMNSEXPORT_HXX
-#define _XMLOFF_XMLTEXTCOLUMNSEXPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSEXPORT_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSEXPORT_HXX
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Any; } } } }
diff --git a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
index 41dad369d525..386d7bf8beaa 100644
--- a/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
+++ b/xmloff/inc/XMLTextColumnsPropertyHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
-#define _XMLOFF_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSPROPERTYHANDLER_HXX
 
 #include <xmloff/xmlprhdl.hxx>
 
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 18a407970cee..35184002ffb0 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
-#define _XMLOFF_TEXTHEADERFOOTERCONTEXT_HXX_
+#ifndef INCLUDED_XMLOFF_INC_XMLTEXTHEADERFOOTERCONTEXT_HXX
+#define INCLUDED_XMLOFF_INC_XMLTEXTHEADERFOOTERCONTEXT_HXX
 
 
 #include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index 8f81891cbdc5..6bd96bb6d70d 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIM_HXX
-#define _XMLOFF_ANIM_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIM_HXX
+#define INCLUDED_XMLOFF_INC_ANIM_HXX
 
 #include <com/sun/star/presentation/AnimationEffect.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -92,6 +92,6 @@ extern SvXMLEnumMapEntry aXML_AnimationSpeed_EnumMap[];
 void SdXMLImplSetEffect( ::com::sun::star::presentation::AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDirection& eDirection, sal_Int16& nStartScale, bool& bIn );
 ::com::sun::star::presentation::AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirection, sal_Int16 nStartScale, bool bIn );
 
-#endif  //  _XMLOFF_ANIM_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index b905c8701ba8..08a78cf96126 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIMATIONIMPORT_HXX
-#define _XMLOFF_ANIMATIONIMPORT_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIMATIONIMPORT_HXX
+#define INCLUDED_XMLOFF_INC_ANIMATIONIMPORT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/animations/XAnimationNode.hpp>
@@ -59,6 +59,6 @@ public:
 
 }
 
-#endif  //  _XMLOFF_ANIMATIONIMPORT_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIMATIONIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index 3a55350985da..2ff9f7688deb 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIMATIONS_HXX
-#define _XMLOFF_ANIMATIONS_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
+#define INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
 
 #include <xmloff/xmltoken.hxx>
 
@@ -55,6 +55,6 @@ extern const struct ImplAttributeNameConversion* getAnimationAttributeNamesConve
 
 }
 
-#endif  //  _XMLOFF_ANIMATIONS_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIMATIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index e0d45b92772b..529a048dda2d 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_ANIMIMP_HXX
-#define _XMLOFF_ANIMIMP_HXX
+#ifndef INCLUDED_XMLOFF_INC_ANIMIMP_HXX
+#define INCLUDED_XMLOFF_INC_ANIMIMP_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
@@ -44,6 +44,6 @@ public:
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList );
 };
 
-#endif  //  _XMLOFF_ANIMIMP_HXX
+#endif // INCLUDED_XMLOFF_INC_ANIMIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/forms/form_handler_factory.hxx b/xmloff/inc/forms/form_handler_factory.hxx
index f29a5f9c630e..5ad43b3a66b8 100644
--- a/xmloff/inc/forms/form_handler_factory.hxx
+++ b/xmloff/inc/forms/form_handler_factory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX
-#define XMLOFF_FORM_HANDLER_FACTORY_HXX
+#ifndef INCLUDED_XMLOFF_INC_FORMS_FORM_HANDLER_FACTORY_HXX
+#define INCLUDED_XMLOFF_INC_FORMS_FORM_HANDLER_FACTORY_HXX
 
 #include "forms/property_handler.hxx"
 
@@ -34,6 +34,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX
+#endif // INCLUDED_XMLOFF_INC_FORMS_FORM_HANDLER_FACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index a727f6b664f4..fb17d6054e8a 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_HANDLER_HXX
-#define XMLOFF_PROPERTY_HANDLER_HXX
+#ifndef INCLUDED_XMLOFF_INC_FORMS_PROPERTY_HANDLER_HXX
+#define INCLUDED_XMLOFF_INC_FORMS_PROPERTY_HANDLER_HXX
 
 #include "forms/property_ids.hxx"
 
@@ -64,6 +64,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_HANDLER_HXX
+#endif // INCLUDED_XMLOFF_INC_FORMS_PROPERTY_HANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/forms/property_ids.hxx b/xmloff/inc/forms/property_ids.hxx
index 48a06e67e88f..22b71239f426 100644
--- a/xmloff/inc/forms/property_ids.hxx
+++ b/xmloff/inc/forms/property_ids.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef XMLOFF_PROPERTY_IDS_HXX
-#define XMLOFF_PROPERTY_IDS_HXX
+#ifndef INCLUDED_XMLOFF_INC_FORMS_PROPERTY_IDS_HXX
+#define INCLUDED_XMLOFF_INC_FORMS_PROPERTY_IDS_HXX
 
 namespace xmloff
 {
@@ -40,6 +40,6 @@ namespace xmloff
 
 } // namespace xmloff
 
-#endif // XMLOFF_PROPERTY_IDS_HXX
+#endif // INCLUDED_XMLOFF_INC_FORMS_PROPERTY_IDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index 30e607ba633b..050f9a0c04b4 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -21,8 +21,8 @@
  *  XML export of all text fields
  */
 
-#ifndef _XMLOFF_TXTFLDE_HXX
-#define _XMLOFF_TXTFLDE_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTFLDE_HXX
+#define INCLUDED_XMLOFF_INC_TXTFLDE_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include "xmloff/xmlnmspe.hxx"
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 81dcaafbe9a4..3ab7140948db 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -23,8 +23,8 @@
  *  (except variable related + database display field: see txtvfldi.hxx)
  */
 
-#ifndef _XMLOFF_TXTFLDI_HXX
-#define _XMLOFF_TXTFLDI_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTFLDI_HXX
+#define INCLUDED_XMLOFF_INC_TXTFLDI_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/text/PageNumberType.hpp>
diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index bff6a0bedf96..447ffa7cf2ac 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_TXTLISTS_HXX
-#define _XMLOFF_TXTLISTS_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTLISTS_HXX
+#define INCLUDED_XMLOFF_INC_TXTLISTS_HXX
 
 #include <rtl/ustring.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 95f2391aa30c..2c2dadcd5784 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -22,8 +22,8 @@
  *  XML import of all variable related text fields plus database display field
  */
 
-#ifndef _XMLOFF_TXTVFLDI_HXX
-#define _XMLOFF_TXTVFLDI_HXX
+#ifndef INCLUDED_XMLOFF_INC_TXTVFLDI_HXX
+#define INCLUDED_XMLOFF_INC_TXTVFLDI_HXX
 
 #include "txtvfldi.hxx"
 #include "txtfldi.hxx"
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 52c426718bc9..77944533de2b 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XEXPTRANSFORM_HXX
-#define _XEXPTRANSFORM_HXX
+#ifndef INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
+#define INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
@@ -166,6 +166,6 @@ public:
     const com::sun::star::drawing::FlagSequenceSequence& GetFlagSequenceSequence() const { return maPoly.Flags; }
 };
 
-#endif  //  _XEXPTRANSFORM_HXX
+#endif // INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index 022ea808ed0b..66bc1689ca54 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLOFF_XMLTABI_HXX
-#define _XMLOFF_XMLTABI_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLTABI_HXX
+#define INCLUDED_XMLOFF_INC_XMLTABI_HXX
 
 #include "XMLElementPropertyContext.hxx"
 
@@ -49,6 +49,6 @@ public:
 };
 
 
-#endif  //  _XMLOFF_XMLTABI_HXX
+#endif // INCLUDED_XMLOFF_INC_XMLTABI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index 0a96bdece5e1..0bf3113d1549 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XMLOFF_XMLVERSION_HXX
-#define _XMLOFF_XMLVERSION_HXX
+#ifndef INCLUDED_XMLOFF_INC_XMLVERSION_HXX
+#define INCLUDED_XMLOFF_INC_XMLVERSION_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/document/XDocumentRevisionListPersistence.hpp>