rpms/openoffice.org/devel openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch, 1.1, 1.2 openoffice.org.spec, 1.1357, 1.1358
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Dec 7 08:54:56 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15887
Modified Files:
openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch
openoffice.org.spec
Log Message:
add davs:// https:// etc to the neon handler
openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch:
Index: openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch 6 Dec 2007 12:35:32 -0000 1.1
+++ openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch 7 Dec 2007 08:54:49 -0000 1.2
@@ -4,8 +4,8 @@
retrieving revision 1.56
diff -u -r1.56 webdavcontent.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/webdavcontent.cxx 3 Jul 2007 12:14:36 -0000 1.56
-+++ openoffice.org/ucb/source/ucp/webdav/webdavcontent.cxx 6 Dec 2007 12:30:22 -0000
-@@ -2600,6 +2600,12 @@
++++ openoffice.org/ucb/source/ucp/webdav/webdavcontent.cxx 7 Dec 2007 08:42:30 -0000
+@@ -2600,6 +2600,18 @@
sourceURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
}
@@ -15,10 +15,16 @@
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ }
++ else if ( aScheme.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
++ {
++ sourceURI.SetScheme(
++ rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
++ }
else
{
if ( !aScheme.equalsAsciiL(
-@@ -2622,6 +2628,11 @@
+@@ -2622,6 +2634,11 @@
RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
targetURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
@@ -36,8 +42,8 @@
retrieving revision 1.18
diff -u -r1.18 webdavprovider.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/webdavprovider.cxx 5 Jun 2007 18:22:00 -0000 1.18
-+++ openoffice.org/ucb/source/ucp/webdav/webdavprovider.cxx 6 Dec 2007 12:30:22 -0000
-@@ -146,8 +146,9 @@
++++ openoffice.org/ucb/source/ucp/webdav/webdavprovider.cxx 7 Dec 2007 08:42:30 -0000
+@@ -146,8 +146,11 @@
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
@@ -46,10 +52,12 @@
+ RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) &&
+ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
++ !aScheme.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
)
-@@ -177,6 +178,15 @@
+@@ -177,6 +180,24 @@
HTTP_URL_SCHEME ) );
bNewId = true;
}
@@ -62,6 +70,15 @@
+ HTTP_URL_SCHEME ) );
+ bNewId = true;
+ }
++ else if ( aScheme.equalsAsciiL(
++ RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
++ {
++ aURL = aURL.replaceAt( 0,
++ DAVS_URL_SCHEME_LENGTH,
++ rtl::OUString::createFromAscii(
++ HTTPS_URL_SCHEME ) );
++ bNewId = true;
++ }
sal_Int32 nPos = aURL.lastIndexOf( '/' );
if ( nPos != aURL.getLength() - 1 )
@@ -71,25 +88,29 @@
retrieving revision 1.9
diff -u -r1.9 webdavprovider.hxx
--- openoffice.org.orig/ucb/source/ucp/webdav/webdavprovider.hxx 5 Jun 2007 18:22:16 -0000 1.9
-+++ openoffice.org/ucb/source/ucp/webdav/webdavprovider.hxx 6 Dec 2007 12:30:22 -0000
-@@ -79,6 +79,10 @@
++++ openoffice.org/ucb/source/ucp/webdav/webdavprovider.hxx 7 Dec 2007 08:42:30 -0000
+@@ -79,6 +79,14 @@
#define HTTPS_URL_SCHEME "https"
#define HTTPS_URL_SCHEME_LENGTH 5
+#define DAV_URL_SCHEME "dav"
+#define DAV_URL_SCHEME_LENGTH 3
+
++#define DAVS_URL_SCHEME "davs"
++#define DAVS_URL_SCHEME_LENGTH 4
++
++
+
#define FTP_URL_SCHEME "ftp"
#define HTTP_CONTENT_TYPE \
-Index: data/org/openoffice/ucb/Configuration.xcu
+Index: registry/data/org/openoffice/ucb/Configuration.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu,v
retrieving revision 1.9
diff -u -r1.9 Configuration.xcu
---- openoffice.org.orig/registry/data/org/openoffice/ucb/Configuration.xcu 8 Sep 2005 15:07:17 -0000 1.9
-+++ openoffice.org/registry/data/org/openoffice/ucb/Configuration.xcu 6 Dec 2007 12:32:56 -0000
+--- openoffice.org.orig/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 8 Sep 2005 15:07:17 -0000 1.9
++++ openoffice.org/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu 7 Dec 2007 08:46:39 -0000
@@ -106,6 +106,17 @@
<value/>
</prop>
@@ -108,3 +129,32 @@
<node oor:name="Provider8" oor:op="replace">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.PackageContentProvider</value>
+@@ -150,6 +161,28 @@
+ <value/>
+ </prop>
+ </node>
++ <node oor:name="Provider12" oor:op="replace">
++ <prop oor:name="ServiceName">
++ <value>com.sun.star.ucb.WebDAVContentProvider</value>
++ </prop>
++ <prop oor:name="URLTemplate">
++ <value>https</value>
++ </prop>
++ <prop oor:name="Arguments">
++ <value/>
++ </prop>
++ </node>
++ <node oor:name="Provider13" oor:op="replace">
++ <prop oor:name="ServiceName">
++ <value>com.sun.star.ucb.WebDAVContentProvider</value>
++ </prop>
++ <prop oor:name="URLTemplate">
++ <value>davs</value>
++ </prop>
++ <prop oor:name="Arguments">
++ <value/>
++ </prop>
++ </node>
+ </node>
+ </node>
+ </node>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1357
retrieving revision 1.1358
diff -u -r1.1357 -r1.1358
--- openoffice.org.spec 6 Dec 2007 12:35:32 -0000 1.1357
+++ openoffice.org.spec 7 Dec 2007 08:54:49 -0000 1.1358
@@ -2843,7 +2843,7 @@
- Resolves: rhbz#206400 add long awaited workspace.notes2.patch
+ drop openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
integrated
-- add openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch for dav://
+- add openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch for dav:// and davs://
* Sat Dec 01 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.6
- add workspace.cmcfixes39.patch for ooo#83751 and use system writer2latex
More information about the fedora-extras-commits
mailing list