diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
| commit | c939070f709143482ce749603c0e1f0d84df443c (patch) | |
| tree | c7ed48d5fa87e8ec699f006f49404ce6aa538925 /xmlhelp/source/cxxhelp/provider/databases.hxx | |
| parent | a0f911669be348a5539687e4ebe25446d526b2a8 (diff) | |
| parent | 066ee33f2754e36cf7b6c39d2c2bff3b31f55951 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/databases.hxx')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 98c3c387ad6d..bbd050177a79 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -311,13 +311,15 @@ namespace chelp { char* m_pCustomCSSDoc; rtl::OUString m_aCSS; -#define PRODUCTNAME 0 -#define PRODUCTVERSION 1 -#define VENDORNAME 2 -#define VENDORVERSION 3 -#define VENDORSHORT 4 -#define NEWPRODUCTNAME 5 -#define NEWPRODUCTVERSION 6 + enum { + PRODUCTNAME = 0, + PRODUCTVERSION, + VENDORNAME, + VENDORVERSION, + VENDORSHORT, + NEWPRODUCTNAME, + NEWPRODUCTVERSION + }; int m_vAdd[7]; rtl::OUString m_vReplacement[7]; |