diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-11 10:55:58 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-11 10:55:58 +0000 |
| commit | 7d9c1145ee2b201be04100530dce292b5d48349e (patch) | |
| tree | 978c4f186b8bdd18b588aed307b1eed25cd076d5 /sal | |
| parent | 1044378ad59061f71084c16c08f24646995dfc65 (diff) | |
INTEGRATION: CWS unopkg2 (1.26.56); FILE MERGED
2004/05/21 09:08:28 dbo 1.26.56.3: #i20304#
2004/05/19 12:07:05 dbo 1.26.56.2: #i20304# added _OS, _ARCH
2004/05/18 19:33:24 dbo 1.26.56.1: #i20304# need fixes from uno8eabugs01
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/bootstrap.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx index a9df06c57f17..68fdd1fd0490 100644 --- a/sal/rtl/source/bootstrap.cxx +++ b/sal/rtl/source/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: rt $ $Date: 2004-05-19 13:10:57 $ + * last change: $Author: kz $ $Date: 2004-06-11 11:55:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -412,6 +412,18 @@ sal_Bool Bootstrap_Impl::getValue( rtl_uString_assign( ppValue, iniPath.pData ); further_macro_expansion = false; } + else if (name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_OS") )) + { + OUString val( RTL_CONSTASCII_USTRINGPARAM(THIS_OS) ); + rtl_uString_assign( ppValue, val.pData ); + further_macro_expansion = false; + } + else if (name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("_ARCH") )) + { + OUString val( RTL_CONSTASCII_USTRINGPARAM(THIS_ARCH) ); + rtl_uString_assign( ppValue, val.pData ); + further_macro_expansion = false; + } else { if (0 != *ppValue) |