diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-11-04 14:39:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-11-04 14:39:34 +0000 |
| commit | 818e24ace0dc0ce6a6212669113ea874d2af335a (patch) | |
| tree | f7edeb25077c2cc802d2e8b756e0198b5f68a5b5 /ucb/source | |
| parent | 59573e7ae025a7a738b094cea84415d9addceea2 (diff) | |
INTEGRATION: CWS fwk25 (1.37.12); FILE MERGED
2005/10/27 10:32:57 abi 1.37.12.1: #i34255# merged from abi14 into this cws
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/file/prov.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 0f0c8bde32f6..ffde49e425dc 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -4,9 +4,9 @@ * * $RCSfile: prov.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: rt $ $Date: 2005-09-09 15:29:26 $ + * last change: $Author: kz $ $Date: 2005-11-04 15:39:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -711,7 +711,12 @@ rtl::OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const rtl::OUStri if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None ) return rtl::OUString(); - return aNormalizedPath; + rtl::OUString aAbsoluteURL; + if( osl::FileBase::getAbsoluteFileURL(BaseURL,aNormalizedPath,aAbsoluteURL) + != osl::FileBase::E_None ) + return rtl::OUString(); + + return aAbsoluteURL; } rtl::OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const rtl::OUString& URL ) |