fixincludeguards.sh: include/o*

Change-Id: Ibd5d8af00f6582d53231c76e2b04e737b5804497

include/oox/core/binarycodec.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_BINARYCODEC_HXX
+#ifndef INCLUDED_OOX_CORE_BINARYCODEC_HXX
-#define OOX_CORE_BINARYCODEC_HXX
+#define INCLUDED_OOX_CORE_BINARYCODEC_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>

include/oox/core/contexthandler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_CONTEXTHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
-#define OOX_CORE_CONTEXTHANDLER_HXX
+#define INCLUDED_OOX_CORE_CONTEXTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <boost/shared_ptr.hpp>

include/oox/core/contexthandler2.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_CONTEXTHANDLER2_HXX
+#ifndef INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
-#define OOX_CORE_CONTEXTHANDLER2_HXX
+#define INCLUDED_OOX_CORE_CONTEXTHANDLER2_HXX
 
 #include <vector>
 #include <boost/shared_ptr.hpp>

include/oox/core/fastparser.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FASTPARSER_HXX
+#ifndef INCLUDED_OOX_CORE_FASTPARSER_HXX
-#define OOX_CORE_FASTPARSER_HXX
+#define INCLUDED_OOX_CORE_FASTPARSER_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>

include/oox/core/fasttokenhandler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FASTTOKENHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
-#define OOX_CORE_FASTTOKENHANDLER_HXX
+#define INCLUDED_OOX_CORE_FASTTOKENHANDLER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>

include/oox/core/filterbase.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FILTERBASE_HXX
+#ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
-#define OOX_CORE_FILTERBASE_HXX
+#define INCLUDED_OOX_CORE_FILTERBASE_HXX
 
 #include <memory>
 #include <com/sun/star/beans/NamedValue.hpp>

include/oox/core/filterdetect.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FILTERDETECT_HXX
+#ifndef INCLUDED_OOX_CORE_FILTERDETECT_HXX
-#define OOX_CORE_FILTERDETECT_HXX
+#define INCLUDED_OOX_CORE_FILTERDETECT_HXX
 
 #include <vector>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>

include/oox/core/fragmenthandler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FRAGMENTHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
-#define OOX_CORE_FRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_CORE_FRAGMENTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase1.hxx>

include/oox/core/fragmenthandler2.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_FRAGMENTHANDLER2_HXX
+#ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
-#define OOX_CORE_FRAGMENTHANDLER2_HXX
+#define INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/core/fragmenthandler.hxx"

include/oox/core/recordparser.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_RECORDPARSER_HXX
+#ifndef INCLUDED_OOX_CORE_RECORDPARSER_HXX
-#define OOX_CORE_RECORDPARSER_HXX
+#define INCLUDED_OOX_CORE_RECORDPARSER_HXX
 
 #include <map>
 #include <com/sun/star/io/IOException.hpp>

include/oox/core/relations.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_RELATIONS_HXX
+#ifndef INCLUDED_OOX_CORE_RELATIONS_HXX
-#define OOX_CORE_RELATIONS_HXX
+#define INCLUDED_OOX_CORE_RELATIONS_HXX
 
 #include <map>
 #include <boost/shared_ptr.hpp>

include/oox/core/relationshandler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_RELATIONSHANDLER_HXX
+#ifndef INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
-#define OOX_CORE_RELATIONSHANDLER_HXX
+#define INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 
 #include "oox/core/fragmenthandler.hxx"
 

include/oox/core/xmlfilterbase.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_CORE_XMLFILTERBASE_HXX
+#ifndef INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
-#define OOX_CORE_XMLFILTERBASE_HXX
+#define INCLUDED_OOX_CORE_XMLFILTERBASE_HXX
 
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>

include/oox/crypto/AgileEngine.hxx

@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef AGILE_ENGINE_HXX
+#ifndef INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
-#define AGILE_ENGINE_HXX
+#define INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
 
 #include "CryptTools.hxx"
 #include "CryptoEngine.hxx"

include/oox/crypto/CryptTools.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CRYPT_TOOLS_HXX
+#ifndef INCLUDED_OOX_CRYPTO_CRYPTTOOLS_HXX
-#define CRYPT_TOOLS_HXX
+#define INCLUDED_OOX_CRYPTO_CRYPTTOOLS_HXX
 
 #include <config_oox.h>
 

include/oox/crypto/CryptoEngine.hxx

