rpms/openoffice.org/devel openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch, NONE, 1.1 openoffice.org.spec, 1.1356, 1.1357
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Dec 6 12:36:06 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24017
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch
Log Message:
map dav:// to vnd.sun.star.webdav://
openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch:
--- NEW FILE openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch ---
Index: source/ucp/webdav/webdavcontent.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/webdavcontent.cxx,v
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 @@
sourceURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
}
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ {
+ sourceURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ }
else
{
if ( !aScheme.equalsAsciiL(
@@ -2622,6 +2628,11 @@
RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
targetURI.SetScheme(
rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+ else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ targetURI.SetScheme(
+ rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
+
// @@@ This implementation of 'transfer' only works
// if the source and target are located at same host.
Index: source/ucp/webdav/webdavprovider.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/webdavprovider.cxx,v
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 @@
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
- RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) )
- &&
+ RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) &&
+ !aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
!aScheme.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
)
@@ -177,6 +178,15 @@
HTTP_URL_SCHEME ) );
bNewId = true;
}
+ else if ( aScheme.equalsAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+ {
+ aURL = aURL.replaceAt( 0,
+ DAV_URL_SCHEME_LENGTH,
+ rtl::OUString::createFromAscii(
+ HTTP_URL_SCHEME ) );
+ bNewId = true;
+ }
sal_Int32 nPos = aURL.lastIndexOf( '/' );
if ( nPos != aURL.getLength() - 1 )
Index: source/ucp/webdav/webdavprovider.hxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/webdavprovider.hxx,v
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 @@
#define HTTPS_URL_SCHEME "https"
#define HTTPS_URL_SCHEME_LENGTH 5
+#define DAV_URL_SCHEME "dav"
+#define DAV_URL_SCHEME_LENGTH 3
+
+
#define FTP_URL_SCHEME "ftp"
#define HTTP_CONTENT_TYPE \
Index: 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
@@ -106,6 +106,17 @@
<value/>
</prop>
</node>
+ <node oor:name="Provider7" oor:op="replace">
+ <prop oor:name="ServiceName">
+ <value>com.sun.star.ucb.WebDAVContentProvider</value>
+ </prop>
+ <prop oor:name="URLTemplate">
+ <value>dav</value>
+ </prop>
+ <prop oor:name="Arguments">
+ <value/>
+ </prop>
+ </node>
<node oor:name="Provider8" oor:op="replace">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.PackageContentProvider</value>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1356
retrieving revision 1.1357
diff -u -r1.1356 -r1.1357
--- openoffice.org.spec 5 Dec 2007 12:42:15 -0000 1.1356
+++ openoffice.org.spec 6 Dec 2007 12:35:32 -0000 1.1357
@@ -160,6 +160,7 @@
Patch75: openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch
Patch76: workspace.cmcfixes39.patch
Patch77: workspace.notes2.patch
+Patch78: openoffice.org-2.3.1.oooXXXXX.ucb.davprotocol.patch
%define instdir %{_libdir}/openoffice.org
@@ -1117,6 +1118,7 @@
%patch75 -p1 -b .ooo84001.slideshow.gccisaprick.patch
%patch76 -p1 -b .workspace.cmcfixes39.patch
%patch77 -p1 -b .workspace.notes2.patch
+%patch78 -p1 -b .oooXXXXX.ucb.davprotocol.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -2841,6 +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://
* 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