Avoid reserved identifiers

Change-Id: I85135c3fa5e6fe823491739c3c1ab601505f0626

16 files changed, 39 insertions, 40 deletions

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 4ff3dc5936da..59a2de415ad7 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DIALOGS_HRC
-#define _SVX_DIALOGS_HRC
+#ifndef INCLUDED_SVX_DIALOGS_HRC
+#define INCLUDED_SVX_DIALOGS_HRC
 
 #include <svx/svxids.hrc>
 #include <sfx2/dialogs.hrc>
diff --git a/include/svx/exthelpid.hrc b/include/svx/exthelpid.hrc
index b89d2f5b9fa1..bcd17303b868 100644
--- a/include/svx/exthelpid.hrc
+++ b/include/svx/exthelpid.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_EXTHELPID_HRC
-#define _SVX_EXTHELPID_HRC
+#ifndef INCLUDED_SVX_EXTHELPID_HRC
+#define INCLUDED_SVX_EXTHELPID_HRC
 
 // these HIDs are used in SVX and also in other modules, mainly CUI
 // the reason is that different controls have the same help texts assigned
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index a6d878878897..abdb36228be6 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.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_FMRESIDS_HRC
-#define _SVX_FMRESIDS_HRC
+#ifndef INCLUDED_SVX_FMRESIDS_HRC
+#define INCLUDED_SVX_FMRESIDS_HRC
 
 #include <svl/solar.hrc>
 
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 64ac5d21dfdf..83505fe09619 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -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 _SDR_ATTRIBUTE_SDRALLFILLATTRIBUTESHELPER_HXX
-#define _SDR_ATTRIBUTE_SDRALLFILLATTRIBUTESHELPER_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRALLFILLATTRIBUTESHELPER_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRALLFILLATTRIBUTESHELPER_HXX
 
 #include "svx/svxdllapi.h"
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
@@ -89,6 +89,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRALLFILLATTRIBUTESHELPER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 8fe69e1387bb..82c040d2576e 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.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_SVXIDS_HRC
-#define _SVX_SVXIDS_HRC
+#ifndef INCLUDED_SVX_SVXIDS_HRC
+#define INCLUDED_SVX_SVXIDS_HRC
 
 #include <svl/memberid.hrc>
 #include <svl/solar.hrc>
@@ -1028,7 +1028,7 @@
 #error Resource-Ueberlauf in #line, #file
 #endif
 
-#endif // #ifndef _SVX_SVXIDS_HRC
+#endif
 
 // ******************************************************************* EOF
 
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index aa46f5757957..dfd2e5707d26 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVXITEMS_HRC
-#define _SVXITEMS_HRC
+#ifndef INCLUDED_SVX_SVXITEMS_HRC
+#define INCLUDED_SVX_SVXITEMS_HRC
 
 #include <svl/solar.hrc>
 
diff --git a/include/svx/unobrushitemhelper.hxx b/include/svx/unobrushitemhelper.hxx
index 36096bc484e8..df68b86dafbd 100644
--- a/include/svx/unobrushitemhelper.hxx
+++ b/include/svx/unobrushitemhelper.hxx
@@ -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 _UNOBRUSHITEMHELPER_HXX
-#define _UNOBRUSHITEMHELPER_HXX
+#ifndef INCLUDED_SVX_UNOBRUSHITEMHELPER_HXX
+#define INCLUDED_SVX_UNOBRUSHITEMHELPER_HXX
 
 #include "svx/svxdllapi.h"
 #include <editeng/brushitem.hxx>
@@ -49,6 +49,6 @@ SVX_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet(
     bool bSearchInParents = true,
     bool bXMLImportHack = false);
 
-#endif // _UNOBRUSHITEMHELPER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index 0cfc90e0c3ca..7fc36e5b246d 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -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 _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
-#define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#ifndef INCLUDED_SVX_INC_ACCESSIBLESVXFINDREPLACEDIALOG_HXX
+#define INCLUDED_SVX_INC_ACCESSIBLESVXFINDREPLACEDIALOG_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -52,6 +52,6 @@ private:
         return new VCLXAccessibleSvxFindReplaceDialog(this);
     }
 };
