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>

15 files changed, 37 insertions, 37 deletions

diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx
index ff249ab23fa3..e1f7b20a5afb 100644
--- a/include/comphelper/scoped_disposing_ptr.hxx
+++ b/include/comphelper/scoped_disposing_ptr.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _SCOPED_DISPOSING_PTR
-#define _SCOPED_DISPOSING_PTR
+#ifndef INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX
+#define INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <boost/utility.hpp>
diff --git a/include/svl/svldllapi.h b/include/svl/svldllapi.h
index cd4ae4f42a7a..0e62d3f3b177 100644
--- a/include/svl/svldllapi.h
+++ b/include/svl/svldllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVLDLLAPI_H
-#define INCLUDED_SVLDLLAPI_H
+#ifndef INCLUDED_SVL_SVLDLLAPI_H
+#define INCLUDED_SVL_SVLDLLAPI_H
 
 #include <sal/types.h>
 
@@ -29,6 +29,6 @@
 #endif
 #define SVL_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_SVLDLLAPI_H */
+#endif // INCLUDED_SVL_SVLDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/systools/win32/comptr.hxx b/include/systools/win32/comptr.hxx
index 5e5b6b6886c1..db027274bc63 100644
--- a/include/systools/win32/comptr.hxx
+++ b/include/systools/win32/comptr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COMPTR_HXX
-#define COMPTR_HXX
+#ifndef INCLUDED_SYSTOOLS_WIN32_COMPTR_HXX
+#define INCLUDED_SYSTOOLS_WIN32_COMPTR_HXX
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
diff --git a/include/systools/win32/snprintf.h b/include/systools/win32/snprintf.h
index e5e60eaa9ada..92e571f91ee8 100644
--- a/include/systools/win32/snprintf.h
+++ b/include/systools/win32/snprintf.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SNPRINTF_H
-#define _SNPRINTF_H
+#ifndef INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H
+#define INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H
 
 #if     !defined(_WIN32)
 #error ERROR: Only Win32 target supported!
@@ -83,6 +83,6 @@ _SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char
 }
 #endif
 
-#endif /* _SNPRINTF_H */
+#endif // INCLUDED_SYSTOOLS_WIN32_SNPRINTF_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/test/htmltesttools.hxx b/include/test/htmltesttools.hxx
index 99d6bcf9eb89..1cc493241e83 100644
--- a/include/test/htmltesttools.hxx
+++ b/include/test/htmltesttools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef HTML_TEST_TOOLS_H
-#define HTML_TEST_TOOLS_H
+#ifndef INCLUDED_TEST_HTMLTESTTOOLS_HXX
+#define INCLUDED_TEST_HTMLTESTTOOLS_HXX
 
 #include <sal/config.h>
 #include <test/testdllapi.hxx>
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index 5a9cdb1fe3b0..3473f97a3c88 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef XML_TEST_TOOLS_H
-#define XML_TEST_TOOLS_H
+#ifndef INCLUDED_TEST_XMLTESTTOOLS_HXX
+#define INCLUDED_TEST_XMLTESTTOOLS_HXX
 
 #include <sal/config.h>
 #include <test/testdllapi.hxx>
diff --git a/include/vbahelper/vbadllapi.h b/include/vbahelper/vbadllapi.h
index b54b705d46d0..ff4861de5b67 100644
--- a/include/vbahelper/vbadllapi.h
+++ b/include/vbahelper/vbadllapi.h
@@ -29,6 +29,6 @@
 #endif
 #define VBAHELPER_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_SVLDLLAPI_H */
+#endif // INCLUDED_VBAHELPER_VBADLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx
index 356257f6a899..fe7154832298 100644
--- a/include/vcl/oldprintadaptor.hxx
+++ b/include/vcl/oldprintadaptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VCL_OLDPRINTADAPTOR
-#define _VCL_OLDPRINTADAPTOR
+#ifndef INCLUDED_VCL_OLDPRINTADAPTOR_HXX
+#define INCLUDED_VCL_OLDPRINTADAPTOR_HXX
 
 #include <vcl/print.hxx>
 
diff --git a/include/vcl/outdevmap.hxx b/include/vcl/outdevmap.hxx
index cda9e629b864..d35c02b9c8ea 100644
--- a/include/vcl/outdevmap.hxx
+++ b/include/vcl/outdevmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_OUTDEVMAP_HXX
-#define INCLUDED_VCL_INC_OUTDEVMAP_HXX
+#ifndef INCLUDED_VCL_OUTDEVMAP_HXX
+#define INCLUDED_VCL_OUTDEVMAP_HXX
 
 
 struct ImplMapRes
@@ -39,6 +39,6 @@ struct ImplThresholdRes
     long                mnThresPixToLogY;   // ""
 };
 
