INTEGRATION: CWS hsqldb (1.1.1.1.244); FILE MERGED

2004/09/22 11:31:27 oj 1.1.1.1.244.1: #i33348# performance fixes

3 files changed, 18 insertions, 15 deletions

diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index ae5b8e9315a5..54d85044b14a 100644
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Blob.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:17:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,18 +81,19 @@ namespace connectivity
     //************ Class: java.sql.SQLWarning
     //**************************************************************
     class java_sql_Blob :   public java_lang_Object,
-                                                        public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob>
+                            public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob>
     {
     protected:
     // statische Daten fuer die Klasse
         static jclass theClass;
         // der Destruktor um den Object-Counter zu aktualisieren
         static void saveClassRef( jclass pClass );
+        virtual ~java_sql_Blob();
     public:
         static jclass getMyClass();
-        virtual ~java_sql_Blob();
+
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-        java_sql_Blob( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
+        java_sql_Blob( JNIEnv * pEnv, jobject myObj );
 
         // XBlob
         virtual sal_Int64 SAL_CALL length(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index 51973701788a..da3c91a35ae8 100644
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Clob.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:17:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,18 +79,19 @@ namespace connectivity
     //************ Class: java.sql.SQLWarning
     //**************************************************************
     class java_sql_Clob :   public java_lang_Object,
-                                                        public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob>
+                            public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob>
     {
     protected:
     // statische Daten fuer die Klasse
         static jclass theClass;
         // der Destruktor um den Object-Counter zu aktualisieren
         static void saveClassRef( jclass pClass );
+        virtual ~java_sql_Clob();
     public:
         static jclass getMyClass();
-        virtual ~java_sql_Clob();
+
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-        java_sql_Clob( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
+        java_sql_Clob( JNIEnv * pEnv, jobject myObj );
 
         // XClob
         virtual sal_Int64 SAL_CALL length(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index 7fd64e5ddc7b..83b3636a555b 100644
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Ref.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:14:26 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:18:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,18 +78,19 @@ namespace connectivity
     //************ Class: java.sql.Ref
     //**************************************************************
     class java_sql_Ref :    public java_lang_Object,
-                                                        public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef>
+                            public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef>
     {
     protected:
     // statische Daten fuer die Klasse
         static jclass theClass;
         // der Destruktor um den Object-Counter zu aktualisieren
         static void saveClassRef( jclass pClass );
+        virtual ~java_sql_Ref();
     public:
         static jclass getMyClass();
-        virtual ~java_sql_Ref();
+
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
-        java_sql_Ref( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
+        java_sql_Ref( JNIEnv * pEnv, jobject myObj );
 
         // XRef
         virtual ::rtl::OUString SAL_CALL getBaseTypeName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);