fixincludeguards.sh: oox

Change-Id: Ibc1fb5c149461d6030749a974c6d37aa11ad0e16

27 files changed, 56 insertions, 81 deletions

diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 00a3d384a99c..371f5b4c27ca 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DOCPROP_DOCPROPHANDLER_HXX
-#define OOX_DOCPROP_DOCPROPHANDLER_HXX
+#ifndef INCLUDED_OOX_SOURCE_DOCPROP_DOCPROPHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_DOCPROP_DOCPROPHANDLER_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index acbf15de00c2..bd20b335dc7b 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DOCPROP_OOXMLDOCPROPIMPORT_HXX
-#define OOX_DOCPROP_OOXMLDOCPROPIMPORT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DOCPROP_OOXMLDOCPROPIMPORT_HXX
+#define INCLUDED_OOX_SOURCE_DOCPROP_OOXMLDOCPROPIMPORT_HXX
 
 #include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx
index 78b1bd27f34c..ba1bc2c0e4ee 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.hxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_CONSTRAINTLISTCONTEXT_HXX
-#define OOX_DRAWINGML_CONSTRAINTLISTCONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_CONSTRAINTLISTCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_CONSTRAINTLISTCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "diagramlayoutatoms.hxx"
diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx
index eb2333efff55..3f85def3c841 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.hxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_SHAPECONTEXT_HXX
-#define OOX_DRAWINGML_SHAPECONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DATAMODELCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DATAMODELCONTEXT_HXX
 
 #include <com/sun/star/drawing/XShapes.hpp>
 
@@ -42,6 +42,6 @@ protected:
 
 } }
 
-#endif  //  OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
+#endif // INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DATAMODELCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 3df38a8bc3cf..608f47e8cb77 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
-#define OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAM_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAM_HXX
 
 #include <map>
 #include <vector>
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
index 983c2dfa3591..afd1c35b3029 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_DIAGRAMDEFINITIONCONTEXT_HXX
-#define OOX_DRAWINGML_DIAGRAMDEFINITIONCONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMDEFINITIONCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMDEFINITIONCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "diagram.hxx"
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index af86a900caa0..e5c14c37bbbc 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_DIAGRAMFRAGMENTHANDLER
-#define OOX_DRAWINGML_DIAGRAMFRAGMENTHANDLER
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/diagram/diagram.hxx"
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index a377c84c77a0..efecaeb7b72c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_DIAGRAMLAYOUTATOMS_HXX
-#define OOX_DRAWINGML_DIAGRAMLAYOUTATOMS_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMLAYOUTATOMS_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMLAYOUTATOMS_HXX
 
 #include <map>
 #include <string>
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index 69055fd2e37e..e7b297fa7992 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_LAYOUTNODECONTEXT_HXX
-#define OOX_DRAWINGML_LAYOUTNODECONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_LAYOUTNODECONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_LAYOUTNODECONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "diagramlayoutatoms.hxx"
diff --git a/oox/source/drawingml/hyperlinkcontext.hxx b/oox/source/drawingml/hyperlinkcontext.hxx
index 8431863c8628..8bdf9cd1b3a0 100644
--- a/oox/source/drawingml/hyperlinkcontext.hxx
+++ b/oox/source/drawingml/hyperlinkcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_HYPERLINKCONTEXT_HXX
-#define OOX_DRAWINGML_HYPERLINKCONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_HYPERLINKCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_HYPERLINKCONTEXT_HXX
 
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include "oox/core/contexthandler2.hxx"
diff --git a/oox/source/drawingml/textspacingcontext.hxx b/oox/source/drawingml/textspacingcontext.hxx
index a287764c10fd..366884d1a200 100644
--- a/oox/source/drawingml/textspacingcontext.hxx
+++ b/oox/source/drawingml/textspacingcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTSPACINGCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTSPACINGCONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_TEXTSPACINGCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_TEXTSPACINGCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 
diff --git a/oox/source/drawingml/texttabstoplistcontext.hxx b/oox/source/drawingml/texttabstoplistcontext.hxx
index 4e5fabaa5ecf..58b3d1766c34 100644
--- a/oox/source/drawingml/texttabstoplistcontext.hxx
+++ b/oox/source/drawingml/texttabstoplistcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_DRAWINGML_TEXTTABSTOPLISTCONTEXT_HXX
-#define OOX_DRAWINGML_TEXTTABSTOPLISTCONTEXT_HXX
+#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_TEXTTABSTOPLISTCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_DRAWINGML_TEXTTABSTOPLISTCONTEXT_HXX
 
 #include <list>
 
