diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:05:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 12:05:29 +0000 |
| commit | 07684b52ab55c4893365799513d69183f890990c (patch) | |
| tree | 6c4857036babdd825d2af117f62c0b81aa1d797f /ucb/source/ucp/package | |
| parent | dcea371868f9d29221bed73fdbf7a317eaaaf03b (diff) | |
INTEGRATION: CWS ucbfixes01 (1.54.38); FILE MERGED
2007/04/23 16:40:13 kso 1.54.38.1: #70959# - Eliminated multiple identical URI helper functionality
implementations.
Diffstat (limited to 'ucb/source/ucp/package')
| -rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index f64558a263..d50d4a1819 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: pkgcontent.cxx,v $ * - * $Revision: 1.54 $ + * $Revision: 1.55 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:59:20 $ + * last change: $Author: kz $ $Date: 2007-05-10 13:05:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -164,6 +164,8 @@ #include "pkgresultset.hxx" #endif +#include "../inc/urihelper.hxx" + using namespace com::sun; using namespace com::sun::star; using namespace package_ucp; @@ -1470,7 +1472,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Assemble new content identifier... rtl::OUString aNewURL = m_aUri.getParentUri(); aNewURL += rtl::OUString::createFromAscii( "/" ); - aNewURL += PackageUri::encodeSegment( aNewTitle ); + aNewURL += ::ucb::urihelper::encodeSegment( aNewTitle ); uno::Reference< star::ucb::XContentIdentifier > xNewId = new ::ucb::ContentIdentifier( m_xSMgr, aNewURL ); @@ -1737,7 +1739,7 @@ void Content::insert( rtl::OUString aNewURL = m_aUri.getParentUri(); if (1 + aNewURL.lastIndexOf('/') != aNewURL.getLength()) aNewURL += rtl::OUString::createFromAscii( "/" ); - aNewURL += PackageUri::encodeSegment( m_aProps.aTitle ); + aNewURL += ::ucb::urihelper::encodeSegment( m_aProps.aTitle ); PackageUri aNewUri( aNewURL ); // Handle possible name clash... @@ -2151,7 +2153,7 @@ void Content::transfer( != aChildId.getLength() ) aChildId += rtl::OUString::createFromAscii( "/" ); - aChildId += PackageUri::encodeSegment( aName ); + aChildId += ::ucb::urihelper::encodeSegment( aName ); star::ucb::TransferInfo aInfo; aInfo.MoveData = sal_False; |