fixincludeguards.pl: now we can fix those

Change-Id: I8f29f6344592c2bb1ae0d03304cf6e18b6df3a29

include/sfx2/doctempl.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 _SFXDOCTEMPL_HXX
-#define _SFXDOCTEMPL_HXX
+#ifndef INCLUDED_SFX2_DOCTEMPL_HXX
+#define INCLUDED_SFX2_DOCTEMPL_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
@@ -133,7 +133,7 @@ public:
     void            Update( bool _bSmart = true );
 };
 
-#endif // #ifndef _SFXDOCTEMPL_HXX
+#endif // INCLUDED_SFX2_DOCTEMPL_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/sfx2/mgetempl.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 _SFX_MGETEMPL_HXX
-#define _SFX_MGETEMPL_HXX
+#ifndef INCLUDED_SFX2_MGETEMPL_HXX
+#define INCLUDED_SFX2_MGETEMPL_HXX
 
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>

include/sfx2/mnumgr.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 _SFXMNUMGR_HXX
-#define _SFXMNUMGR_HXX
+#ifndef INCLUDED_SFX2_MNUMGR_HXX
+#define INCLUDED_SFX2_MNUMGR_HXX
 
 #include <vcl/menu.hxx>
 #include <tools/wintypes.hxx>
@@ -105,6 +105,6 @@ public:
     Menu*                   GetSVMenu();
 };
 
-#endif // #ifndef _SFXMNUMGR_HXX
+#endif // INCLUDED_SFX2_MNUMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/sfx2/msgpool.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 _SFXMSGPOOL_HXX
-#define _SFXMSGPOOL_HXX
+#ifndef INCLUDED_SFX2_MSGPOOL_HXX
+#define INCLUDED_SFX2_MSGPOOL_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>

include/sfx2/new.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 _SFXNEW_HXX
-#define _SFXNEW_HXX
+#ifndef INCLUDED_SFX2_NEW_HXX
+#define INCLUDED_SFX2_NEW_HXX
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>

include/sfx2/newstyle.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 _NEWSTYLE_HXX
-#define _NEWSTYLE_HXX
+#ifndef INCLUDED_SFX2_NEWSTYLE_HXX
+#define INCLUDED_SFX2_NEWSTYLE_HXX
 
 #include <comphelper/string.hxx>
 #include <sal/config.h>

include/sfx2/prnmon.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 _SFX_PRNMON_HXX
-#define _SFX_PRNMON_HXX
+#ifndef INCLUDED_SFX2_PRNMON_HXX
+#define INCLUDED_SFX2_PRNMON_HXX
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>

include/sfx2/styledlg.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 _SFX_STYLEDLG_HXX
-#define _SFX_STYLEDLG_HXX
+#ifndef INCLUDED_SFX2_STYLEDLG_HXX
+#define INCLUDED_SFX2_STYLEDLG_HXX
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>

include/sfx2/templdlg.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 _SFX_TEMPLDLG_HXX
-#define _SFX_TEMPLDLG_HXX
+#ifndef INCLUDED_SFX2_TEMPLDLG_HXX
+#define INCLUDED_SFX2_TEMPLDLG_HXX
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>

include/sfx2/tplpitem.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 _SFX_TPLPITEM_HXX
-#define _SFX_TPLPITEM_HXX
+#ifndef INCLUDED_SFX2_TPLPITEM_HXX
+#define INCLUDED_SFX2_TPLPITEM_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>

include/svtools/ctrlbox.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CTRLBOX_HXX
-#define _CTRLBOX_HXX
+#ifndef INCLUDED_SVTOOLS_CTRLBOX_HXX
+#define INCLUDED_SVTOOLS_CTRLBOX_HXX
 
 #include <svtools/svtdllapi.h>
 
@@ -530,6 +530,6 @@ private:
     FontSizeBox&    operator =( const FontSizeBox& );
 };
 
-#endif  // _CTRLBOX_HXX
+#endif // INCLUDED_SVTOOLS_CTRLBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svtools/ctrltool.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CTRLTOOL_HXX
-#define _CTRLTOOL_HXX
+#ifndef INCLUDED_SVTOOLS_CTRLTOOL_HXX
+#define INCLUDED_SVTOOLS_CTRLTOOL_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
@@ -225,6 +225,6 @@ public:
     long                    GetIndexSize( sal_uLong nIndex ) const;
 };
 
-#endif  // _CTRLTOOL_HXX
+#endif // INCLUDED_SVTOOLS_CTRLTOOL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svtools/ruler.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RULER_HXX
-#define _RULER_HXX
+#ifndef INCLUDED_SVTOOLS_RULER_HXX
+#define INCLUDED_SVTOOLS_RULER_HXX
 
 #include <svtools/svtdllapi.h>
 #include <tools/link.hxx>
@@ -826,6 +826,6 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
 };
 
-#endif  // _RULER_HXX
+#endif // INCLUDED_SVTOOLS_RULER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svtools/scrwin.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SCRWIN_HXX
-#define _SCRWIN_HXX
+#ifndef INCLUDED_SVTOOLS_SCRWIN_HXX
+#define INCLUDED_SVTOOLS_SCRWIN_HXX
 
 #include <svtools/svtdllapi.h>
 

include/svtools/stdmenu.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _STDMENU_HXX
-#define _STDMENU_HXX
+#ifndef INCLUDED_SVTOOLS_STDMENU_HXX
+#define INCLUDED_SVTOOLS_STDMENU_HXX
 
 #include <svtools/svtdllapi.h>
 #include <tools/link.hxx>
@@ -156,6 +156,6 @@ public:
     const Link&     GetHighlightHdl() const { return maHighlightHdl; }
 };
 
-#endif  // _STDMENU_HXX
+#endif // INCLUDED_SVTOOLS_STDMENU_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svtools/valueset.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VALUESET_HXX
-#define _VALUESET_HXX
+#ifndef INCLUDED_SVTOOLS_VALUESET_HXX
+#define INCLUDED_SVTOOLS_VALUESET_HXX
 
 #include <svtools/svtdllapi.h>
 
@@ -388,6 +388,6 @@ public:
     void SetEdgeBlending(bool bNew);
 };
 
-#endif  // _VALUESET_HXX
+#endif // INCLUDED_SVTOOLS_VALUESET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/tools/config.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 _CONFIG_HXX
-#define _CONFIG_HXX
+#ifndef INCLUDED_TOOLS_CONFIG_HXX
+#define INCLUDED_TOOLS_CONFIG_HXX
 
 #include <tools/toolsdllapi.h>
 #include <rtl/ustring.hxx>