summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-12 19:49:39 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-12 20:03:43 +0200
commitd74faef25d5489874a5b1887a34bc7dfb548bc9c (patch)
tree5ffcc43af71b06fdf20fb02996812d465e7336a3
parent1bfc7d0a89c317de1bf6819ffa14a1074bb49be0 (diff)
Avoid reserved identifiers
Change-Id: I93e7c254f8777c2dfbb192b306c991387d9cc641
-rw-r--r--reportdesign/inc/RptResId.hrc6
-rw-r--r--reportdesign/inc/rptui_slotid.hrc6
-rw-r--r--reportdesign/source/inc/stringconstants.hrc7
3 files changed, 10 insertions, 9 deletions
diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc
index 60a318ab9b8c..00aafb0ecb9c 100644
--- a/reportdesign/inc/RptResId.hrc
+++ b/reportdesign/inc/RptResId.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RPTUI_DLGRESID_HRC
-#define _RPTUI_DLGRESID_HRC
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTRESID_HRC
+#define INCLUDED_REPORTDESIGN_INC_RPTRESID_HRC
#include <svl/solar.hrc>
@@ -246,6 +246,6 @@
#define RID_STR_VERTICAL_ALIGN_CONST (RID_UNTYPED_START + 7)
#define RID_STR_PARAADJUST_CONST (RID_UNTYPED_START + 8)
-#endif // _RPTUI_DLGRESID_HRC
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/rptui_slotid.hrc b/reportdesign/inc/rptui_slotid.hrc
index 5a62580fa58c..2c553c784e27 100644
--- a/reportdesign/inc/rptui_slotid.hrc
+++ b/reportdesign/inc/rptui_slotid.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _RPTUI_SLOTID_HRC_
-#define _RPTUI_SLOTID_HRC_
+#ifndef INCLUDED_REPORTDESIGN_INC_RPTUI_SLOTID_HRC
+#define INCLUDED_REPORTDESIGN_INC_RPTUI_SLOTID_HRC
#include <svx/svxids.hrc>
@@ -199,6 +199,6 @@
#define SID_COLLAPSE_SECTION ( SID_RPTUI_START + 167 )
#define SID_EXPAND_SECTION ( SID_RPTUI_START + 168 )
-#endif // _RPTUI_SLOTID_HRC_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/inc/stringconstants.hrc b/reportdesign/source/inc/stringconstants.hrc
index 1927eafebd87..1cfe717f8092 100644
--- a/reportdesign/source/inc/stringconstants.hrc
+++ b/reportdesign/source/inc/stringconstants.hrc
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _REPORTDESIGN_STRINGCONSTANTS_HRC_
-#define _REPORTDESIGN_STRINGCONSTANTS_HRC_
+#ifndef INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC
+#define INCLUDED_REPORTDESIGN_SOURCE_INC_STRINGCONSTANTS_HRC
#ifndef STRINGCONSTANTS_INCLUDED_INDIRECT
#error "don't include this file directly! use dbastrings.hrc or dbustrings.hrc instead!"
@@ -251,6 +251,7 @@
#define PROPERTY_ORDER "Order"
#define PROPERTY_APPLYFILTER "ApplyFilter"
#define PROPERTY_MAXROWS "MaxRows"
-#endif // _REPORTDESIGN_STRINGCONSTANTS_HRC_
+
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */