diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-25 09:25:22 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-25 09:25:22 +0100 |
| commit | 642ef423f580142583911019b92cbfc38c756c24 (patch) | |
| tree | 04336ded79265f7a8adcd39af3b68d9ef61ae64e | |
| parent | f372e6625bf10b5233fa204da4291131371cf3c3 (diff) | |
slidecopy: use vnd.sun.star.extension URL scheme for the extension UCP
| -rw-r--r-- | officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_provider.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu index c86a1e5315f5..1c457915f9bd 100644 --- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu +++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu @@ -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/> diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 1dc49990c73d..df04798b2c56 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -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 ); } diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index c7da555d6c28..b626999b66b5 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -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(); |