clean up some include guards

Conflicts:
sw/source/ui/inc/content.hxx

Change-Id: I58d81881271fc6e3320bf3b5f1321594b28614a6
Reviewed-on: https://gerrit.libreoffice.org/6388
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 15 insertions, 17 deletions

diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index ff92fba7c725..7d263ef7caab 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef IDOCUMENTFIELDSACCESS_HXX_INCLUDED
-#define IDOCUMENTFIELDSACCESS_HXX_INCLUDED
+#ifndef INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
+#define INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
 
 #include <sal/types.h>
 #include <tools/solar.h>
@@ -133,6 +133,6 @@ protected:
     virtual ~IDocumentFieldsAccess() {};
  };
 
- #endif // IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
+#endif // INCLUDED_SW_INC_IDOCUMENTFIELDSACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index a49eb20b24e2..3cc5d3ce62e2 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.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 _DRAWDOC_HXX
-#define _DRAWDOC_HXX
+#ifndef INCLUDED_SW_INC_DRAWDOC_HXX
+#define INCLUDED_SW_INC_DRAWDOC_HXX
 
 #include <svx/fmmodel.hxx>
 
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/ui/inc/concustomshape.hxx
index 39a712e7f147..96d6707b9a90 100644
--- a/sw/source/ui/inc/concustomshape.hxx
+++ b/sw/source/ui/inc/concustomshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_CONCUSTOMSHAPE_HXX
-#define _SW_CONCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
 
 #include <rtl/ustring.hxx>
 #include "drawbase.hxx"
@@ -58,8 +58,6 @@ class ConstCustomShape : public SwDrawBase
     virtual bool doConstructOrthogonal() const;
 };
 
-
-
-#endif      // _SW_CONRECT_HXX
+#endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index 3ae614e92609..b812d05ca87e 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.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 _CONTENT_HXX
-#define _CONTENT_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX
 #include <limits.h>
 #include "swcont.hxx"
 
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 3bf231e5bbde..7825ab5354ac 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.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 _OPTLOAD_HXX
-#define _OPTLOAD_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX
+#define INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/ui/vba/vbarevisions.hxx b/sw/source/ui/vba/vbarevisions.hxx
index acf0dc459436..693bbd25fae7 100644
--- a/sw/source/ui/vba/vbarevisions.hxx
+++ b/sw/source/ui/vba/vbarevisions.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 SW_VBA_PANES_HXX
-#define SW_VBA_PANES_HXX
+#ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX
+#define INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX
 
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/word/XRevisions.hpp>
@@ -52,6 +52,6 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames();
 };
 
-#endif /* SW_VBA_PANES_HXX */
+#endif // INCLUDED_SW_SOURCE_UI_VBA_VBAREVISIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */