diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:27:15 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:27:15 +0000 |
commit | f7fe43f8b2ab8680725a54a8a6b69e69a9c2eab2 (patch) | |
tree | 203c4a1db873f8c8983e0a307fb3daa027ea11a8 /stoc/source/javavm/interact.cxx | |
parent | ad7b5594ced36bdd8e5e9708d7f6ff3996176990 (diff) |
INTEGRATION: CWS geordi2q14 (1.5.50); FILE MERGED
2004/01/30 12:39:17 hr 1.5.50.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'stoc/source/javavm/interact.cxx')
-rw-r--r-- | stoc/source/javavm/interact.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index 0445aea69662..54fee91415af 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -2,9 +2,9 @@ * * $RCSfile: interact.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-06-12 11:08:24 $ + * last change: $Author: hr $ $Date: 2004-02-02 19:27:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,7 +129,7 @@ InteractionRequest::InteractionRequest(css::uno::Any const & rRequest): m_aRequest(rRequest) { bool bRetry; -#if defined LINUX || defined FREEBSD +#if defined LINUX || defined FREEBSD || defined NETBSD // Only if Java is disabled we allow retry: bRetry = m_aRequest.isExtractableTo( getCppuType(static_cast< css::java::JavaDisabledException * >(0))); |