-#endif // _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc
index cc77cea17f8e..36a00c6c97d8 100644
--- a/svx/inc/accessibility.hrc
+++ b/svx/inc/accessibility.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_HRC
-#define _SVX_ACCESSIBILITY_HRC
+#ifndef INCLUDED_SVX_INC_ACCESSIBILITY_HRC
+#define INCLUDED_SVX_INC_ACCESSIBILITY_HRC
 
 #include <svx/dialogs.hrc>
 
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index bb9db34f2317..309af0699873 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.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_FMHELP_HRC
-#define _SVX_FMHELP_HRC
+#ifndef INCLUDED_SVX_INC_FMHELP_HRC
+#define INCLUDED_SVX_INC_FMHELP_HRC
 
 #define HID_FORM_NAVIGATOR                                    "SVX_HID_FORM_NAVIGATOR"
 #define HID_FORM_NAVIGATOR_WIN                                "SVX_HID_FORM_NAVIGATOR_WIN"
diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index a9f2484e18b6..659166d13612 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALLERY_HRC
-#define _SVX_GALLERY_HRC
+#ifndef INCLUDED_SVX_INC_GALLERY_HRC
+#define INCLUDED_SVX_INC_GALLERY_HRC
 
 #include <svx/dialogs.hrc>
 #include "galtheme.hrc"
@@ -85,6 +85,6 @@
 #define MN_PROPERTIES 23
 #define MN_ASSIGN_ID 24
 
-#endif // _SVX_GALLERY_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index ebcaed42b2e9..8fce39aff997 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.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 _GALTHEME_HRC_
-#define _GALTHEME_HRC_
+#ifndef INCLUDED_SVX_INC_GALTHEME_HRC
+#define INCLUDED_SVX_INC_GALTHEME_HRC
 
 #define RID_GALLERYSTR_THEME_START          (6000)
 
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 66b01938e985..6e17d45c506c 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/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 _SVX_HELPID_HRC
-#define _SVX_HELPID_HRC
+#ifndef INCLUDED_SVX_INC_HELPID_HRC
+#define INCLUDED_SVX_INC_HELPID_HRC
 
 #include <svx/exthelpid.hrc>
 #include <svx/svxcommands.h>
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index d6eef7c9dc00..4b2112d4edc7 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DOCRECOVERY_HRC
-#define _SVX_DOCRECOVERY_HRC
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_DOCRECOVERY_HRC
+#define INCLUDED_SVX_SOURCE_DIALOG_DOCRECOVERY_HRC
 
 #include <svtools/controldims.hrc>
 
diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index 5a13af57629a..7f24e141d88b 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DATANAVI_HRC
-#define _SVX_DATANAVI_HRC
+#ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HRC
+#define INCLUDED_SVX_SOURCE_INC_DATANAVI_HRC
 
 // class XFormsInstancePage
 
@@ -47,7 +47,6 @@
 #define IID_TEXT                5
 #define IID_OTHER               6
 
-
-#endif //_SVX_DATANAVI_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc
index 7e602301eb5e..42b6e0aa0b64 100644
--- a/svx/source/inc/fmprop.hrc
+++ b/svx/source/inc/fmprop.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_FMPROP_HRC
-#define _SVX_FMPROP_HRC
+#ifndef INCLUDED_SVX_SOURCE_INC_FMPROP_HRC
+#define INCLUDED_SVX_SOURCE_INC_FMPROP_HRC
 
 // PropertyId's, welche eine Zuordnung zu einen PropertyName haben, das koennten
 // auch in Zukunft WhichIds sein -> Itemset
@@ -146,6 +146,6 @@
 #define FM_PROP_MOUSE_WHEEL_BEHAVIOR         "MouseWheelBehavior"
 #define FM_PROP_DESCRIPTION                  "Description"
 
-#endif // _SVX_FMPROP_HRC
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */