diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | e775b40a11ca0eab7964dacc8387367086e2b029 (patch) | |
| tree | 6ef64962794427131bea51ffc182b11a394bcc59 /rsc/inc | |
| parent | acbb009ba0992ec4ad4c9848c0b0ac9ee81effa4 (diff) | |
| parent | d5d2a1cffc728100f8119252ff26f95949e6d35c (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
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 - |