summaryrefslogtreecommitdiff
path: root/tools/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-02-25 14:35:00 +0000
committerKurt Zenker <kz@openoffice.org>2004-02-25 14:35:00 +0000
commitf4ae9eac1498b0c708c8c4f7119121b5b7080b0f (patch)
tree07113934810ce840fb5a35e5521a26cff54d80a7 /tools/source
parent10454a8a1621a88aa85ec1114133832f2b803c6f (diff)
INTEGRATION: CWS layoutmanager (1.40.38); FILE MERGED
2004/02/19 13:09:11 cd 1.40.38.2: RESYNC: (1.40-1.41); FILE MERGED 2003/09/09 09:27:33 sb 1.40.38.1: #112130# Added query part to .uno URLs; fixed typos in documentation.
Diffstat (limited to 'tools/source')
-rw-r--r--tools/source/fsys/urlobj.cxx19
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 5a70e81aebee..81d59d75c17e 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: urlobj.cxx,v $
*
- * $Revision: 1.41 $
+ * $Revision: 1.42 $
*
- * last change: $Author: hr $ $Date: 2004-02-04 13:44:42 $
+ * last change: $Author: kz $ $Date: 2004-02-25 15:35:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -190,7 +190,7 @@ using namespace com::sun;
; private
private-url = "PRIVATE:" path ["?" *uric]
- path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~"
+ path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~")
; private
@@ -205,12 +205,12 @@ using namespace com::sun;
; private
slot-url = "SLOT:" path ["?" *uric]
- path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~"
+ path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~")
; private
macro-url = "MACRO:" path ["?" *uric]
- path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~"
+ path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~")
; private
@@ -263,12 +263,13 @@ using namespace com::sun;
; private
- uno-url = ".UNO:" *uric
+ uno-url = ".UNO:" path ["?" *uric]
+ path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~")
; private
component-url = ".COMPONENT:" path ["?" *uric]
- path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~"
+ path = *(escaped / alphanum / "!" / "$" / "'" / "(" / ")" / "*" / "+" / "," / "-" / "." / "/" / ":" / ";" / "=" / "@" / "_" / "~")
; private
@@ -437,7 +438,7 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END]
{ "vim", "vim://", 0, true, true, false, true, false, false, true,
false },
{ ".uno", ".uno:", 0, false, false, false, false, false, false,
- false, false },
+ false, true },
{ ".component", ".component:", 0, false, false, false, false,
false, false, false, true },
{ "vnd.sun.star.pkg", "vnd.sun.star.pkg://", 0, true, false, false,
@@ -2570,6 +2571,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_PRIV_SOFFICE:
case INET_PROT_SLOT:
case INET_PROT_MACRO:
+ case INET_PROT_UNO:
case INET_PROT_COMPONENT:
case INET_PROT_LDAP:
while (pPos < pEnd && *pPos != nQueryDelimiter
@@ -2605,7 +2607,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
case INET_PROT_JAVASCRIPT:
case INET_PROT_DATA:
case INET_PROT_CID:
- case INET_PROT_UNO:
case INET_PROT_DB:
while (pPos < pEnd && *pPos != nFragmentDelimiter)
{