diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 11:33:31 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-20 11:33:31 +0000 |
commit | 1e32e8e98bda70bff3610a7a4e3e90c985236644 (patch) | |
tree | c4ffad42e3edc8bea6ff5c2bd018132cf818acea /jvmfwk | |
parent | 3428bace79d64a10cfcabb79e4caa608ee5db233 (diff) |
INTEGRATION: CWS jl11 (1.2.2); FILE MERGED
2004/08/04 08:10:20 jl 1.2.2.1: #i32392#
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/util.hxx | 6 | ||||
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx index b06cc32f3392..9a8e765cc7b0 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx @@ -2,9 +2,9 @@ * * $RCSfile: util.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-07-23 11:52:51 $ + * last change: $Author: rt $ $Date: 2004-08-20 12:33:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ struct SameOrSubDirJREMap return true; rtl::OUString sSub; sSub = s2.first + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - if (s1.match(sSub) == true) + if (s1.match(sSub) == sal_True) return true; return false; } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx index 07099ca4c2d6..edd2545133ec 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx @@ -2,9 +2,9 @@ * * $RCSfile: vendorlist.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-07-23 11:53:33 $ + * last change: $Author: rt $ $Date: 2004-08-20 12:33:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ struct VendorSupportMapEntry VendorSupportMapEntry gVendorMap[] ={ #define VENDOR_MAP_ENTRY(x,y) \ - {x, & y##::getJavaExePaths, & y##::createInstance}, + {x, & y::getJavaExePaths, & y::createInstance}, #define END_VENDOR_MAP() \ {NULL, NULL, NULL} }; |