@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef CRYPTO_ENGINE_HXX
+#ifndef INCLUDED_OOX_CRYPTO_CRYPTOENGINE_HXX
-#define CRYPTO_ENGINE_HXX
+#define INCLUDED_OOX_CRYPTO_CRYPTOENGINE_HXX
 
 #include <vector>
 

include/oox/crypto/DocumentDecryption.hxx

@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef DOCUMENT_DECRYPTION_HXX
+#ifndef INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
-#define DOCUMENT_DECRYPTION_HXX
+#define INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
 
 #include "oox/dllapi.h"
 

include/oox/crypto/DocumentEncryption.hxx

@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef DOCUMENT_ENCRYPTION_HXX
+#ifndef INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
-#define DOCUMENT_ENCRYPTION_HXX
+#define INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
 
 #include "oox/dllapi.h"
 

include/oox/crypto/Standard2007Engine.hxx

@@ -8,8 +8,8 @@
  *
  */
 
-#ifndef STANDARD_2007_ENGINE_HXX
+#ifndef INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
-#define STANDARD_2007_ENGINE_HXX
+#define INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
 
 #include "CryptTools.hxx"
 #include "CryptoEngine.hxx"

include/oox/drawingml/chart/axiscontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
-#define OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/axisconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 

include/oox/drawingml/chart/axismodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_AXISMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
-#define OOX_DRAWINGML_CHART_AXISMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/titlemodel.hxx"

include/oox/drawingml/chart/chartcontextbase.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
-#define OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 

include/oox/drawingml/chart/chartconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTCONVERTER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>

include/oox/drawingml/chart/chartdrawingfragment.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
-#define OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/shape.hxx"

include/oox/drawingml/chart/chartspaceconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
-#define OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 

include/oox/drawingml/chart/chartspacefragment.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
-#define OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/chartspacemodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
-#define OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/plotareamodel.hxx"

include/oox/drawingml/chart/converterbase.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
-#define OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 #include "oox/drawingml/chart/objectformatter.hxx"

include/oox/drawingml/chart/datasourcecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
-#define OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/datasourceconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
-#define OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 

include/oox/drawingml/chart/datasourcemodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
-#define OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include "oox/drawingml/chart/modelbase.hxx"

include/oox/drawingml/chart/modelbase.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_MODELBASE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
-#define OOX_DRAWINGML_CHART_MODELBASE_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/refmap.hxx"

include/oox/drawingml/chart/objectformatter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
-#define OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
 
 #include "oox/helper/propertyset.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"

include/oox/drawingml/chart/plotareacontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
-#define OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/plotareaconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
-#define OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 

include/oox/drawingml/chart/plotareamodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
-#define OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/axismodel.hxx"

include/oox/drawingml/chart/seriescontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
-#define OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/seriesconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 #include "oox/drawingml/chart/seriesmodel.hxx"

include/oox/drawingml/chart/seriesmodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_SERIESMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
-#define OOX_DRAWINGML_CHART_SERIESMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
 
 #include "oox/drawingml/chart/datasourcemodel.hxx"
 #include "oox/drawingml/chart/titlemodel.hxx"

include/oox/drawingml/chart/titlecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
-#define OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/titleconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
-#define OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 

include/oox/drawingml/chart/titlemodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TITLEMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLEMODEL_HXX
-#define OOX_DRAWINGML_CHART_TITLEMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TITLEMODEL_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/chart/datasourcemodel.hxx"

include/oox/drawingml/chart/typegroupcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
-#define OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
 
 #include "oox/drawingml/chart/chartcontextbase.hxx"
 

include/oox/drawingml/chart/typegroupconverter.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
-#define OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
 
 #include "oox/drawingml/chart/converterbase.hxx"
 

include/oox/drawingml/chart/typegroupmodel.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
-#define OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
+#define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
 
 #include "oox/drawingml/chart/seriesmodel.hxx"
 

include/oox/drawingml/clrscheme.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CLRSCHEME_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
-#define OOX_DRAWINGML_CLRSCHEME_HXX
+#define INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <map>
@@ -57,6 +57,6 @@ typedef boost::shared_ptr< ClrScheme > ClrSchemePtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_CLRSCHEME_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/clrschemecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
-#define OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/clrscheme.hxx"
@@ -57,6 +57,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/color.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_COLOR_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_COLOR_HXX
-#define OOX_DRAWINGML_COLOR_HXX
+#define INCLUDED_OOX_DRAWINGML_COLOR_HXX
 
 #include <vector>
 #include <boost/shared_ptr.hpp>

include/oox/drawingml/colorchoicecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
-#define OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 

include/oox/drawingml/connectorshapecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
-#define OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
@@ -36,6 +36,6 @@ public:
 
 } }
 
