From 4cc2571e49de162f52ac9ec171f98732bb256517 Mon Sep 17 00:00:00 2001 From: Cédric Bosdonnat Date: Tue, 16 Oct 2012 12:53:31 +0200 Subject: CMIS urls: remove +atom in the internal URLS as the binding is guessed Change-Id: I9ae0704f1e5203778e97de5843efe777ba717271 --- tools/inc/tools/urlobj.hxx | 2 +- tools/qa/cppunit/test_urlobj.cxx | 8 ++++---- tools/source/fsys/urlobj.cxx | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tools') diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 900291deefb5..4b80eaab071a 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -102,7 +102,7 @@ enum INetProtocol INET_PROT_SMB = 31, INET_PROT_HID = 32, INET_PROT_SFTP = 33, - INET_PROT_CMIS_ATOM = 34, + INET_PROT_CMIS = 34, INET_PROT_END = 35 }; diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index a80a77968114..38120aa4c722 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -246,25 +246,25 @@ namespace tools_urlobj // Test with a username part { INetURLObject aUrl( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "vnd.libreoffice.cmis+atom://username@http:%2F%2Ffoo.bar.com:8080%2Fmy%2Fcmis%2Fatom%23repo-id-encoded/path/to/content" ) ) ); + "vnd.libreoffice.cmis://username@http:%2F%2Ffoo.bar.com:8080%2Fmy%2Fcmis%2Fatom%23repo-id-encoded/path/to/content" ) ) ); CPPUNIT_ASSERT_EQUAL( std::string( "http://foo.bar.com:8080/my/cmis/atom#repo-id-encoded" ), OUSTR_TO_STDSTR( aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ) ) ); CPPUNIT_ASSERT_EQUAL( std::string( "username" ), OUSTR_TO_STDSTR( aUrl.GetUser( ) ) ); CPPUNIT_ASSERT_EQUAL( std::string( "/path/to/content" ), OUSTR_TO_STDSTR( aUrl.GetURLPath( INetURLObject::NO_DECODE ) ) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Wrong protocol found", INET_PROT_CMIS_ATOM, aUrl.GetProtocol( ) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Wrong protocol found", INET_PROT_CMIS, aUrl.GetProtocol( ) ); } // Test without a username part { INetURLObject aUrl( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "vnd.libreoffice.cmis+atom://http:%2F%2Ffoo.bar.com:8080%2Fmy%2Fcmis%2Fatom%23repo-id-encoded/path/to/content" ) ) ); + "vnd.libreoffice.cmis://http:%2F%2Ffoo.bar.com:8080%2Fmy%2Fcmis%2Fatom%23repo-id-encoded/path/to/content" ) ) ); CPPUNIT_ASSERT_EQUAL( std::string( "http://foo.bar.com:8080/my/cmis/atom#repo-id-encoded" ), OUSTR_TO_STDSTR( aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ) ) ); CPPUNIT_ASSERT( !aUrl.HasUserData() ); CPPUNIT_ASSERT_EQUAL( std::string( "/path/to/content" ), OUSTR_TO_STDSTR( aUrl.GetURLPath( INetURLObject::NO_DECODE ) ) ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Wrong protocol found", INET_PROT_CMIS_ATOM, aUrl.GetProtocol( ) ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Wrong protocol found", INET_PROT_CMIS, aUrl.GetProtocol( ) ); } } diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index cc33f310b60e..b70f3b7a17ff 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -403,7 +403,7 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END] false, true }, { "sftp", "sftp://", 22, true, true, false, true, true, true, true, true }, - { "vnd.libreoffice.cmis+atom", "vnd.libreoffice.cmis+atom://", 0, true, true, false, + { "vnd.libreoffice.cmis", "vnd.libreoffice.cmis://", 0, true, true, false, false, true, false, true, true } }; // static @@ -916,7 +916,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, } case INET_PROT_VND_SUN_STAR_PKG: - case INET_PROT_CMIS_ATOM: + case INET_PROT_CMIS: { if (pEnd - pPos < 2 || *pPos++ != '/' || *pPos++ != '/') { @@ -2180,7 +2180,7 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& { "telnet:", 0, INET_PROT_TELNET, PrefixInfo::OFFICIAL }, { "vim:", "staroffice.vim:", INET_PROT_VIM, PrefixInfo::INTERNAL }, - { "vnd.libreoffice.cmis+atom:", 0, INET_PROT_CMIS_ATOM, PrefixInfo::INTERNAL }, + { "vnd.libreoffice.cmis:", 0, INET_PROT_CMIS, PrefixInfo::INTERNAL }, { "vnd.sun.star.cmd:", 0, INET_PROT_VND_SUN_STAR_CMD, PrefixInfo::OFFICIAL }, { "vnd.sun.star.expand:", 0, INET_PROT_VND_SUN_STAR_EXPAND, @@ -2966,7 +2966,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, case INET_PROT_VND_SUN_STAR_WEBDAV: case INET_PROT_HTTPS: case INET_PROT_SMB: - case INET_PROT_CMIS_ATOM: + case INET_PROT_CMIS: if (pPos < pEnd && *pPos != '/') return false; while (pPos < pEnd && *pPos != nQueryDelimiter -- cgit