diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 21:30:12 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-07-02 22:42:09 +0200 |
| commit | 64517292c92cb1a28880a31e335726744ec7c82d (patch) | |
| tree | c9a3cbfb065a157cd2fb6efddffe01cd9e2f1f1c /sd | |
| parent | hrc cleanup: Remove unused fmhlpids.hrc (diff) | |
| download | core-64517292c92cb1a28880a31e335726744ec7c82d.tar.gz core-64517292c92cb1a28880a31e335726744ec7c82d.zip | |
hrc cleanup: Remove include guards
Also add some missing include guards.
Change-Id: I320a3c017ca65d34f2cd516849bcde3dec9b33f1
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/app.hrc | 2 | ||||
| -rw-r--r-- | sd/inc/glob.hrc | 8 | ||||
| -rw-r--r-- | sd/inc/sdattr.hrc | 2 | ||||
| -rw-r--r-- | sd/source/ui/accessibility/accessibility.hrc | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/strings.hrc | 3 |
5 files changed, 7 insertions, 10 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 990a4fa1acd5..a279b290d5c1 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -19,9 +19,7 @@ #ifndef _SD_APP_HRC_ #define _SD_APP_HRC_ -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif // HelpIDs fuer Vorlagen #define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index f6a5f66eb13c..132ce92f2472 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -15,9 +15,11 @@ * 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_HRC + +#ifndef _SDGLOB_HRC +#define _SDGLOB_HRC + #include <sfx2/sfx.hrc> -#endif #define RID_GLOB_START RID_APP_START+750 @@ -139,3 +141,5 @@ #define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 #define RID_SLIDESORTER_ICONS RID_GLOB_START+227 + +#endif // _SDGLOB_HRC diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index edc76cac7c49..7874e0c94ab5 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -19,9 +19,7 @@ #ifndef _SDATTR_HRC #define _SDATTR_HRC -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif // Anfang Page-Attribute #define ATTR_PAGE_START SID_SD_START + 1234 diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc index 0adc44a8f0b0..678328edd4f1 100644 --- a/sd/source/ui/accessibility/accessibility.hrc +++ b/sd/source/ui/accessibility/accessibility.hrc @@ -19,9 +19,7 @@ #ifndef _SD_ACCESSIBILITY_HRC #define _SD_ACCESSIBILITY_HRC -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif #define SID_SD_A11Y_START (SID_SD_START+600) diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 7ac678471698..319a681ee73c 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -16,9 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "sfx2/sfx.hrc" -#ifndef _SD_CFGID_HXX #include "cfgids.hxx" -#endif + #define STR_NULL (RID_APP_START+3) #define STR_INSERTPAGE (RID_APP_START+35) #define STR_INSERTLAYER (RID_APP_START+37) |