Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

9 files changed, 27 insertions, 27 deletions

diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index a446079f340d..e4b387ea51f6 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLBITMAP_HXX
-#define _CPPCANVAS_IMPLBITMAP_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XBitmap.hpp>
@@ -67,6 +67,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLBITMAP_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 5a96a3835df1..bae2541ce59f 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLBITMAPCANVAS_HXX
-#define _CPPCANVAS_IMPLBITMAPCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
@@ -59,6 +59,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLBITMAPCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLBITMAPCANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 63de9d4f87f1..8a6401f1c69a 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLCANVAS_HXX
-#define _CPPCANVAS_IMPLCANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/ViewState.hpp>
@@ -89,6 +89,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLCANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 69ac454e8c3a..2d5e0310eb10 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLCOLOR_HXX
-#define _CPPCANVAS_IMPLCOLOR_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -51,6 +51,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLCOLOR_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCOLOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index f3e5dff0e571..19187de4620e 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLCUSTOMSPRITE_HXX
-#define _CPPCANVAS_IMPLCUSTOMSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 
 #include <sal/types.h>
 
@@ -58,6 +58,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLCUSTOMSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index c754ab1449e0..227e7da83f99 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLFONT_HXX
-#define _CPPCANVAS_IMPLFONT_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -64,6 +64,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLFONT_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index fdfc19d548b9..b685bdcf7706 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CANVAS_IMPLPOLYPOLYGON_HXX
-#define _CANVAS_IMPLPOLYPOLYGON_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
@@ -82,6 +82,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CANVAS_IMPLPOLYPOLYGON_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 290fe9548831..8cb9d8fa9f39 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLSPRITE_HXX
-#define _CPPCANVAS_IMPLSPRITE_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
@@ -73,6 +73,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLSPRITE_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 60cd52e2563e..8a0223e1bee7 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPCANVAS_IMPLSPRITECANVAS_HXX
-#define _CPPCANVAS_IMPLSPRITECANVAS_HXX
+#ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
+#define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
 
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <basegfx/vector/b2dsize.hxx>
@@ -89,6 +89,6 @@ namespace cppcanvas
     }
 }
 
-#endif /* _CPPCANVAS_IMPLSPRITECANVAS_HXX */
+#endif // INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLSPRITECANVAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */