diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:29:02 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:29:02 +0000 |
| commit | 679559b8fb6fff6b706a164a5d01d3ed7aad3b42 (patch) | |
| tree | 93efe86a53ce28f202a73476844deff16d7910d4 | |
| parent | 294215a05da90fdcbe7069b3c91b66b9abc02f33 (diff) | |
INTEGRATION: CWS os2port01 (1.6.10); FILE MERGED
2007/07/16 13:50:08 obr 1.6.10.2: RESYNC: (1.6-1.9); FILE MERGED
2006/12/28 14:57:57 ydario 1.6.10.1: OS/2 initial import.
| -rw-r--r-- | framework/source/services/license.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index fdfbfcea8225..94bc0dc7cdc6 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -4,9 +4,9 @@ * * $RCSfile: license.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2007-04-26 08:16:26 $ + * last change: $Author: vg $ $Date: 2007-09-20 14:29:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,7 +116,7 @@ static const char *szLicensePath = "/share/readme"; #ifdef UNX static const char *szUNXLicenseName = "/LICENSE"; static const char *szUNXLicenseExt = ""; -#elif defined WNT +#elif defined(WNT) || defined(OS2) static const char *szWNTLicenseName = "/license"; static const char *szWNTLicenseExt = ".txt"; #endif @@ -319,7 +319,7 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na aLangString += aLocale.Variant; } } -#ifdef WNT +#if defined(WNT) || defined(OS2) OUString aLicensePath = aBaseInstallPath + OUString::createFromAscii(szLicensePath) + OUString::createFromAscii(szWNTLicenseName) |