Avoid reserved identifiers

Change-Id: Ia2be9eeda4c1035f8e1d3b68446807aeffe59453

15 files changed, 36 insertions, 36 deletions

diff --git a/include/sfx2/cntids.hrc b/include/sfx2/cntids.hrc
index 216ed27d0ed5..83124f5565e9 100644
--- a/include/sfx2/cntids.hrc
+++ b/include/sfx2/cntids.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CNTIDS_HRC
-#define _CNTIDS_HRC
+#ifndef INCLUDED_SFX2_CNTIDS_HRC
+#define INCLUDED_SFX2_CNTIDS_HRC
 
 #include <svl/solar.hrc>
 
diff --git a/include/sfx2/dialogs.hrc b/include/sfx2/dialogs.hrc
index bdd47367da08..d1e4f70e0de9 100644
--- a/include/sfx2/dialogs.hrc
+++ b/include/sfx2/dialogs.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 _SFX2_DIALOGS_HRC
-#define _SFX2_DIALOGS_HRC
+#ifndef INCLUDED_SFX2_DIALOGS_HRC
+#define INCLUDED_SFX2_DIALOGS_HRC
 
 #include <sfx2/sfxsids.hrc>
 
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index af7fb1e1362e..33a052585391 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_HRC
-#define _SFX_HRC
+#ifndef INCLUDED_SFX2_SFX_HRC
+#define INCLUDED_SFX2_SFX_HRC
 
 #include <svl/solar.hrc>
 #include <svl/memberid.hrc>
@@ -255,6 +255,6 @@
 
 #include <sfx2/sfxsids.hrc>
 
-#endif // #ifndef _SFX_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index be15c6e35255..2e3743b45bd8 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.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 _SFXSIDS_HRC
-#define _SFXSIDS_HRC
+#ifndef INCLUDED_SFX2_SFXSIDS_HRC
+#define INCLUDED_SFX2_SFXSIDS_HRC
 
 #include <svl/solar.hrc>
 #include <sfx2/cntids.hrc>
@@ -692,7 +692,7 @@
 
 #define SID_RESTORE_EDITING_VIEW            (SID_SFX_START + 1663)
 
-#endif  // #ifndef _SFXSIDS_HRC
+#endif  // #ifndef INCLUDED_SFX2_SFXSIDS_HRC
 
 // SfxSecurityPage related stuff
 
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
index b181c7c18e4f..85fd0cfba98a 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.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 _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC
-#define _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC
+#ifndef INCLUDED_SFX2_SIDEBAR_RESOURCEDEFINITIONS_HRC
+#define INCLUDED_SFX2_SIDEBAR_RESOURCEDEFINITIONS_HRC
 
 #include <sfx2/sfx.hrc>
 
@@ -55,6 +55,6 @@
 #define POPUPPANEL_MARGIN_LARGE     5
 
 
-#endif /* _SFX_SIDEBAR_RESOURCE_DEFINITIONS_HRC */
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/filedlghelper.hrc b/sfx2/inc/filedlghelper.hrc
index 42c66fa715ee..e63c9955b282 100644
--- a/sfx2/inc/filedlghelper.hrc
+++ b/sfx2/inc/filedlghelper.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_FILEDLGHELPER_HRC
-#define _SFX_FILEDLGHELPER_HRC
+#ifndef INCLUDED_SFX2_INC_FILEDLGHELPER_HRC
+#define INCLUDED_SFX2_INC_FILEDLGHELPER_HRC
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index fc06eda0d9c3..c49ec8295d0f 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/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 _SFX_APP_HRC
-#define _SFX_APP_HRC
+#ifndef INCLUDED_SFX2_SOURCE_APPL_APP_HRC
+#define INCLUDED_SFX2_SOURCE_APPL_APP_HRC
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sfx2/source/appl/newhelp.hrc b/sfx2/source/appl/newhelp.hrc
index 6cafd4984cd6..0965e5380357 100644
--- a/sfx2/source/appl/newhelp.hrc
+++ b/sfx2/source/appl/newhelp.hrc
@@ -16,15 +16,15 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFX_NEWHELP_HRC
-#define _SFX_NEWHELP_HRC
+#ifndef INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HRC
+#define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HRC
 
 // context menu ids
 #define MID_OPEN                                1
 #define MID_RENAME                              2
 #define MID_DELETE                              3
 