-#endif // INCLUDED_VCL_INC_OUTDEVMAP_HXX
+#endif // INCLUDED_VCL_OUTDEVMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index 1a08845f9694..39aedcbab390 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_OUTDEVSTATE_HXX
-#define INCLUDED_VCL_INC_OUTDEVSTATE_HXX
+#ifndef INCLUDED_VCL_OUTDEVSTATE_HXX
+#define INCLUDED_VCL_OUTDEVSTATE_HXX
 
 #include <sal/types.h>
 
@@ -73,6 +73,6 @@ public:
     sal_uInt16      mnFlags;
 };
 
-#endif // INCLUDED_VCL_INC_OUTDEVSTATE_HXX
+#endif // INCLUDED_VCL_OUTDEVSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgcci/jni_md.h b/include/wntgcci/jni_md.h
index e77438d75e6b..3e596f45ac65 100644
--- a/include/wntgcci/jni_md.h
+++ b/include/wntgcci/jni_md.h
@@ -19,8 +19,8 @@
 
 /* Fake jni_md.h for use when cross-compiling to Windows */
 
-#ifndef JNI_MD_H_INCLUDED
-#define JNI_MD_H_INCLUDED
+#ifndef INCLUDED_WNTGCCI_JNI_MD_H
+#define INCLUDED_WNTGCCI_JNI_MD_H
 
 #define JNIEXPORT __declspec (dllexport)
 #define JNIIMPORT __declspec (dllimport)
@@ -30,6 +30,6 @@ typedef long jint;
 typedef __int64 jlong;
 typedef char jbyte;
 
-#endif /* JNI_MD_H_INCLUDED */
+#endif // INCLUDED_WNTGCCI_JNI_MD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgcci/sehandler.hxx b/include/wntgcci/sehandler.hxx
index 6f196d88e668..5ba2ec1f2402 100644
--- a/include/wntgcci/sehandler.hxx
+++ b/include/wntgcci/sehandler.hxx
@@ -4,8 +4,8 @@
 // but from where it got there, I don't know.
 
 
-#ifndef _SEHANDLER_HXX
-#define _SEHANDLER_HXX
+#ifndef INCLUDED_WNTGCCI_SEHANDLER_HXX
+#define INCLUDED_WNTGCCI_SEHANDLER_HXX
 
 #if !defined( __MINGW32__ ) || defined ( _WIN64 )
 #error This file should be included only in a 32-bit MinGW compilation
@@ -125,4 +125,4 @@ private:
 
 } // namespace {
 
-#endif // _SEHANDLER_HXX
+#endif // INCLUDED_WNTGCCI_SEHANDLER_HXX
diff --git a/include/wntgccx/jni_md.h b/include/wntgccx/jni_md.h
index 4d80f3878a6c..add4e2640d8a 100644
--- a/include/wntgccx/jni_md.h
+++ b/include/wntgccx/jni_md.h
@@ -19,8 +19,8 @@
 
 /* Fake jni_md.h for use when cross-compiling to Windows */
 
-#ifndef JNI_MD_H_INCLUDED
-#define JNI_MD_H_INCLUDED
+#ifndef INCLUDED_WNTGCCX_JNI_MD_H
+#define INCLUDED_WNTGCCX_JNI_MD_H
 
 #define JNIEXPORT __declspec (dllexport)
 #define JNIIMPORT __declspec (dllimport)
@@ -30,6 +30,6 @@ typedef long jint;
 typedef __int64 jlong;
 typedef char jbyte;
 
-#endif /* JNI_MD_H_INCLUDED */
+#endif // INCLUDED_WNTGCCX_JNI_MD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgccx/sehandler.hxx b/include/wntgccx/sehandler.hxx
index 49bd0f21eb50..e80a8283e429 100644
--- a/include/wntgccx/sehandler.hxx
+++ b/include/wntgccx/sehandler.hxx
@@ -2,8 +2,8 @@
 
 /* From mingw-w64 excpt.h */
 
-#ifndef _SEHANDLER_HXX
-#define _SEHANDLER_HXX
+#ifndef INCLUDED_WNTGCCX_SEHANDLER_HXX
+#define INCLUDED_WNTGCCX_SEHANDLER_HXX
 
 #if !defined( __MINGW32__ ) || !defined ( _WIN64 )
 #error This file should be included only in a 64-bit MinGW compilation
@@ -42,5 +42,5 @@
 #endif
 
 
-#endif // _SEHANDLER_HXX
+#endif // INCLUDED_WNTGCCX_SEHANDLER_HXX
 
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 886e4bc60ae0..2bde5003c7c0 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__
-#define __COMPHELPER_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER__
+#ifndef INCLUDED_XMLOFF_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER_HXX
+#define INCLUDED_XMLOFF_UNOINTERFACETOUNIQUEIDENTIFIERMAPPER_HXX
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>