Avoid reserved identifiers

Change-Id: I15609fb6b11606d865d8817f4a63ba8816f7384e

dbaccess/inc/dbaccess_helpid.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_DBACCESS_HELPID_HRC_
-#define _DBA_DBACCESS_HELPID_HRC_
+#ifndef INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC
+#define INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC
 
 
 #define HID_DATABROWSE_HEADER                             "DBACCESS_HID_DATABROWSE_HEADER"
@@ -168,6 +168,6 @@
 
 
 
-#endif // _DBA_DBACCESS_HELPID_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/inc/dbaccess_slotid.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACCESS_SLOTID_HRC_
-#define _DBACCESS_SLOTID_HRC_
+#ifndef INCLUDED_DBACCESS_INC_DBACCESS_SLOTID_HRC
+#define INCLUDED_DBACCESS_INC_DBACCESS_SLOTID_HRC
 
 #include <sfx2/sfxsids.hrc>
 
@@ -105,6 +105,6 @@
 
 #define SID_QUERY_PROP_DLG              ( SID_DBACCESS_START +  69 )
 
-#endif // _DBACCESS_SLOTID_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/core/inc/core_resource.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_RESOURCE_HRC_
-#define _DBA_CORE_RESOURCE_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
 
 #include <svl/solar.hrc>
 
@@ -96,6 +96,6 @@
 
 #define RID_NO_SUCH_DATA_SOURCE                 ( RID_CORE_STRINGS_START + 67 )
 
-#endif // _DBA_CORE_RESOURCE_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/core/inc/dbamiscres.hrc

@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_MISCRES_HRC_
-#define _DBA_MISCRES_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DBAMISCRES_HRC
 
 #define STR_MYSQL_NATIVE        24
 
 #define STR_END                 STR_MYSQL_NATIVE + 1
 
-#endif // _DBA_MISCRES_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/inc/stringconstants.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBASHARED_STRINGCONSTANTS_HRC_
-#define _DBASHARED_STRINGCONSTANTS_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC
+#define INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC
 
 #ifndef STRINGCONSTANTS_INCLUDED_INDIRECT
 #error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
@@ -172,6 +172,6 @@
 #define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER   145
 #define PROPERTY_ID_PROPCHANGE_NOTIFY       146
 
-#endif // _DBASHARED_STRINGCONSTANTS_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/app/dbu_app.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 _DBU_APP_HRC_
-#define _DBU_APP_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_DBU_APP_HRC
 
 #include "dbu_resource.hrc"
 
@@ -61,6 +61,6 @@
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
-#endif // _DBU_APP_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_brw.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 _DBU_BRW_HRC_
-#define _DBU_BRW_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_BRW_HRC
 
 #include "dbu_resource.hrc"
 
@@ -42,6 +42,6 @@
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
-#endif // _DBU_BRW_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_control.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 _DBU_CONTROL_HRC_
-#define _DBU_CONTROL_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_CONTROL_HRC
 
 #include "dbu_resource.hrc"
 
@@ -42,6 +42,6 @@
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
-#endif //_DBU_CONTROL_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_dlg.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 _DBU_DLG_HRC_
-#define _DBU_DLG_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC
 
 #include "dbu_resource.hrc"
 
@@ -150,6 +150,6 @@
 #error Resource-Id Overflow in #file, #line
 #endif
 
-#endif //_DBU_DLG_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_misc.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 _DBU_MISC_HRC_
-#define _DBU_MISC_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_MISC_HRC
 
 #include "dbu_resource.hrc"
 
@@ -50,6 +50,6 @@
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
-#endif // _DBU_MISC_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_qry.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 _DBU_QRY_HRC_
-#define _DBU_QRY_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_QRY_HRC
 
 #include "dbu_resource.hrc"
 
@@ -78,6 +78,6 @@
 #error resource id overflow in #file, #line
 #endif
 
-#endif // _DBU_QRY_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_rel.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 _DBU_REL_HRC_
-#define _DBU_REL_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_REL_HRC
 
 #include "dbu_resource.hrc"
 
@@ -34,6 +34,6 @@
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
-#endif //_DBU_REL_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_resource.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBU_RESOURCE_HRC_
-#define _DBU_RESOURCE_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC
 
 #include <svl/solar.hrc>
 
@@ -220,6 +220,6 @@
 
 #define PB_FORMAT                       RID_MISC_START +  0
 
-#endif // _DBU_RESOURCE_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_tbl.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 _DBU_TBL_HRC_
-#define _DBU_TBL_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_TBL_HRC
 
 #include "dbu_resource.hrc"
 
@@ -84,6 +84,6 @@
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
-#endif // _DBU_TBL_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/ui/inc/dbu_uno.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 _DBU_UNO_HRC_
-#define _DBU_UNO_HRC_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_UNO_HRC
 
 #include "dbu_resource.hrc"
 
@@ -41,6 +41,6 @@
 #error too many resources in uno ....
 #endif
 
-#endif // _DBU_UNO_HRC_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */