fixincludeguards.sh: some smaller dirs

Change-Id: Ic25bd678dc299627299b22145efd7bebcf2b39d0

26 files changed, 66 insertions, 66 deletions

diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx
index 7909e8fbd4f5..c5179b46db05 100644
--- a/hwpfilter/source/attributes.hxx
+++ b/hwpfilter/source/attributes.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _CONFIGMGR_MISC_ATTRIBUTES_HXX_
-#define _CONFIGMGR_MISC_ATTRIBUTES_HXX_
+#ifndef INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
+#define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -61,7 +61,7 @@ private:
     struct AttributeListImpl_impl *m_pImpl;
 };
 
-#endif // _CONFIGMGR_MISC_ATTRIBUTES_HXX_
+#endif // INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/cspline.h b/hwpfilter/source/cspline.h
index ebb747f48d72..c65f555dab11 100644
--- a/hwpfilter/source/cspline.h
+++ b/hwpfilter/source/cspline.h
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CSPLINE_H_
-#define _CSPLINE_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_CSPLINE_H
+#define INCLUDED_HWPFILTER_SOURCE_CSPLINE_H
 
 void NaturalSpline (int N, double* x, double* a, double*& b, double*& c,
     double*& d);
 void PeriodicSpline (int N, double* x, double* a, double*& b, double*& c,
     double*& d);
 
-#endif /* _CSPLINE_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_CSPLINE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/datecode.h b/hwpfilter/source/datecode.h
index 46de85b5e1a6..89507b419157 100644
--- a/hwpfilter/source/datecode.h
+++ b/hwpfilter/source/datecode.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __DATECODE_H__
-#define __DATECODE_H__
+#ifndef INCLUDED_HWPFILTER_SOURCE_DATECODE_H
+#define INCLUDED_HWPFILTER_SOURCE_DATECODE_H
 
 static const hchar defaultform[] =
 {
diff --git a/hwpfilter/source/drawdef.h b/hwpfilter/source/drawdef.h
index c5861e74862a..6169892422f8 100644
--- a/hwpfilter/source/drawdef.h
+++ b/hwpfilter/source/drawdef.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DRAWDEF_H_
-#define _DRAWDEF_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_DRAWDEF_H
+#define INCLUDED_HWPFILTER_SOURCE_DRAWDEF_H
 
 #include "hwplib.h"
 
@@ -245,6 +245,6 @@ struct HWPDrawingObject
     HWPDrawingObject();
     ~HWPDrawingObject();
 };
-#endif                                            /* _DRAWDEF_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_DRAWDEF_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index de8afcf96ac5..8190d0e9b9b2 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DRAWING_H_
-#define _DRAWING_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_DRAWING_H
+#define INCLUDED_HWPFILTER_SOURCE_DRAWING_H
 
 #include "precompile.h"
 
diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h
index 6d3aa48c53ae..e208522eb979 100644
--- a/hwpfilter/source/formula.h
+++ b/hwpfilter/source/formula.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FORMULA_H__
-#define __FORMULA_H__
+#ifndef INCLUDED_HWPFILTER_SOURCE_FORMULA_H
+#define INCLUDED_HWPFILTER_SOURCE_FORMULA_H
 
 // DVO: remove DEBUG dependency
 // #ifndef DEBUG
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index f27913780be4..32ffa58e2651 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HBOX_H_
-#define _HBOX_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HBOX_H
+#define INCLUDED_HWPFILTER_SOURCE_HBOX_H
 
 #include <sal/config.h>
 
@@ -1035,6 +1035,6 @@ struct FixedSpace: public HBox
 
     virtual bool Read(HWPFile &hwpf) SAL_OVERRIDE;
 };
-#endif                                            /* _HBOX_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HBOX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hcode.h b/hwpfilter/source/hcode.h
index d6e565d294a9..799d41b4508f 100644
--- a/hwpfilter/source/hcode.h
+++ b/hwpfilter/source/hcode.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HCODE_H_
-#define _HCODE_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HCODE_H
+#define INCLUDED_HWPFILTER_SOURCE_HCODE_H
 
 #include "hwplib.h"
 
@@ -71,6 +71,6 @@ DLLEXPORT char *base64_encode_string( const uchar *buf, unsigned int len );
 DLLEXPORT double calcAngle(int x1, int y1, int x2, int y2);
 
 