-#endif  //  OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/customshapegeometry.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
-#define OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
+#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "oox/helper/propertymap.hxx"
@@ -66,6 +66,6 @@ private:
 
 } }
 
-#endif // OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/customshapeproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
-#define OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
@@ -184,6 +184,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
+#endif // INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/diagram/diagram.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_DIAGRAM_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
-#define OOX_DRAWINGML_DIAGRAM_HXX
+#define INCLUDED_OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
 
 #include <rtl/ustring.hxx>
 #include "oox/drawingml/shape.hxx"

include/oox/drawingml/drawingmltypes.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TYPES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
-#define OOX_DRAWINGML_TYPES_HXX
+#define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/style/TabAlign.hpp>

include/oox/drawingml/effectproperties.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
-#define OOX_DRAWINGML_EFFECTPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
 
 #include "oox/drawingml/fillproperties.hxx"
 

include/oox/drawingml/effectpropertiescontext.hxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/dllapi.h"
@@ -35,6 +35,6 @@ protected:
 
 } }
 
-#endif // OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/embeddedwavaudiofile.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
-#define OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
+#define INCLUDED_OOX_DRAWINGML_EMBEDDEDWAVAUDIOFILE_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>

include/oox/drawingml/fillproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_FILLPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
-#define OOX_DRAWINGML_FILLPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
 
 #include <map>
 #include <com/sun/star/graphic/XGraphic.hpp>

include/oox/drawingml/fillpropertiesgroupcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HPP
+#ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
-#define OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HPP
+#define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
 
 #include "oox/drawingml/colorchoicecontext.hxx"
 #include "oox/drawingml/fillproperties.hxx"

include/oox/drawingml/graphicshapecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
-#define OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
@@ -103,6 +103,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/guidcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_GUIDCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX
-#define OOX_DRAWINGML_GUIDCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 

include/oox/drawingml/lineproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_LINEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
-#define OOX_DRAWINGML_LINEPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
 
 #include "oox/drawingml/fillproperties.hxx"
 

include/oox/drawingml/linepropertiescontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/dllapi.h"
@@ -46,6 +46,6 @@ protected:
 
 } }
 
-#endif // OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/objectdefaultcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
-#define OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -38,6 +38,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/scene3dcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
+#ifndef INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
-#define OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
+#define INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -39,6 +39,6 @@ private:
 
 } }
 
-#endif // OOX_DRAWINGML_SCENE3DPROPERTIESCONTEXT_HPP
+#endif // INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/shape.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPE_HXX
-#define OOX_DRAWINGML_SHAPE_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
 #include "oox/helper/propertymap.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
@@ -280,6 +280,6 @@ private:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPE_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/shape3dproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
-#define OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
 
 #include <map>
 #include <com/sun/star/graphic/XGraphic.hpp>

include/oox/drawingml/shapecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
-#define OOX_DRAWINGML_SHAPECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 
 #include <com/sun/star/drawing/XShapes.hpp>
 
@@ -47,6 +47,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/shapegroupcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
-#define OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/drawingml/shapecontext.hxx"
@@ -41,6 +41,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/shapepropertiescontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
@@ -38,6 +38,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/shapepropertymap.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
-#define OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 
 #include "oox/helper/propertymap.hxx"
 #include "oox/dllapi.h"

include/oox/drawingml/shapestylecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
-#define OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/core/contexthandler2.hxx"
@@ -39,6 +39,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/spdefcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SPDEFCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
-#define OOX_DRAWINGML_SPDEFCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
 #include "oox/drawingml/shape.hxx"
 #include "oox/core/contexthandler2.hxx"
@@ -37,6 +37,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SPDEFCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/table/tablecell.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLECELL_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
-#define OOX_DRAWINGML_TABLECELL_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 
 #include "oox/helper/propertymap.hxx"
 #include "oox/drawingml/color.hxx"
@@ -110,6 +110,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLECELL_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/table/tableproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLEPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
-#define OOX_DRAWINGML_TABLEPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 
 #include "oox/drawingml/table/tablerow.hxx"
 #include "oox/drawingml/table/tablestyle.hxx"
@@ -75,6 +75,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLEPROPERTIES_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/table/tablerow.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLEROW_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
-#define OOX_DRAWINGML_TABLEROW_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 
 #include "oox/drawingml/table/tablecell.hxx"
 #include <vector>
@@ -44,6 +44,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLEROW_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/table/tablestyle.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
-#define OOX_DRAWINGML_TABLESTYLE_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 
 #include "oox/drawingml/table/tablestylepart.hxx"
 #include "oox/drawingml/drawingmltypes.hxx"
