diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:36:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 08:36:59 +0000 |
| commit | b6c066e383b4f7fe1aac43086de3fb687a82a1f3 (patch) | |
| tree | a58bcb359296a1a5645380bd84e2b3392f85d2a1 /xmlhelp | |
| parent | a82b0f10deff1da74357c252916e8c57dbc3ee80 (diff) | |
INTEGRATION: CWS sb90 (1.14.10); FILE MERGED
2008/06/25 12:23:03 sb 1.14.10.1: #157787# macros PRODUCTNAME and PRODUCTVERSION conflicted with enum members in untoools/inc/unotools/configmgr.hxx:1.22
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/treeview/tvread.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx index 53074b347261..02d914baeff8 100644 --- a/xmlhelp/source/treeview/tvread.hxx +++ b/xmlhelp/source/treeview/tvread.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tvread.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.16 $ * * This file is part of OpenOffice.org. * @@ -56,12 +56,9 @@ namespace treeview { class ConfigData { public: -#define PRODUCTNAME 0 -#define PRODUCTVERSION 1 -#define VENDORNAME 2 -#define VENDORVERSION 3 -#define VENDORSHORT 4 -#define MAX_MODULE_COUNT 16 + enum { + PRODUCTNAME, PRODUCTVERSION, VENDORNAME, VENDORVERSION, + VENDORSHORT }; ConfigData(); int m_vAdd[5]; rtl::OUString m_vReplacement[5]; |