-#endif                                            /* _HCODE_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HCODE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hfont.h b/hwpfilter/source/hfont.h
index cb7e118a0e0d..1ed8fa6bb3cd 100644
--- a/hwpfilter/source/hfont.h
+++ b/hwpfilter/source/hfont.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPFONTS_H_
-#define _HWPFONTS_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HFONT_H
+#define INCLUDED_HWPFILTER_SOURCE_HFONT_H
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/hwpfilter/source/hgzip.h b/hwpfilter/source/hgzip.h
index a586cc422c74..140146c5405e 100644
--- a/hwpfilter/source/hgzip.h
+++ b/hwpfilter/source/hgzip.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPGZIP_H_
-#define _HWPGZIP_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HGZIP_H
+#define INCLUDED_HWPFILTER_SOURCE_HGZIP_H
 
 #include <zlib.h>
 
@@ -96,6 +96,6 @@ int     gz_read     ( gz_stream *file, voidp  buf, unsigned len );
  * @param flush Is as in the deflate() function
  */
 int     gz_flush    ( gz_stream *file, int flush );
-#endif                                            /* _HWPGZIP_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HGZIP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h
index 4aa7458444ed..c16a6ef32b84 100644
--- a/hwpfilter/source/hinfo.h
+++ b/hwpfilter/source/hinfo.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPINFO_H_
-#define _HWPINFO_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HINFO_H
+#define INCLUDED_HWPFILTER_SOURCE_HINFO_H
 
 #include "hwplib.h"
 
@@ -251,6 +251,6 @@ struct ParaShape
     bool  Read(HWPFile &);
 //  virtual ~ParaShape();
 };
-#endif                                            /* _HWPINFO_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HINFO_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h
index 1bc920fec424..f5ccad7998db 100644
--- a/hwpfilter/source/hiodev.h
+++ b/hwpfilter/source/hiodev.h
@@ -22,8 +22,8 @@
  * (C) 1999 Mizi Research, All rights are reserved
  */
 
-#ifndef _HIODEV_H_
-#define _HIODEV_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HIODEV_H
+#define INCLUDED_HWPFILTER_SOURCE_HIODEV_H
 
 #include <sal/config.h>
 
@@ -159,6 +159,6 @@ class HMemIODev : public HIODev
     protected:
         virtual void init() SAL_OVERRIDE;
 };
-#endif                                            /* _HIODEV_H_*/
+#endif // INCLUDED_HWPFILTER_SOURCE_HIODEV_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h
index c33d51d11335..a2bae585f505 100644
--- a/hwpfilter/source/hpara.h
+++ b/hwpfilter/source/hpara.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPPARA_H_
-#define _HWPPARA_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HPARA_H
+#define INCLUDED_HWPFILTER_SOURCE_HPARA_H
 
 #include <hwplib.h>
 #include <hwpfile.h>
@@ -169,6 +169,6 @@ inline int HWPPara::LineLen(int line) const
 {
     return EndPos(line) - HomePos(line);
 }
