strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slidecopy: use vnd.sun.star.extension URL scheme for the extension UCP

Browse source
This commit is contained in:
Frank Schoenheit [fs] 2010-03-25 09:25:22 +01:00
parent f372e6625b
commit 642ef423f5
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
View file

@ -183,7 +183,7 @@
<value>com.sun.star.ucb.ExtensionContentProvider</value>
</prop>
<prop oor:name="URLTemplate">
<value>vnd.oracle.ooo.extension</value>
<value>vnd.sun.star.extension</value>
</prop>
<prop oor:name="Arguments">
<value/>

4
ucb/source/ucp/ext/ucpext_content.cxx
View file

@ -324,8 +324,8 @@ namespace ucb { namespace ucp { namespace ext
//------------------------------------------------------------------------------------------------------------------
bool Content::denotesRootContent( const ::rtl::OUString& i_rContentIdentifier )
{
const sal_Char* pScheme = "vnd.oracle.ooo.extension";
const sal_Int32 nSchemeLength = sizeof( "vnd.oracle.ooo.extension" ) - 1;
const sal_Char* pScheme = "vnd.sun.star.extension";
const sal_Int32 nSchemeLength = sizeof( "vnd.sun.star.extension" ) - 1;
ENSURE_OR_RETURN_FALSE( i_rContentIdentifier.matchAsciiL( pScheme, nSchemeLength ), "illegal content URL" );
return i_rContentIdentifier.copy( nSchemeLength ).equalsAsciiL( ":/", 2 );
}

6
ucb/source/ucp/ext/ucpext_provider.cxx
View file

@ -113,13 +113,13 @@ namespace ucb { namespace ucp { namespace ext
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString ContentProvider::getRootURL()
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.oracle.ooo.extension:/" ) );
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.extension:/" ) );
}
//------------------------------------------------------------------------------------------------------------------
::rtl::OUString ContentProvider::getArtificialNodeContentType()
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.oracle.ooo.extension-content" ) );
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.extension-content" ) );
}
//------------------------------------------------------------------------------------------------------------------
@ -127,7 +127,7 @@ namespace ucb { namespace ucp { namespace ext
throw( IllegalIdentifierException, RuntimeException )
{
// Check URL scheme...
const ::rtl::OUString aScheme( rtl::OUString::createFromAscii( "vnd.oracle.ooo.extension" ) );
const ::rtl::OUString aScheme( rtl::OUString::createFromAscii( "vnd.sun.star.extension" ) );
if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( aScheme ) )
throw IllegalIdentifierException();