Kaydet (Commit) 57732042 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Avoid reserved identifiers

Change-Id: I85135c3fa5e6fe823491739c3c1ab601505f0626
üst 0b704327
......@@ -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>
......
......@@ -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
......
......@@ -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>
......
......@@ -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: */
......@@ -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
......
......@@ -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>
......
......@@ -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: */
......@@ -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 _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
#define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
#ifndef INCLUDED_SVX_INC_ACCESSIBLESVXFINDREPLACEDIALOG_HXX
#define INCLUDED_SVX_INC_ACCESSIBLESVXFINDREPLACEDIALOG_HXX
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
......@@ -52,6 +52,6 @@ private:
return new VCLXAccessibleSvxFindReplaceDialog(this);
}
};
#endif // _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _SVX_ACCESSIBILITY_HRC
#define _SVX_ACCESSIBILITY_HRC
#ifndef INCLUDED_SVX_INC_ACCESSIBILITY_HRC
#define INCLUDED_SVX_INC_ACCESSIBILITY_HRC
#include <svx/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 _SVX_FMHELP_HRC
#define _SVX_FMHELP_HRC
#ifndef INCLUDED_SVX_INC_FMHELP_HRC
#define INCLUDED_SVX_INC_FMHELP_HRC
#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR"
#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN"
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _SVX_GALLERY_HRC
#define _SVX_GALLERY_HRC
#ifndef INCLUDED_SVX_INC_GALLERY_HRC
#define INCLUDED_SVX_INC_GALLERY_HRC
#include <svx/dialogs.hrc>
#include "galtheme.hrc"
......@@ -85,6 +85,6 @@
#define MN_PROPERTIES 23
#define MN_ASSIGN_ID 24
#endif // _SVX_GALLERY_HRC
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -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 _GALTHEME_HRC_
#define _GALTHEME_HRC_
#ifndef INCLUDED_SVX_INC_GALTHEME_HRC
#define INCLUDED_SVX_INC_GALTHEME_HRC
#define RID_GALLERYSTR_THEME_START (6000)
......
......@@ -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_HELPID_HRC
#define _SVX_HELPID_HRC
#ifndef INCLUDED_SVX_INC_HELPID_HRC
#define INCLUDED_SVX_INC_HELPID_HRC
#include <svx/exthelpid.hrc>
#include <svx/svxcommands.h>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _SVX_DOCRECOVERY_HRC
#define _SVX_DOCRECOVERY_HRC
#ifndef INCLUDED_SVX_SOURCE_DIALOG_DOCRECOVERY_HRC
#define INCLUDED_SVX_SOURCE_DIALOG_DOCRECOVERY_HRC
#include <svtools/controldims.hrc>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _SVX_DATANAVI_HRC
#define _SVX_DATANAVI_HRC
#ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HRC
#define INCLUDED_SVX_SOURCE_INC_DATANAVI_HRC
// class XFormsInstancePage
......@@ -47,7 +47,6 @@
#define IID_TEXT 5
#define IID_OTHER 6
#endif //_SVX_DATANAVI_HRC
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -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_FMPROP_HRC
#define _SVX_FMPROP_HRC
#ifndef INCLUDED_SVX_SOURCE_INC_FMPROP_HRC
#define INCLUDED_SVX_SOURCE_INC_FMPROP_HRC
// PropertyId's, welche eine Zuordnung zu einen PropertyName haben, das koennten
// auch in Zukunft WhichIds sein -> Itemset
......@@ -146,6 +146,6 @@
#define FM_PROP_MOUSE_WHEEL_BEHAVIOR "MouseWheelBehavior"
#define FM_PROP_DESCRIPTION "Description"
#endif // _SVX_FMPROP_HRC
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment