diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 09:11:54 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 09:11:54 +0000 |
| commit | 9d31bcfd823ebaa799e03c12c6b9cf57c1021744 (patch) | |
| tree | f26119ada6b9ff96724c0c1c1999f77bcf944894 /ucb | |
| parent | bdd64f858e6884f13afc82e7043d72a4115d4127 (diff) | |
INTEGRATION: CWS abi30 (1.85.22); FILE MERGED
2006/10/17 15:04:17 abi 1.85.22.2: RESYNC: (1.85-1.88); FILE MERGED
2006/10/15 12:41:05 abi 1.85.22.1: i67604
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/shell.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index a7475347d600..92aeee2b764f 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shell.cxx,v $ * - * $Revision: 1.88 $ + * $Revision: 1.89 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:48:56 $ + * last change: $Author: vg $ $Date: 2006-11-01 10:11:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2555,6 +2555,7 @@ shell::getv( if ( aFileStatus.getFileType() == osl::FileStatus::Link ) { // Assume failure + aIsRegular = false; osl::FileBase::RC result = osl::FileBase::E_INVAL; osl::DirectoryItem aTargetItem; osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem ); @@ -2567,12 +2568,6 @@ shell::getv( aIsRegular = aTargetStatus.getFileType() == osl::FileStatus::Regular; } - - // FIXME: aIsRegular undefined in error case. - // Don't know how to transport error - OSL_ENSURE( osl::FileBase::E_None == result, - "shell::getv: Link target can't be retrieved." - " Missing error handling !!!" ); } else aIsRegular = aFileStatus.getFileType() == osl::FileStatus::Regular; |