fixincludeguards.sh: include - the rest

Change-Id: If1ee11da444a7f96f2d8668b277540da0bb4dbe9

16 files changed, 33 insertions, 33 deletions

diff --git a/include/filter/dllapi.h b/include/filter/dllapi.h
index 5b93bff8f0dd..1f0f30349871 100644
--- a/include/filter/dllapi.h
+++ b/include/filter/dllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILTER_DLLAPI_H
-#define _FILTER_DLLAPI_H
+#ifndef INCLUDED_FILTER_DLLAPI_H
+#define INCLUDED_FILTER_DLLAPI_H
 
 #include "sal/config.h"
 #include "sal/types.h"
diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx
index b70f649b05c3..2d3f6383753f 100644
--- a/include/filter/msfilter/countryid.hxx
+++ b/include/filter/msfilter/countryid.hxx
@@ -19,8 +19,8 @@
 
 // ============================================================================
 
-#ifndef INCLUDED_SVX_COUNTRYID_HXX
-#define INCLUDED_SVX_COUNTRYID_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX
+#define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX
 
 #include <sal/types.h>
 #include <i18nlangtag/lang.h>
diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx
index e4e9e90a5a6e..da24017229cf 100644
--- a/include/filter/msfilter/dffpropset.hxx
+++ b/include/filter/msfilter/dffpropset.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 _DFFPROPSET_HXX
-#define _DFFPROPSET_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX
+#define INCLUDED_FILTER_MSFILTER_DFFPROPSET_HXX
 
 #include <tools/solar.h>
 #include <filter/msfilter/msfilterdllapi.h>
diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx
index ca2fcc368c46..9453a0dd5f90 100644
--- a/include/filter/msfilter/dffrecordheader.hxx
+++ b/include/filter/msfilter/dffrecordheader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DFFRECORDHEADER_HXX
-#define _DFFRECORDHEADER_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX
+#define INCLUDED_FILTER_MSFILTER_DFFRECORDHEADER_HXX
 
 #include <tools/solar.h>
 #include <tools/stream.hxx>
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index e21805a0d208..3aaf94a1c378 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ESCHEREX_HXX
-#define _SVX_ESCHEREX_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_ESCHEREX_HXX
+#define INCLUDED_FILTER_MSFILTER_ESCHEREX_HXX
 
 #include <memory>
 #include <vector>
diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx
index f321441e2941..4a69b4a0dff2 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_MSCODEC_HXX
-#define SVX_MSCODEC_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_MSCODEC_HXX
+#define INCLUDED_FILTER_MSFILTER_MSCODEC_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 16675dbe9f0e..d7328de834a6 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FLT_MSDFFIMP_HXX
-#define FLT_MSDFFIMP_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX
+#define INCLUDED_FILTER_MSFILTER_MSDFFIMP_HXX
 
 #include <string.h>
 
diff --git a/include/filter/msfilter/msfilterdllapi.h b/include/filter/msfilter/msfilterdllapi.h
index 03816baa92fc..492e2309a079 100644
--- a/include/filter/msfilter/msfilterdllapi.h
+++ b/include/filter/msfilter/msfilterdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_MSFILTER_DLLAPI_H
-#define INCLUDED_MSFILTER_DLLAPI_H
+#ifndef INCLUDED_FILTER_MSFILTER_MSFILTERDLLAPI_H
+#define INCLUDED_FILTER_MSFILTER_MSFILTERDLLAPI_H
 
 #include "sal/types.h"
 
diff --git a/include/filter/msfilter/msocximex.hxx b/include/filter/msfilter/msocximex.hxx
index 79815e49126e..1cf6a1a17c6b 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.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 _MSOCXIMEX_HXX
-#define _MSOCXIMEX_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
+#define INCLUDED_FILTER_MSFILTER_MSOCXIMEX_HXX
 
 #include <sot/storage.hxx>
 
diff --git a/include/filter/msfilter/msoleexp.hxx b/include/filter/msfilter/msoleexp.hxx
index 468fa6284513..6ec4da63783a 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.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 _MSOLEEXP_HXX
-#define _MSOLEEXP_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX
+#define INCLUDED_FILTER_MSFILTER_MSOLEEXP_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include "filter/msfilter/msfilterdllapi.h"
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index b76d7790c379..438602cdd1f0 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef _MSTOOLBAR_HXX
-#define _MSTOOLBAR_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
+#define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #include "filter/msfilter/msfilterdllapi.h"
 #include <sot/storage.hxx>
 #include <ostream>
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index bafcc461a598..4cb318dfdfcb 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.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 _MSVBAHELPER_HXX
-#define _MSVBAHELPER_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
+#define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 
 #include <sfx2/objsh.hxx>
 #include <cppuhelper/implbase3.hxx>
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx
index dab61f82eb87..b9a1de290b09 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_MSFILTER_RTFUTIL_HXX
-#define INCLUDED_MSFILTER_RTFUTIL_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_RTFUTIL_HXX
+#define INCLUDED_FILTER_MSFILTER_RTFUTIL_HXX
 
 #include <filter/msfilter/msfilterdllapi.h>
 #include <rtl/string.hxx>
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 239325df8cbe..a81b0f6b3992 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDFPPT_HXX
-#define _SVDFPPT_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
+#define INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
 
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
@@ -1561,6 +1561,6 @@ public :
 #define PPT_PLACEHOLDER_ORGANISZATIONCHART      23  // 24 Organization Chart
 #define PPT_PLACEHOLDER_MEDIACLIP               24  // 25 Media Clip
 
-#endif //_SVDFPPT_HXX
+#endif // INCLUDED_FILTER_MSFILTER_SVDFPPT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/filter/msfilter/svxmsbas.hxx b/include/filter/msfilter/svxmsbas.hxx
index 8f87401edee5..61d2ff3e1068 100644
--- a/include/filter/msfilter/svxmsbas.hxx
+++ b/include/filter/msfilter/svxmsbas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVXMSBAS_HXX
-#define _SVXMSBAS_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX
+#define INCLUDED_FILTER_MSFILTER_SVXMSBAS_HXX
 
 #include <tools/solar.h>
 #include "filter/msfilter/msfilterdllapi.h"
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 0da3aafde875..8c9f29a5ef30 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_MSFILTER_UTIL_HXX
-#define INCLUDED_MSFILTER_UTIL_HXX
+#ifndef INCLUDED_FILTER_MSFILTER_UTIL_HXX
+#define INCLUDED_FILTER_MSFILTER_UTIL_HXX
 
 #include <rtl/textenc.h>
 #include <tools/datetime.hxx>