diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-25 14:10:15 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-25 14:10:15 +0100 |
| commit | dc5d25031d075a39c5b90c76619a8a12601082f4 (patch) | |
| tree | 71e21e45fa58e6405006248b2cb15f3319b97b59 /ucb/source/ucp/ext/ucpext_datasupplier.cxx | |
| parent | 902c2a5a1dffe4db1637ec4eb2c6cbd7efb14ffd (diff) | |
slidecopy: adjusted the Ext-UCP URL scheme so that the ExtensionID is the URL's authority
Diffstat (limited to 'ucb/source/ucp/ext/ucpext_datasupplier.cxx')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_datasupplier.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index dcc1c117befa..dfdd1df82fd6 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -167,7 +167,7 @@ namespace ucb { namespace ucp { namespace ext const ::rtl::OUString& rLocalId = (*pExtInfo)[0]; ResultListEntry aEntry; - aEntry.sId = lcl_compose( sContentIdentifier, Content::encodeIdentifier( rLocalId ) ); + aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + ::rtl::OUString( sal_Unicode( '/' ) ); m_pImpl->m_aResults.push_back( aEntry ); } } @@ -327,7 +327,10 @@ namespace ucb { namespace ucp { namespace ext case E_ROOT: { const ::rtl::OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); - const ::rtl::OUString sTitle = Content::decodeIdentifier( rId.copy( rId.indexOf( '/' ) + 1 ) ); + const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + ::rtl::OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); + if ( ( sTitle.getLength() > 0 ) && ( sTitle[ sTitle.getLength() - 1 ] == '/' ) ) + sTitle = sTitle.copy( 0, sTitle.getLength() - 1 ); xRow = Content::getArtificialNodePropertyValues( m_pImpl->m_xSMgr, getResultSet()->getProperties(), sTitle ); } break; |