summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-12 19:44:17 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-12 20:03:40 +0200
commit1b0c14658c169657fcca03c731cbb693524fac9b (patch)
tree757cc84ce5eb3b9d60bf6dbfcf54bc946a3cc765 /include
parent470cfa9860232ab70e017e6084d80f80d469555c (diff)
Avoid reserved identifiers
Change-Id: Ia2be9eeda4c1035f8e1d3b68446807aeffe59453
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/cntids.hrc4
-rw-r--r--include/sfx2/dialogs.hrc4
-rw-r--r--include/sfx2/sfx.hrc6
-rw-r--r--include/sfx2/sfxsids.hrc6
-rw-r--r--include/sfx2/sidebar/ResourceDefinitions.hrc6
5 files changed, 13 insertions, 13 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: */