diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 19:48:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 20:03:43 +0200 |
| commit | 412471ccb001f8805cc9c5e5e3e8fa24be71f5e2 (patch) | |
| tree | 7f5694bfa91712f60caf99c7692d8e10e299d5f2 | |
| parent | 028dcd41ab6b28732e168d834ec76d1c67020eda (diff) | |
Avoid reserved identifiers
Change-Id: Iaa556ac8ce6a2220ab3643968193fbab5077a56f
| -rw-r--r-- | sd/inc/app.hrc | 4 | ||||
| -rw-r--r-- | sd/inc/glob.hrc | 7 | ||||
| -rw-r--r-- | sd/inc/sdattr.hrc | 6 | ||||
| -rw-r--r-- | sd/source/ui/accessibility/accessibility.hrc | 7 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimation.hrc | 6 | ||||
| -rw-r--r-- | sd/source/ui/annotations/annotations.hrc | 6 |
6 files changed, 19 insertions, 17 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 0c05093eef5a..e9b5755e2aaa 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SD_APP_HRC_ -#define _SD_APP_HRC_ +#ifndef INCLUDED_SD_INC_APP_HRC +#define INCLUDED_SD_INC_APP_HRC #include <sfx2/sfx.hrc> diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index 70d7186e00f7..bec03c2b9ab9 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SDGLOB_HRC -#define _SDGLOB_HRC +#ifndef INCLUDED_SD_INC_GLOB_HRC +#define INCLUDED_SD_INC_GLOB_HRC #include <sfx2/sfx.hrc> @@ -136,6 +136,7 @@ #define RID_SLIDESORTER_ICONS RID_GLOB_START+227 #define STR_DEAUTHORISE_CLIENT RID_GLOB_START+229 -#endif // _SDGLOB_HRC + +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index 8ba4028bf50e..e275090134ec 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SDATTR_HRC -#define _SDATTR_HRC +#ifndef INCLUDED_SD_INC_SDATTR_HRC +#define INCLUDED_SD_INC_SDATTR_HRC #include <sfx2/sfx.hrc> @@ -165,6 +165,6 @@ #define ATTR_NUMBER_NEWSTART_AT ATTR_PARANUMBERING_START + 1 #define ATTR_PARANUMBERING_END ATTR_NUMBER_NEWSTART_AT -#endif // _SDATTR_HRC +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc index b3145f0d2899..c2c7c43c8b12 100644 --- a/sd/source/ui/accessibility/accessibility.hrc +++ b/sd/source/ui/accessibility/accessibility.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SD_ACCESSIBILITY_HRC -#define _SD_ACCESSIBILITY_HRC +#ifndef INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC +#define INCLUDED_SD_SOURCE_UI_ACCESSIBILITY_ACCESSIBILITY_HRC #include <sfx2/sfx.hrc> @@ -77,6 +77,7 @@ #define SID_SD_A11Y_I_PREVIEW_D (SID_SD_A11Y_START + 47) #define SID_SD_A11Y_I_PREVIEW_SUFFIX (SID_SD_A11Y_START + 48) #define SID_SD_A11Y_D_PRESENTATION_READONLY (SID_SD_A11Y_START + 49) -#endif /* _SD_ACCESSIBILITY_HRC */ + +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/animations/CustomAnimation.hrc b/sd/source/ui/animations/CustomAnimation.hrc index 0348eede159d..297a9f2b725f 100644 --- a/sd/source/ui/animations/CustomAnimation.hrc +++ b/sd/source/ui/animations/CustomAnimation.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SD_CUSTOMANIMATION_HRC -#define _SD_CUSTOMANIMATION_HRC +#ifndef INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC +#define INCLUDED_SD_SOURCE_UI_ANIMATIONS_CUSTOMANIMATION_HRC #include "glob.hrc" @@ -114,6 +114,6 @@ #define CM_ITALIC 2 #define CM_UNDERLINED 3 -#endif // _SD_CUSTOMANIMATION_HRC +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/annotations/annotations.hrc b/sd/source/ui/annotations/annotations.hrc index 685664f07b7b..813c624dedb4 100644 --- a/sd/source/ui/annotations/annotations.hrc +++ b/sd/source/ui/annotations/annotations.hrc @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SD_ANNOTATIONPANE_HRC -#define _SD_ANNOTATIONPANE_HRC +#ifndef INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC +#define INCLUDED_SD_SOURCE_UI_ANNOTATIONS_ANNOTATIONS_HRC #include "glob.hrc" @@ -41,6 +41,6 @@ #define RID_ANNOTATION_CONTEXTMENU (RID_ANNOTATIONS_START+0) #define RID_ANNOTATION_TAG_CONTEXTMENU (RID_ANNOTATIONS_START+1) -#endif // _SD_ANNOTATIONPANE_HRC +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |