diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-05 08:52:15 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-12-05 08:56:52 +0200 |
| commit | d9cf110dae8030c93c4cc7909b30c779b523359f (patch) | |
| tree | 6052278a786391544e2d51da43a496b6932b1828 /tools | |
| parent | 54c08da6c7d9f8fc28ac6c5fd15fdfbe8b0cfc03 (diff) | |
Bye bye ODMA
SUSE has no interest in it any longer, and I doubt anybody else has
either.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/urlobj.hxx | 1 | ||||
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 27 |
2 files changed, 1 insertions, 27 deletions
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 4b80eaab071a..2f4319968042 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -94,7 +94,6 @@ enum INetProtocol INET_PROT_LDAP = 23, INET_PROT_DB = 24, INET_PROT_VND_SUN_STAR_CMD = 25, - INET_PROT_VND_SUN_STAR_ODMA = 26, INET_PROT_TELNET = 27, INET_PROT_VND_SUN_STAR_EXPAND = 28, INET_PROT_VND_SUN_STAR_TDOC = 29, diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index b70f3b7a17ff..b9b8ac5937d6 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -216,8 +216,6 @@ using namespace com::sun; uric_no_slash = unreserved / escaped / ";" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / "," - ; private - vnd-sun-star-url = "VND.SUN.STAR.ODMA:" ["/" *uric_no_slash] uric_no_slash = unreserved / escaped / ";" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / "," @@ -388,8 +386,7 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END] false }, { "vnd.sun.star.cmd", "vnd.sun.star.cmd:", 0, false, false, false, false, false, false, false, false }, - { "vnd.sun.star.odma", "vnd.sun.star.odma:", 0, false, false, false, - false, false, false, true, false }, + { "", "", 0, false, false, false, false, true, true, true, false }, // Placeholder for removed 25: ODMA { "telnet", "telnet://", 23, true, true, false, true, true, true, true, false }, { "vnd.sun.star.expand", "vnd.sun.star.expand:", 0, false, false, false, @@ -2189,8 +2186,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& PrefixInfo::OFFICIAL }, { "vnd.sun.star.hier:", 0, INET_PROT_VND_SUN_STAR_HIER, PrefixInfo::OFFICIAL }, - { "vnd.sun.star.odma:", 0, INET_PROT_VND_SUN_STAR_ODMA, - PrefixInfo::OFFICIAL }, { "vnd.sun.star.pkg:", 0, INET_PROT_VND_SUN_STAR_PKG, PrefixInfo::OFFICIAL }, { "vnd.sun.star.tdoc:", 0, INET_PROT_VND_SUN_STAR_TDOC, @@ -3338,26 +3333,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme, break; } - case INET_PROT_VND_SUN_STAR_ODMA: - if (pPos < pEnd) - { - if (*pPos == '/') - ++pPos; - else - return false; - } - aTheSynPath.append(sal_Unicode('/')); - while (pPos < pEnd && *pPos != nFragmentDelimiter) - { - EscapeType eEscapeType; - sal_uInt32 nUTF32 = getUTF32(pPos, pEnd, bOctets, - '%', eMechanism, - eCharset, eEscapeType); - appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets, - PART_URIC_NO_SLASH, '%', eCharset, true); - } - break; - case INET_PROT_TELNET: if (pPos < pEnd) { |