diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-05 09:40:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-05 09:40:23 +0000 |
| commit | 0c123d73290d51d6a81fbe0f369d396c29816a55 (patch) | |
| tree | 665731bb17162e00dd39eaaebed4d532bc962159 /ucb | |
| parent | 3f907306d88c76923adafc2c59ff39f5adeadf76 (diff) | |
INTEGRATION: CWS indephome (1.17.8); FILE MERGED
2004/06/16 15:06:28 kso 1.17.8.1: #i300339# - Fixed generateErrorArguments() regression.
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filglob.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index e7000999f949..90e71c9e8203 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filglob.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2004-05-10 14:21:15 $ + * last change: $Author: rt $ $Date: 2004-07-05 10:40:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -158,7 +158,6 @@ namespace { { OSL_ENSURE(pShell,"specification violation"); - rtl::OUString aUri; rtl::OUString aResourceName; rtl::OUString aResourceType; sal_Bool bRemovable; @@ -166,8 +165,7 @@ namespace { bool bResourceType = false; bool bRemoveProperty = false; - if (rPhysicalUrl == aUri - && osl::FileBase::getSystemPathFromFileURL( + if (osl::FileBase::getSystemPathFromFileURL( rPhysicalUrl, aResourceName) == osl::FileBase::E_None) @@ -218,7 +216,7 @@ namespace { <<= PropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Uri")), -1, - makeAny(aUri), + makeAny(rPhysicalUrl), PropertyState_DIRECT_VALUE); if (bResourceName) aArguments[i++] |