diff options
| author | sb <sb@openoffice.org> | 2010-11-19 11:35:41 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-11-19 11:35:41 +0100 |
| commit | 91b0140b03639bff0354ec43bc1ea86cc8d2573e (patch) | |
| tree | 63d5e3a28316843b4e6c040e56ec2a8d5ac6f853 /rsc/inc | |
| parent | 955e88c80e9abce3f15aa55d434dae6ae17d7d43 (diff) | |
| parent | 8dc3743ca56382374183bec5cd1a11d53f3085b8 (diff) | |
sb131: merged in re/DEV300_next towards DEV300_m94
Diffstat (limited to 'rsc/inc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
| -rw-r--r-- | rsc/inc/vclrsc.hxx | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 1d5af35de9ff..51461cf356d6 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -285,6 +285,7 @@ public: RscRange a0to9999Short; RscIdRange aIdLong; RscString aString; + RscString aStringLiteral; RscFlag aWinBits; RscLangEnum aLangType; RscLangArray aLangString; diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 19677171dcb2..d4084f2bc239 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -162,9 +162,11 @@ typedef sal_Int64 WinBits; // - Help-Types - // -------------- +#if 0 // from vcl/inc/help.hxx -#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" +#endif // -------------- // - FieldTypes - |