diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-28 12:32:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-28 12:32:11 +0000 |
| commit | 3dece7ce5328152c4d530b32d507d84d0820ee3d (patch) | |
| tree | 18419a65d3ef39f61c2fb774c2f68b1857c09772 /unotools | |
| parent | 4b437861a8a3235c468deb390bdfd2c2e6a43c00 (diff) | |
INTEGRATION: CWS fwk04 (1.14.14); FILE MERGED
2003/05/26 11:43:24 cd 1.14.14.1: #109863# Fix problems with final slash inside function 'implNormalizeURL'
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 6864af814cd5..bac83db8d225 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2003-04-15 17:20:15 $ + * last change: $Author: vg $ $Date: 2003-05-28 13:32:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -277,7 +277,13 @@ bool implNormalizeURL(OUString & _sURL, osl::DirectoryItem& aDirItem) if (aNormalizedURL.getLength() == 0) return false; - _sURL = aNormalizedURL; + // #109863# sal/osl returns final slash for file URLs contradicting + // the URL/URI RFCs. + if ( aNormalizedURL.getStr()[aNormalizedURL.getLength()-1] != cURLSeparator ) + _sURL = aNormalizedURL; + else + _sURL = aNormalizedURL.copy( 0, aNormalizedURL.getLength()-1 ); + return true; } // --------------------------------------------------------------------------------------- |