diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 19:46:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 20:03:41 +0200 |
commit | 57732042dadcad1586010788ac39eec05a7974bd (patch) | |
tree | c1a03cacd18d613d299960aa9195dcc4912ce0e7 /include | |
parent | 0b7043270c532ecea577e8961dc982d0724eae7f (diff) |
Avoid reserved identifiers
Change-Id: I85135c3fa5e6fe823491739c3c1ab601505f0626
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/dialogs.hrc | 4 | ||||
-rw-r--r-- | include/svx/exthelpid.hrc | 4 | ||||
-rw-r--r-- | include/svx/fmresids.hrc | 4 | ||||
-rw-r--r-- | include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 6 | ||||
-rw-r--r-- | include/svx/svxids.hrc | 6 | ||||
-rw-r--r-- | include/svx/svxitems.hrc | 4 | ||||
-rw-r--r-- | include/svx/unobrushitemhelper.hxx | 6 |
7 files changed, 17 insertions, 17 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: */ |