diff --git a/oox/source/ppt/animationtypes.hxx b/oox/source/ppt/animationtypes.hxx
index ab26abe8abed..d82918a844bb 100644
--- a/oox/source/ppt/animationtypes.hxx
+++ b/oox/source/ppt/animationtypes.hxx
@@ -19,8 +19,8 @@
 
 
 
-#ifndef OOX_POWERPOINT_ANIMATIONTYPES_HXX
-#define OOX_POWERPOINT_ANIMATIONTYPES_HXX
+#ifndef INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX
+#define INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX
 
 
 #include <com/sun/star/uno/Any.hxx>
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 4a1e70f01c47..7affdf9d6478 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
-#ifndef OOX_PPT_ANIMVARIANTCONTEXT
-#define OOX_PPT_ANIMVARIANTCONTEXT
-
+#ifndef INCLUDED_OOX_SOURCE_PPT_ANIMVARIANTCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_ANIMVARIANTCONTEXT_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 
@@ -48,7 +45,6 @@ namespace oox { namespace ppt {
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/buildlistcontext.hxx b/oox/source/ppt/buildlistcontext.hxx
index 8ad7156576ef..1ee2d9a9c9b9 100644
--- a/oox/source/ppt/buildlistcontext.hxx
+++ b/oox/source/ppt/buildlistcontext.hxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
-#ifndef OOX_PPT_BUILDLISTCONTEXT
-#define OOX_PPT_BUILDLISTCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_PPT_BUILDLISTCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_BUILDLISTCONTEXT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index c99941d47318..cbfaf7f90046 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -17,9 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#ifndef OOX_PPT_COMMONBEHAVIORCONTEXT
-#define OOX_PPT_COMMONBEHAVIORCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_PPT_COMMONBEHAVIORCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_COMMONBEHAVIORCONTEXT_HXX
 
 #include <rtl/ustring.hxx>
 #include "oox/ppt/timenodelistcontext.hxx"
@@ -63,7 +62,6 @@ namespace oox { namespace ppt {
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index eca7d5cd67f1..d72d0a2cd3f6 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -17,17 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#ifndef OOX_PPT_COMMONTIMENODECONTEXT
-#define OOX_PPT_COMMONTIMENODECONTEXT
-
+#ifndef INCLUDED_OOX_SOURCE_PPT_COMMONTIMENODECONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_COMMONTIMENODECONTEXT_HXX
 
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include "oox/ppt/timenode.hxx"
 #include "oox/ppt/timenodelistcontext.hxx"
 #include "conditioncontext.hxx"
 
-
 namespace oox { namespace ppt {
 
     /** CT_TLCommonTimeNodeData */
@@ -50,7 +47,6 @@ namespace oox { namespace ppt {
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 12df6964dd06..710869a275d3 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -17,9 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#ifndef OOX_PPT_CONDITIONCONTEXT
-#define OOX_PPT_CONDITIONCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_PPT_CONDITIONCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_CONDITIONCONTEXT_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/animations/Event.hpp>
@@ -70,7 +69,6 @@ namespace oox { namespace ppt {
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 8de27efe7a82..d7befd3053cb 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_PPT_EXTDRAWINGFRAGMENTHANDLER
-#define OOX_PPT_EXTDRAWINGFRAGMENTHANDLER
+#ifndef INCLUDED_OOX_SOURCE_PPT_EXTDRAWINGFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_PPT_EXTDRAWINGFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/shapegroupcontext.hxx"
@@ -43,7 +43,6 @@ private:
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/headerfootercontext.hxx b/oox/source/ppt/headerfootercontext.hxx
index aa6ba3bad343..c9fc6eb80702 100644
--- a/oox/source/ppt/headerfootercontext.hxx
+++ b/oox/source/ppt/headerfootercontext.hxx
@@ -19,8 +19,8 @@
 
 
 
-#ifndef OOX_PPT_HEADERFOOTERCONTEXT
-#define OOX_PPT_HEADERFOOTERCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_PPT_HEADERFOOTERCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_HEADERFOOTERCONTEXT_HXX
 
 #include "oox/ppt/headerfooter.hxx"
 #include "oox/core/fragmenthandler2.hxx"
diff --git a/oox/source/ppt/pptfilterhelpers.hxx b/oox/source/ppt/pptfilterhelpers.hxx
index 67efbbf51020..cf167614073f 100644
--- a/oox/source/ppt/pptfilterhelpers.hxx
+++ b/oox/source/ppt/pptfilterhelpers.hxx
@@ -17,9 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#ifndef OOX_PPT_PPTFILTERHELPERS
-#define OOX_PPT_PPTFILTERHELPERS
+#ifndef INCLUDED_OOX_SOURCE_PPT_PPTFILTERHELPERS_HXX
+#define INCLUDED_OOX_SOURCE_PPT_PPTFILTERHELPERS_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -92,7 +91,6 @@ namespace oox { namespace ppt {
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ppt/timeanimvaluecontext.hxx b/oox/source/ppt/timeanimvaluecontext.hxx
index c10f58e53497..c74d2fbc43c5 100644
--- a/oox/source/ppt/timeanimvaluecontext.hxx
+++ b/oox/source/ppt/timeanimvaluecontext.hxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
-#ifndef OOX_PPT_TIMEANIMVALUELISTCONTEXT
-#define OOX_PPT_TIMEANIMVALUELISTCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_PPT_TIMEANIMVALUECONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_TIMEANIMVALUECONTEXT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/ppt/animationspersist.hxx"
@@ -47,9 +45,6 @@ namespace oox { namespace ppt {
         bool                     mbInValue;
     };
 
-
-
-
 } }
 
 #endif
diff --git a/oox/source/ppt/timetargetelementcontext.hxx b/oox/source/ppt/timetargetelementcontext.hxx
index cb566659c30e..d3e592d9c179 100644
--- a/oox/source/ppt/timetargetelementcontext.hxx
+++ b/oox/source/ppt/timetargetelementcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_PPT_TIMETARGETELEMENTCONTEXT
-#define OOX_PPT_TIMETARGETELEMENTCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_PPT_TIMETARGETELEMENTCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_PPT_TIMETARGETELEMENTCONTEXT_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/ppt/animationspersist.hxx"
@@ -40,7 +40,6 @@ namespace oox { namespace ppt {
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index e3ea631af274..01b994b8b760 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_SHAPE_LOCKEDCANVASCONTEXT
-#define OOX_SHAPE_LOCKEDCANVASCONTEXT
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_LOCKEDCANVASCONTEXT_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_LOCKEDCANVASCONTEXT_HXX
 
 #include "oox/core/contexthandler2.hxx"
 #include "oox/drawingml/shape.hxx"
@@ -34,7 +34,6 @@ protected:
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index a1e8e0297055..d7a49a128d4e 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.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 OOX_SHAPE_SHAPE_CONTEXT_HANDLER_HXX
-#define OOX_SHAPE_SHAPE_CONTEXT_HANDLER_HXX
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -168,6 +168,6 @@ private:
 
 }}
 
-#endif // OOX_SHAPE_SHAPE_CONTEXT_HANDLER_HXX
+#endif // INCLUDED_OOX_SOURCE_SHAPE_SHAPECONTEXTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index 09612dd1bea7..82478b724d99 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef OOX_SHAPE_DRAWINGFRAGMENTHANDLER
-#define OOX_SHAPE_DRAWINGFRAGMENTHANDLER
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEDRAWINGFRAGMENTHANDLER_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_SHAPEDRAWINGFRAGMENTHANDLER_HXX
 
 #include "oox/core/fragmenthandler2.hxx"
 #include "oox/drawingml/shapegroupcontext.hxx"
@@ -31,7 +31,6 @@ private:
 
 } }
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index abdece1c4600..330eee1d4f4a 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOX_SHAPE_SHAPEFILTERBASE_HXX
-#define OOX_SHAPE_SHAPEFILTERBASE_HXX
+#ifndef INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX
+#define INCLUDED_OOX_SOURCE_SHAPE_SHAPEFILTERBASE_HXX
 
 #include <boost/shared_ptr.hpp>
 #include <rtl/ref.hxx>