-#endif // #ifndef _SFX_NEWHELP_HRC
+#endif
 
 // ******************************************************************* EOF
 
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx
index 7ea006f10431..ef95eead5e1a 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SHUTDOWNICON_HXX__
-#define __SHUTDOWNICON_HXX__
+#ifndef INCLUDED_SFX2_SOURCE_APPL_SHUTDOWNICON_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_SHUTDOWNICON_HXX
 
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XDesktop2.hpp>
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 58fb183b62b7..b5d6d977e6fd 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_DIALOG_HRC
-#define _SFX_DIALOG_HRC
+#ifndef INCLUDED_SFX2_SOURCE_DIALOG_DIALOG_HRC
+#define INCLUDED_SFX2_SOURCE_DIALOG_DIALOG_HRC
 
 #include <sfx2/sfx.hrc>
 
@@ -65,6 +65,6 @@
 #define STR_STYLE_ELEMTLIST             ( RC_DIALOG_BEGIN + 125 )
 #define STR_FONT_TABPAGE                ( RC_DIALOG_BEGIN + 126 )
 
-#endif // #ifndef _SFX_DIALOG_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/dinfdlg.hrc b/sfx2/source/dialog/dinfdlg.hrc
index 20a62311a9a3..615aa4d8d80c 100644
--- a/sfx2/source/dialog/dinfdlg.hrc
+++ b/sfx2/source/dialog/dinfdlg.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 _DINFDLG_HRC
-#define _DINFDLG_HRC
+#ifndef INCLUDED_SFX2_SOURCE_DIALOG_DINFDLG_HRC
+#define INCLUDED_SFX2_SOURCE_DIALOG_DINFDLG_HRC
 
 #include <svtools/controldims.hrc>
 
diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc
index a2e8f68160d9..a51fdc2bd101 100644
--- a/sfx2/source/doc/doc.hrc
+++ b/sfx2/source/doc/doc.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 _SFX_DOC_HRC
-#define _SFX_DOC_HRC
+#ifndef INCLUDED_SFX2_SOURCE_DOC_DOC_HRC
+#define INCLUDED_SFX2_SOURCE_DOC_DOC_HRC
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 1794246c1be2..d9c102b59dde 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/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 _SFX_HELPID_HRC
-#define _SFX_HELPID_HRC
+#ifndef INCLUDED_SFX2_SOURCE_INC_HELPID_HRC
+#define INCLUDED_SFX2_SOURCE_INC_HELPID_HRC
 
 #include <sfx2/sfxcommands.h>
 
@@ -62,6 +62,6 @@
 
 #define HID_SIDEBAR_WINDOW                                     "SFX2_HID_SIDEBAR_WINDOW"
 
-#endif // #ifndef _SFX_HELPID_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 4b6d132b1876..43cd4d6a5c50 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -19,8 +19,8 @@
 
 // local resources
 
-#ifndef _SFXLOCAL_HRC
-#define _SFXLOCAL_HRC
+#ifndef INCLUDED_SFX2_SOURCE_INC_SFXLOCAL_HRC
+#define INCLUDED_SFX2_SOURCE_INC_SFXLOCAL_HRC
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sfx2/source/view/view.hrc b/sfx2/source/view/view.hrc
index 3c374328144b..548c43592561 100644
--- a/sfx2/source/view/view.hrc
+++ b/sfx2/source/view/view.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 _SFX_VIEW_HRC
-#define _SFX_VIEW_HRC
+#ifndef INCLUDED_SFX2_SOURCE_VIEW_VIEW_HRC
+#define INCLUDED_SFX2_SOURCE_VIEW_VIEW_HRC
 
 #include <sfx2/sfx.hrc>