diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2004-09-30 12:27:47 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2004-09-30 12:27:47 +0000 |
commit | ffbd2d666818bb516fde57ad33c3e4c9ac57e185 (patch) | |
tree | 65cb934d6d99699e96f5286f62ab21e9539c2e2e | |
parent | bc6efebce6cd85aece87b2ea1976fec2e62c5bd8 (diff) |
#i10000# Work around problem of absolute Windows file paths and INET_PROT_GENERIC.
-rw-r--r-- | basic/source/runtime/methods.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index b044d683bc0b..b86fb91663fa 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -2,9 +2,9 @@ * * $RCSfile: methods.cxx,v $ * - * $Revision: 1.55 $ + * $Revision: 1.56 $ * - * last change: $Author: rt $ $Date: 2004-07-23 10:13:32 $ + * last change: $Author: vg $ $Date: 2004-09-30 13:27:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -268,9 +268,11 @@ String getFullPath( const String& aRelPath ) // #80204 Try first if it already is a valid URL INetURLObject aURLObj( aRelPath ); - aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); - - if( !aFileURL.getLength() ) + if (!aURLObj.HasError() && aURLObj.GetProtocol() != INET_PROT_GENERIC) + { + aFileURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE ); + } + else { File::getFileURLFromSystemPath( aRelPath, aFileURL ); } |