diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:06:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:06:16 +0000 |
| commit | 181b7aa6ebc73cc20696aef8e92c13c8e4d5d54c (patch) | |
| tree | 9a5e048655b52e90cfb779e96fcdb40094b4cd19 | |
| parent | 45d461bfcab7429faa4904d0abeaa9857b3b4368 (diff) | |
INTEGRATION: CWS ucbfixes01 (1.11.38); FILE MERGED
2007/04/23 16:40:13 kso 1.11.38.1: #70959# - Eliminated multiple identical URI helper functionality
implementations.
| -rw-r--r-- | ucb/source/ucp/tdoc/tdoc_content.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 5a48527641a6..22bfd740b1dc 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tdoc_content.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: obo $ $Date: 2006-09-17 14:00:59 $ + * last change: $Author: kz $ $Date: 2007-05-10 13:06:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,6 +82,8 @@ #include "tdoc_resultset.hxx" #include "tdoc_passwordrequest.hxx" +#include "../inc/urihelper.hxx" + using namespace com::sun; using namespace com::sun::star; @@ -839,7 +841,7 @@ Content::makeNewIdentifier( const rtl::OUString& rTitle ) // Assemble new content identifier... Uri aUri( m_xIdentifier->getContentIdentifier() ); rtl::OUStringBuffer aNewURL = aUri.getParentUri(); - aNewURL.append( Uri::encodeSegment( rTitle ) ); + aNewURL.append( ::ucb::urihelper::encodeSegment( rTitle ) ); return uno::Reference< star::ucb::XContentIdentifier >( @@ -2213,7 +2215,7 @@ void Content::transfer( aTargetUri += rtl::OUString::createFromAscii( "/" ); if ( rInfo.NewTitle.getLength() > 0 ) - aTargetUri += Uri::encodeSegment( rInfo.NewTitle ); + aTargetUri += ::ucb::urihelper::encodeSegment( rInfo.NewTitle ); else aTargetUri += aSourceUri.getName(); |