rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101274.opening-a-directory.patch, 1.1, 1.2 sources, 1.371, 1.372

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4224

Modified Files:
	openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 
	sources 
Log Message:
fix patch

openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:
 comphelper/source/misc/mediadescriptor.cxx |    1 
 ucbhelper/source/client/content.cxx        |   75 +++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

Index: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.0.ooo101274.opening-a-directory.patch	22 Apr 2009 13:51:36 -0000	1.1
+++ openoffice.org-3.1.0.ooo101274.opening-a-directory.patch	7 Aug 2009 13:58:22 -0000	1.2
@@ -165,13 +165,11 @@ Index: comphelper/source/misc/mediadescr
 ===================================================================
 --- comphelper/source/misc/mediadescriptor.cxx	(revision 270567)
 +++ comphelper/source/misc/mediadescriptor.cxx	(working copy)
-@@ -727,7 +727,8 @@
- 					xRequest->getRequest() >>= exIO;
+@@ -728,6 +728,7 @@
  					bAbort = (
- 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     ) ||
--								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
-+								(exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION ) ||
-+                                (exIO.Code == css::ucb::IOErrorCode_NO_FILE)
- 							);
- 				}
- 				break;
+ 								(exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED     )
+ 							 || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
++							 || (exIO.Code == css::ucb::IOErrorCode_NO_FILE )
+ #ifdef MACOSX
+                              // this is a workaround for MAC, on this platform if the file is locked
+                              // the returned error code looks to be wrong


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -p -r1.371 -r1.372
--- sources	7 Aug 2009 11:06:40 -0000	1.371
+++ sources	7 Aug 2009 13:58:22 -0000	1.372
@@ -4,9 +4,9 @@ b54bcc9fdb23389e961b281508d9110c  docume
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 f501a4d62ed251d360ea6c544177a94f  redhat-registry.tar.gz
+ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
 6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 7d7eb194a61b3b1c59e3c82da889ac27  or-IN_DEV300_m40.sdf
 f3842c64faf98fe9a8752e4a820c97bc  acor_en-GB.dat
 bccdb30725b178260e5ce74d0ad27879  acor_en-ZA.dat
 1f7711384c49a2fef4abb02053e5949f  OOO310_m18.tar.bz2
-ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz