diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:05:40 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:05:40 +0000 |
| commit | 8b80cc394b71718efad7e8a663775f18b6471226 (patch) | |
| tree | f458a80cb8caa1e8623d14957063eae6ec71da03 | |
| parent | fe4454e49dedfb442c0f1af19e9219f6a2316d68 (diff) | |
INTEGRATION: CWS ucbfixes01 (1.13.38); FILE MERGED
2007/04/23 16:40:13 kso 1.13.38.1: #70959# - Eliminated multiple identical URI helper functionality
implementations.
| -rw-r--r-- | ucb/source/ucp/package/pkgdatasupplier.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index ec1ddb932709..24308886c03b 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pkgdatasupplier.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:59:46 $ + * last change: $Author: kz $ $Date: 2007-05-10 13:05:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -71,6 +71,8 @@ #include "pkgprovider.hxx" #endif +#include "../inc/urihelper.hxx" + using namespace com::sun; using namespace com::sun::star; using namespace package_ucp; @@ -504,7 +506,7 @@ void DataSupplier::validate() if ( nPackageUrlEnd != aURL.getLength() - 1 ) aURL += rtl::OUString::createFromAscii( "/" ); - aURL += PackageUri::encodeSegment( aName ); + aURL += ::ucb::urihelper::encodeSegment( aName ); aURL += aContURL.copy( nParam ); } else @@ -515,7 +517,7 @@ void DataSupplier::validate() if ( nPackageUrlEnd != aURL.getLength() - 1 ) aURL += rtl::OUString::createFromAscii( "/" ); - aURL += PackageUri::encodeSegment( aName ); + aURL += ::ucb::urihelper::encodeSegment( aName ); } return aURL; } |