Avoid reserved identifiers

Change-Id: I7d5eec4c8bcfc79edb3c0ea37cf73b4249f44f46

cui/source/dialogs/fmsearch.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 _FMSEARCH_HRC
-#define _FMSEARCH_HRC
+#ifndef INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
+#define INCLUDED_CUI_SOURCE_DIALOGS_FMSEARCH_HRC
 
 #include "svl/solar.hrc"
 
@@ -33,6 +33,6 @@
 #define RID_STR_OVERFLOW_BACKWARD                   (RID_FORMS_START +  35)
 #define RID_STR_SEARCH_COUNTING                     (RID_FORMS_START +  76)
 
-#endif // _FMSEARCH_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/inc/cuires.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CUI_RESID_HRC
-#define _CUI_RESID_HRC
+#ifndef INCLUDED_CUI_SOURCE_INC_CUIRES_HRC
+#define INCLUDED_CUI_SOURCE_INC_CUIRES_HRC
 
 #include <sfx2/sfx.hrc>
 #include <sfx2/dialogs.hrc>

cui/source/inc/helpid.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 _CUI_HELPID_HRC
-#define _CUI_HELPID_HRC
+#ifndef INCLUDED_CUI_SOURCE_INC_HELPID_HRC
+#define INCLUDED_CUI_SOURCE_INC_HELPID_HRC
 
 #include <svx/svxcommands.h>
 #include <sfx2/sfxcommands.h>

cui/source/options/optsave.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 _SVX_OPTSAVE_HRC
-#define _SVX_OPTSAVE_HRC
+#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
+#define INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HRC
 
 // defines ------------------------------------------------------------------
 
@@ -30,6 +30,6 @@
 #define APP_MATH                6
 #define APP_COUNT               7
 
-#endif // #ifndef _SVX_OPTSAVE_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/tabpages/align.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ALIGN_HRC
-#define _SVX_ALIGN_HRC
+#ifndef INCLUDED_CUI_SOURCE_TABPAGES_ALIGN_HRC
+#define INCLUDED_CUI_SOURCE_TABPAGES_ALIGN_HRC
 
 // image list for ValueSets:
 #define IL_LOCK_BMPS                1100

cui/source/tabpages/border.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 _SVX_BORDER_HRC
-#define _SVX_BORDER_HRC
+#ifndef INCLUDED_CUI_SOURCE_TABPAGES_BORDER_HRC
+#define INCLUDED_CUI_SOURCE_TABPAGES_BORDER_HRC
 
 // ImageList for ValueSets:
 #define IL_PRE_BITMAPS          1400

cui/source/tabpages/paragrph.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 _SVX_PARAGRPH_HRC
-#define _SVX_PARAGRPH_HRC
+#ifndef INCLUDED_CUI_SOURCE_TABPAGES_PARAGRPH_HRC
+#define INCLUDED_CUI_SOURCE_TABPAGES_PARAGRPH_HRC
 
 // StandardTabPage ----------------------------------------------------------