Avoid reserved identifiers

Change-Id: Ib8cbcdff79ad8d621b8e9567df0afe32e9501279

14 files changed, 30 insertions, 30 deletions

diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
index 1b36f26725c7..37cdc6106ff6 100644
--- a/sw/inc/access.hrc
+++ b/sw/inc/access.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCESS_HRC
-#define _ACCESS_HRC
+#ifndef INCLUDED_SW_INC_ACCESS_HRC
+#define INCLUDED_SW_INC_ACCESS_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc
index 279b2a798902..d66c656f42a4 100644
--- a/sw/inc/chrdlg.hrc
+++ b/sw/inc/chrdlg.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CHRDLG_HRC
-#define _CHRDLG_HRC
+#ifndef INCLUDED_SW_INC_CHRDLG_HRC
+#define INCLUDED_SW_INC_CHRDLG_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index f56dd0829da4..1d73e40c3ead 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -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 _COMCORE_HRC
-#define _COMCORE_HRC
+#ifndef INCLUDED_SW_INC_COMCORE_HRC
+#define INCLUDED_SW_INC_COMCORE_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index e85523b3dc14..5557fa379612 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBUI_HRC
-#define _DBUI_HRC
+#ifndef INCLUDED_SW_INC_DBUI_HRC
+#define INCLUDED_SW_INC_DBUI_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 769101d9ce0d..f65b7f9f9830 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DIALOG_HRC
-#define _DIALOG_HRC
+#ifndef INCLUDED_SW_INC_DIALOG_HRC
+#define INCLUDED_SW_INC_DIALOG_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index 4e4f7f65ed63..6b03f5e6c7f1 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DOCHDL_HRC
-#define _DOCHDL_HRC
+#ifndef INCLUDED_SW_INC_DOCHDL_HRC
+#define INCLUDED_SW_INC_DOCHDL_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/envelp.hrc b/sw/inc/envelp.hrc
index d9e73c34b36b..5bc9789a2f27 100644
--- a/sw/inc/envelp.hrc
+++ b/sw/inc/envelp.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENVELP_HRC
-#define _ENVELP_HRC
+#ifndef INCLUDED_SW_INC_ENVELP_HRC
+#define INCLUDED_SW_INC_ENVELP_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index ab53fea827da..c48dbd11eefe 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -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 _FLDUI_HRC
-#define _FLDUI_HRC
+#ifndef INCLUDED_SW_INC_FLDUI_HRC
+#define INCLUDED_SW_INC_FLDUI_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 447143533929..1959e52720cb 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GLOBALS_HRC
-#define _GLOBALS_HRC
+#ifndef INCLUDED_SW_INC_GLOBALS_HRC
+#define INCLUDED_SW_INC_GLOBALS_HRC
 
 #include "rcid.hrc"
 
@@ -211,6 +211,6 @@
 #define SID_WRT_SHELL               (RC_GLOBALS_BEGIN +  117)
 
 
-#endif // _GLOBALS_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index aa4b9842c1b5..ce3643a4a34d 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -21,8 +21,8 @@
 #define RC_INDEX_BEGIN 256
 */
 
-#ifndef _INDEX_HRC
-#define _INDEX_HRC
+#ifndef INCLUDED_SW_INC_INDEX_HRC
+#define INCLUDED_SW_INC_INDEX_HRC
 
 #include "rcid.hrc"
 
@@ -74,6 +74,6 @@
 #define  STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
 #define  STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
 
-#endif  // _INDEX_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc
index ddcf72a23dd2..a6b472b8b90b 100644
--- a/sw/inc/poolfmt.hrc
+++ b/sw/inc/poolfmt.hrc
@@ -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 _POOLFMT_HRC
-#define _POOLFMT_HRC
+#ifndef INCLUDED_SW_INC_POOLFMT_HRC
+#define INCLUDED_SW_INC_POOLFMT_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index f80958807599..528c5bb59bcf 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -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 _RDIC_HRC
-#define _RDIC_HRC
+#ifndef INCLUDED_SW_INC_RCID_HRC
+#define INCLUDED_SW_INC_RCID_HRC
 
 #include <sfx2/sfxsids.hrc>
 
diff --git a/sw/inc/statstr.hrc b/sw/inc/statstr.hrc
index 2afca6f941d3..813a3bf53efa 100644
--- a/sw/inc/statstr.hrc
+++ b/sw/inc/statstr.hrc
@@ -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 _STATSTR_HRC
-#define _STATSTR_HRC
+#ifndef INCLUDED_SW_INC_STATSTR_HRC
+#define INCLUDED_SW_INC_STATSTR_HRC
 
 #include "rcid.hrc"
 
diff --git a/sw/inc/unocore.hrc b/sw/inc/unocore.hrc
index 13bdaaf7621f..7f8dbdeabb79 100644
--- a/sw/inc/unocore.hrc
+++ b/sw/inc/unocore.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOCORE_HRC
-#define _UNOCORE_HRC
+#ifndef INCLUDED_SW_INC_UNOCORE_HRC
+#define INCLUDED_SW_INC_UNOCORE_HRC
 
 #include "rcid.hrc"