rpms/openoffice.org/FC-6 openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv17835

Modified Files:
	openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch 
Log Message:
hsqldb upgrade

openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch:
 StorageFileAccess.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

Index: openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch	9 Feb 2007 19:06:06 -0000	1.4
+++ openoffice.org-2.2.0.oooXXXXX.connectivity.newhsqldb.patch	12 Feb 2007 09:13:37 -0000	1.5
@@ -6,26 +6,24 @@
 diff -u -r1.7 -r1.8
 --- openoffice.org.orig/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java	8 Sep 2005 04:55:55 -0000	1.7
 +++ openoffice.org/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java	12 Dec 2006 15:50:19 -0000	1.8
-@@ -80,16 +82,16 @@
+@@ -80,16 +80,16 @@
          return new NativeOutputStreamHelper(key,streamName);
      }
  
 -    public void removeElement(java.lang.String filename) throws java.util.NoSuchElementException, java.io.IOException {
 -        if ( isStreamElement(key,filename) )
 -            removeElement(key,filename);
--    }
--
++    public void removeElement(java.lang.String filename) throws java.util.NoSuchElementException {
++            if ( isStreamElement(key,filename) )
++                removeElement(key,filename);
+     }
+ 
 -    public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException, java.io.IOException {
 -        if ( isStreamElement(key,oldName) ){
 -            removeElement(key,newName);
 -            renameElement(key,oldName, newName);
 -        }
-+    public void removeElement(java.lang.String filename) throws java.io.IOException {
-+            if ( isStreamElement(key,filename) )
-+                removeElement(key,filename);
-+    }
-+
-+    public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.io.IOException {
++    public void renameElement(java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException {
 +            if ( isStreamElement(key,oldName) ){
 +                removeElement(key,newName);
 +                renameElement(key,oldName, newName);
@@ -33,3 +31,12 @@
      }
  
      public class FileSync implements FileAccess.FileSync
+@@ -111,6 +111,6 @@
+     }
+ 
+     static native boolean isStreamElement(java.lang.String key,java.lang.String elementName);
+-    static native void removeElement(java.lang.String key,java.lang.String filename) throws java.util.NoSuchElementException, java.io.IOException;
+-    static native void renameElement(java.lang.String key,java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException, java.io.IOException;
++    static native void removeElement(java.lang.String key,java.lang.String filename) throws java.util.NoSuchElementException;
++    static native void renameElement(java.lang.String key,java.lang.String oldName, java.lang.String newName) throws java.util.NoSuchElementException;
+ }