Avoid reserved identifiers

Change-Id: I481621d58b94163e32f9b5f19187d8ad587f2b1d

include/svtools/controldims.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_CONTROLDIMS_HRC_
-#define _SVT_CONTROLDIMS_HRC_
+#ifndef INCLUDED_SVTOOLS_CONTROLDIMS_HRC
+#define INCLUDED_SVTOOLS_CONTROLDIMS_HRC
 
 // From: Dialogue Specification and Guidelines - Visual Design V1.3
 // by Christian Jansen
@@ -52,6 +52,6 @@
 #define RSC_SP_DLG_INNERBORDER_RIGHT        6
 #define RSC_SP_DLG_INNERBORDER_BOTTOM       6
 
-#endif // _SVT_CONTROLDIMS_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

include/svtools/helpid.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_HELPID_HRC
-#define _SVT_HELPID_HRC
+#ifndef INCLUDED_SVTOOLS_HELPID_HRC
+#define INCLUDED_SVTOOLS_HELPID_HRC
 
 #define HID_FILEDLG_LINK_CB                                    "SVT_HID_FILEDLG_LINK_CB"
 #define HID_FILEDLG_PREVIEW_CB                                 "SVT_HID_FILEDLG_PREVIEW_CB"

include/svtools/imagemgr.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_IMAGEMGR_HRC
-#define _SVTOOLS_IMAGEMGR_HRC
+#ifndef INCLUDED_SVTOOLS_IMAGEMGR_HRC
+#define INCLUDED_SVTOOLS_IMAGEMGR_HRC
 
 #define IMAGELIST_START                 3076  // must match to old Id's in SFX!
 

include/svtools/svtools.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 _SVTOOLS_HRC
-#define _SVTOOLS_HRC
+#ifndef INCLUDED_SVTOOLS_SVTOOLS_HRC
+#define INCLUDED_SVTOOLS_SVTOOLS_HRC
 
 #include <svl/solar.hrc>
 
@@ -266,6 +266,6 @@
 #define STR_PARAGRAPH_START                 (STR_SVT_PRNDLG_START + 50)
 #define STR_PARAGRAPH                       (STR_PARAGRAPH_START + 0)
 
-#endif  // #ifndef _SVTOOLS_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svtools/source/brwbox/editbrowsebox.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_EDITBROWSEBOX_HRC_
-#define _SVTOOLS_EDITBROWSEBOX_HRC_
+#ifndef INCLUDED_SVTOOLS_SOURCE_BRWBOX_EDITBROWSEBOX_HRC
+#define INCLUDED_SVTOOLS_SOURCE_BRWBOX_EDITBROWSEBOX_HRC
 
 #define IMG_EBB_CURRENT             1
 #define IMG_EBB_MODIFIED            2
@@ -30,6 +30,6 @@
 #define IMG_EBB_FILTER              8
 #define IMG_EBB_HEADERFOOTER        9
 
-#endif // _SVTOOLS_EDITBROWSEBOX_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svtools/source/contnr/templwin.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 _SVTOOLS_TEMPLWIN_HRC
-#define _SVTOOLS_TEMPLWIN_HRC
+#ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HRC
+#define INCLUDED_SVTOOLS_SOURCE_CONTNR_TEMPLWIN_HRC
 
 #define DI_TITLE                1
 #define DI_FROM                 2
@@ -32,6 +32,6 @@
 #define DI_THEME                11
 #define DI_SIZE                 12
 
-#endif // _SVTOOLS_TEMPLWIN_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svtools/source/dialogs/addresstemplate.hrc

@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_ADDRESSTEMPLATE_HRC_
-#define _SVT_ADDRESSTEMPLATE_HRC_
+#ifndef INCLUDED_SVTOOLS_SOURCE_DIALOGS_ADDRESSTEMPLATE_HRC
+#define INCLUDED_SVTOOLS_SOURCE_DIALOGS_ADDRESSTEMPLATE_HRC
 
 #define FIELD_PAIRS_VISIBLE         5
 #define FIELD_CONTROLS_VISIBLE      2 * FIELD_PAIRS_VISIBLE
 
-#endif // _SVT_ADDRESSTEMPLATE_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */