From 9eed05b7d6c6389dea07ab1437674dee8974fa0e Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 7 Apr 2015 23:32:44 +0200
Subject: Remove dead INetProtocol::Out
Change-Id: I8333e8b58e85d7ba148adce32f87ea105776b4c9
---
include/tools/urlobj.hxx | 1 -
tools/source/fsys/urlobj.cxx | 26 --------------------------
2 files changed, 27 deletions(-)
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index ddab9f2b8899..6a3c3a17f0ba 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -79,7 +79,6 @@ enum class INetProtocol
Javascript,
Data,
Cid,
- Out,
VndSunStarHier,
Uno,
Component,
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index f00b12bf1e98..330d90d266de 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -158,11 +158,6 @@ using namespace css;
cid-url = "CID:" {RFC 822 <addr-spec> using *uric}
- ; private
- out-url = "OUT:///~" name ["/" *uric]
- name = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / ":" / ";" / "=" / "?" / "@" / "_" / "~"
-
-
; private
vnd-sun-star-hier-url = "VND.SUN.STAR.HIER:" ["//"reg_name] *("/" *pchar)
reg_name = 1*(escaped / alphanum / "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / ":" / ";" / "=" / "@" / "_" / "~")
@@ -363,9 +358,6 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme)
SchemeInfo{
"cid", "cid:", 0, false, false, false, false, false, false, false,
false},
- SchemeInfo{
- "out", "out://", 0, true, false, false, false, false, false, false,
- false},
SchemeInfo{
"vnd.sun.star.hier", "vnd.sun.star.hier:", 0, true, false, false,
false, false, false, true, false},
@@ -2109,8 +2101,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *&
{ "macro:", "staroffice.macro:", INetProtocol::Macro,
PrefixInfo::INTERNAL },
{ "mailto:", 0, INetProtocol::Mailto, PrefixInfo::OFFICIAL },
- { "out:", "staroffice.out:", INetProtocol::Out,
- PrefixInfo::INTERNAL },
{ "private:", "staroffice.private:", INetProtocol::PrivSoffice,
PrefixInfo::INTERNAL },
{ "private:factory/", "staroffice.factory:",
@@ -2140,8 +2130,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *&
PrefixInfo::EXTERNAL },
{ "staroffice.macro:", "macro:", INetProtocol::Macro,
PrefixInfo::EXTERNAL },
- { "staroffice.out:", "out:", INetProtocol::Out,
- PrefixInfo::EXTERNAL },
{ "staroffice.private:", "private:", INetProtocol::PrivSoffice,
PrefixInfo::EXTERNAL },
{ "staroffice.searchfolder:", "private:searchfolder:",
@@ -3050,20 +3038,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
}
break;
- case INetProtocol::Out:
- if (pEnd - pPos < 2 || *pPos++ != '/' || *pPos++ != '~')
- return false;
- aTheSynPath.append("/~");
- while (pPos < pEnd && *pPos != nFragmentDelimiter)
- {
- EscapeType eEscapeType;
- sal_uInt32 nUTF32 = getUTF32(pPos, pEnd, bOctets, eMechanism,
- eCharset, eEscapeType);
- appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
- PART_URIC, eCharset, true);
- }
- break;
-
case INetProtocol::VndSunStarHier:
case INetProtocol::VndSunStarPkg:
if (pPos < pEnd && *pPos != '/'
--
cgit