@@ -80,6 +80,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLESTYLE_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/table/tablestylelist.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLELIST_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
-#define OOX_DRAWINGML_TABLESTYLELIST_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
 
 #include <rtl/ustring.hxx>
 #include <boost/shared_ptr.hpp>
@@ -49,6 +49,6 @@ typedef boost::shared_ptr< TableStyleList > TableStyleListPtr;
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLESTYLELIST_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/table/tablestylelistfragmenthandler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLELISTFRAGMENTHANDLER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
-#define OOX_DRAWINGML_TABLESTYLELISTFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
 
 #include "oox/drawingml/table/tablestylelist.hxx"
 #include "oox/core/fragmenthandler2.hxx"

include/oox/drawingml/table/tablestylepart.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TABLESTYLEPART_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
-#define OOX_DRAWINGML_TABLESTYLEPART_HXX
+#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
 
 #include <rtl/ustring.hxx>
 #include <boost/optional.hpp>
@@ -68,6 +68,6 @@ private:
 
 } } }
 
-#endif  //  OOX_DRAWINGML_TABLESTYLEPART_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textbody.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODY_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
-#define OOX_DRAWINGML_TEXTBODY_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 
 #include "oox/drawingml/drawingmltypes.hxx"
 #include "oox/drawingml/textbodyproperties.hxx"
@@ -68,6 +68,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTBODY_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textbodycontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
 
 #include <com/sun/star/text/XText.hpp>
 
@@ -57,6 +57,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textbodyproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
-#define OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
 
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include "oox/helper/helper.hxx"

include/oox/drawingml/textbodypropertiescontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -41,6 +41,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textcharacterproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
-#define OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertymap.hxx"

include/oox/drawingml/textcharacterpropertiescontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
@@ -42,6 +42,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textfield.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTFIELD_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX
-#define OOX_DRAWINGML_TEXTFIELD_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTFIELD_HXX
 
 #include <boost/shared_ptr.hpp>
 

include/oox/drawingml/textfieldcontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 

include/oox/drawingml/textfont.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGNML_TEXTFONT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTFONT_HXX
-#define OOX_DRAWINGNML_TEXTFONT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTFONT_HXX
 
 #include <rtl/ustring.hxx>
 

include/oox/drawingml/textliststyle.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTLISTSTYLE_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
-#define OOX_DRAWINGML_TEXTLISTSTYLE_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
 #include "oox/drawingml/textparagraphproperties.hxx"
 #include "oox/helper/refvector.hxx"
@@ -56,6 +56,6 @@ typedef boost::shared_ptr< TextListStyle > TextListStylePtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTLISTSTYLE_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textliststylecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
-#define OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
 #include "oox/drawingml/textliststyle.hxx"
 #include "oox/core/contexthandler2.hxx"
@@ -39,6 +39,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textparagraph.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTPARAGRAPH_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
-#define OOX_DRAWINGML_TEXTPARAGRAPH_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
 
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -66,6 +66,6 @@ typedef boost::shared_ptr< TextParagraph > TextParagraphPtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTPARAGRAPH_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textparagraphproperties.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
-#define OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "oox/drawingml/fillpropertiesgroupcontext.hxx"
@@ -123,6 +123,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textparagraphpropertiescontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
 
 #include <list>
 
@@ -52,6 +52,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIESCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textrun.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTRUN_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
-#define OOX_DRAWINGML_TEXTRUN_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
 
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
@@ -57,6 +57,6 @@ typedef boost::shared_ptr< TextRun > TextRunPtr;
 
 } }
 
-#endif  //  OOX_DRAWINGML_TEXTRUN_HXX
+#endif // INCLUDED_OOX_DRAWINGML_TEXTRUN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/oox/drawingml/textspacing.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGNML__TEXTSPACING_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX
-#define OOX_DRAWINGNML__TEXTSPACING_HXX
+#define INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX
 
 #include <rtl/ustring.hxx>
 

include/oox/drawingml/theme.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_THEME_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_THEME_HXX
-#define OOX_DRAWINGML_THEME_HXX
+#define INCLUDED_OOX_DRAWINGML_THEME_HXX
 
 #include "oox/drawingml/clrscheme.hxx"
 #include "oox/drawingml/shape.hxx"

include/oox/drawingml/themeelementscontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
-#define OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
+#define INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 

include/oox/drawingml/themefragmenthandler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
+#ifndef INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
-#define OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/dllapi.h"