-#endif                                            /* _HWPPARA_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HPARA_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hstream.h b/hwpfilter/source/hstream.h
index af21439bb783..9535ced29b11 100644
--- a/hwpfilter/source/hstream.h
+++ b/hwpfilter/source/hstream.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HSTREAM_H_
-#define _HSTREAM_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HSTREAM_H
+#define INCLUDED_HWPFILTER_SOURCE_HSTREAM_H
 
 typedef unsigned char byte;
 /**
diff --git a/hwpfilter/source/hstyle.h b/hwpfilter/source/hstyle.h
index 4332a7d62da4..1dd37ea48ccb 100644
--- a/hwpfilter/source/hstyle.h
+++ b/hwpfilter/source/hstyle.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPSTYLE_H_
-#define _HWPSTYLE_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HSTYLE_H
+#define INCLUDED_HWPFILTER_SOURCE_HSTYLE_H
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/hwpfilter/source/htags.h b/hwpfilter/source/htags.h
index 3b7006bec586..681832643e1e 100644
--- a/hwpfilter/source/htags.h
+++ b/hwpfilter/source/htags.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HTAGS_H_
-#define _HTAGS_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HTAGS_H
+#define INCLUDED_HWPFILTER_SOURCE_HTAGS_H
 
 class HWPFile;
 /**
@@ -65,6 +65,6 @@ struct OlePicture
 
     bool Read(HWPFile& hwpf);
 };
-#endif                                            /* _HTAGS_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HTAGS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hutil.h b/hwpfilter/source/hutil.h
index 95a8a7e3efff..9f9fbec3a572 100644
--- a/hwpfilter/source/hutil.h
+++ b/hwpfilter/source/hutil.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UTIL_H_
-#define _UTIL_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HUTIL_H
+#define INCLUDED_HWPFILTER_SOURCE_HUTIL_H
 
 #include "hbox.h"
 /**
diff --git a/hwpfilter/source/hwpeq.h b/hwpfilter/source/hwpeq.h
index c7226c1adb2a..f5ab84a557fe 100644
--- a/hwpfilter/source/hwpeq.h
+++ b/hwpfilter/source/hwpeq.h
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPEQ_H_
-#define _HWPEQ_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HWPEQ_H
+#define INCLUDED_HWPFILTER_SOURCE_HWPEQ_H
 
 #include "mzstring.h"
 
 void eq2latex(MzString &mstr, char *str);
 
-#endif /* _HWPEQ_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HWPEQ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index a404bf4c14be..a50ad584396e 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -22,8 +22,8 @@
 // (C) 1998 Mizi Research, All rights are reserved
 
 
-#ifndef _HWPFILE_H_
-#define _HWPFILE_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HWPFILE_H
+#define INCLUDED_HWPFILTER_SOURCE_HWPFILE_H
 
 #include <list>
 #include <stdio.h>
@@ -299,6 +299,6 @@ class DLLEXPORT HWPFile
 
 HWPFile *GetCurrentDoc(void);
 HWPFile *SetCurrentDoc(HWPFile *hwpfp);
-#endif                                            /* _HWPFILE_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_HWPFILE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwplib.h b/hwpfilter/source/hwplib.h
index da8a253c65fc..25691b90d40d 100644
--- a/hwpfilter/source/hwplib.h
+++ b/hwpfilter/source/hwplib.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPLIB_H_
-#define _HWPLIB_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HWPLIB_H
+#define INCLUDED_HWPFILTER_SOURCE_HWPLIB_H
 #include "precompile.h"
 
 #include <string>
@@ -236,6 +236,6 @@ enum DebugMask
 #  include <unistd.h>
 #  define DIRSEP '/'
 #endif
-#endif                                            /* _HWPLIB_H_*/
+#endif // INCLUDED_HWPFILTER_SOURCE_HWPLIB_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 306b2f5a7c73..def38dd3533b 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HWPREADER_HXX_
-#define _HWPREADER_HXX_
+#ifndef INCLUDED_HWPFILTER_SOURCE_HWPREADER_HXX
+#define INCLUDED_HWPFILTER_SOURCE_HWPREADER_HXX
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index c2b820f8f710..e205657a7f48 100644
--- a/hwpfilter/source/list.hxx
+++ b/hwpfilter/source/list.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef list_hxx
-#define list_hxx
+#ifndef INCLUDED_HWPFILTER_SOURCE_LIST_HXX
+#define INCLUDED_HWPFILTER_SOURCE_LIST_HXX
 
 /**
  * Re-implement a simple container: LinkedList + LinkedListIterator
diff --git a/hwpfilter/source/mapping.h b/hwpfilter/source/mapping.h
index 48ee0b081e92..e8d6c0d33a7c 100644
--- a/hwpfilter/source/mapping.h
+++ b/hwpfilter/source/mapping.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __MAPPING_H__
-#define __MAPPING_H__
+#ifndef INCLUDED_HWPFILTER_SOURCE_MAPPING_H
+#define INCLUDED_HWPFILTER_SOURCE_MAPPING_H
 
 #include <string.h>
 #include <stdio.h>
diff --git a/hwpfilter/source/mzstring.h b/hwpfilter/source/mzstring.h
index f2a3cc229389..8c6f59419b3f 100644
--- a/hwpfilter/source/mzstring.h
+++ b/hwpfilter/source/mzstring.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MZSTRING_H_
-#define _MZSTRING_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_MZSTRING_H
+#define INCLUDED_HWPFILTER_SOURCE_MZSTRING_H
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -172,6 +172,6 @@ inline const char* MzString::c_str() const
 
 // Non friend, non member operators
 
-#endif                                            /* _MZSTRING_H_ */
+#endif // INCLUDED_HWPFILTER_SOURCE_MZSTRING_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/nodes.h b/hwpfilter/source/nodes.h
index f0a15bda93ad..3c292ad62d8e 100644
--- a/hwpfilter/source/nodes.h
+++ b/hwpfilter/source/nodes.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __NODES_H__
-#define __NODES_H__
+#ifndef INCLUDED_HWPFILTER_SOURCE_NODES_H
+#define INCLUDED_HWPFILTER_SOURCE_NODES_H
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/hwpfilter/source/solver.h b/hwpfilter/source/solver.h
index cfcf7aceb2a8..0b1fffd5301e 100644
--- a/hwpfilter/source/solver.h
+++ b/hwpfilter/source/solver.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SOLVER_H_
-#define _SOLVER_H_
+#ifndef INCLUDED_HWPFILTER_SOURCE_SOLVER_H
+#define INCLUDED_HWPFILTER_SOURCE_SOLVER_H
 
 class mgcLinearSystemD
 {