7 files changed, 11 insertions, 53 deletions
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 2471c1db71..647ddaccde 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -345,11 +345,18 @@ void ORowSetValue::free()
                 TRACE_FREE( Any )
                 m_aValue.m_pValue = NULL;
                 break;
+            case DataType::BIT:
+            case DataType::TINYINT:
+            case DataType::SMALLINT:
+            case DataType::BOOLEAN:
+                break;
             default:
-                OSL_ENSURE(m_aValue.m_pString,"String pointer is null!");
-                delete (Any*)m_aValue.m_pValue;
-                TRACE_FREE( Any )
-                m_aValue.m_pValue = NULL;
+                if ( m_aValue.m_pValue )
+                {
+                    delete (Any*)m_aValue.m_pValue;
+                    TRACE_FREE( Any )
+                    m_aValue.m_pValue = NULL;
+                }
                 break;
 
         }
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 5018770aab..fdb276a333 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -49,20 +49,3 @@ jclass java_lang_Boolean::getMyClass() const
 {
     return st_getMyClass();
 }
-
-java_lang_Boolean::java_lang_Boolean( sal_Bool _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
-    SDBThreadAttach t;
-    // Java-Call fuer den Konstruktor absetzen
-    // temporaere Variable initialisieren
-    static const char * cSignature = "(Z)V";
-    jobject tempObj;
-    static jmethodID mID(NULL);
-    obtainMethodId(t.pEnv, "<init>",cSignature, mID);
-    tempObj = t.pEnv->NewObject( getMyClass(), mID, _par0 );
-    saveRef( t.pEnv, tempObj );
-    t.pEnv->DeleteLocalRef( tempObj );
-    // und aufraeumen
-}
-
-
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index d2e88e8397..ea25e8983f 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -166,14 +166,6 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj )
 }
 
 
-java_lang_Class * java_lang_Object::getClass()
-{
-    SDBThreadAttach t;
-    static jmethodID mID(NULL);
-    jobject out = callObjectMethod(t.pEnv,"getClass","()Ljava/lang/Class;", mID);
-    return out ? new java_lang_Class( t.pEnv, out ) : NULL;
-}
-
 ::rtl::OUString java_lang_Object::toString() const
 {
     static jmethodID mID(NULL);
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index edae1d78ee..62b77859d9 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -52,26 +52,6 @@ jclass java_lang_String::st_getMyClass()
 }
 
 //--------------------------------------------------------------------------
-java_lang_String::java_lang_String( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL )
-{
-    SDBThreadAttach t;
-    if( !t.pEnv )
-        return;
-    jvalue args[1];
-    // Parameter konvertieren
-    args[0].l = convertwchar_tToJavaString(t.pEnv,_par0);
-    // Java-Call fuer den Konstruktor absetzen
-    // temporaere Variable initialisieren
-    static const char * cSignature = "(Ljava/lang/String;)V";
-    jobject tempObj;
-    static jmethodID mID(NULL);
-    obtainMethodId(t.pEnv, "<init>",cSignature, mID);
-    tempObj = t.pEnv->NewObjectA( getMyClass(), mID, args );
-    saveRef( t.pEnv, tempObj );
-    t.pEnv->DeleteLocalRef( tempObj );
-    t.pEnv->DeleteLocalRef((jstring)args[0].l);
-}
-//--------------------------------------------------------------------------
 java_lang_String::operator ::rtl::OUString()
 {
     SDBThreadAttach t;
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index a63b1ed72e..fe237fb2fd 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -44,7 +44,6 @@ namespace connectivity
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
         java_lang_Boolean( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
-        java_lang_Boolean( sal_Bool _par0 );
         static jclass st_getMyClass();
     };
 }
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 95e464e592..f60099e43c 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -118,8 +118,6 @@ namespace connectivity
         void clearObject(JNIEnv& rEnv);
         void clearObject();
 
-        java_lang_Class *	getClass();
-
         virtual ::rtl::OUString toString() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xFactory; }
 
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 157a4d474e..3bc3631bd7 100644
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
@@ -42,7 +42,6 @@ namespace connectivity
         // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
         java_lang_String( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){}
 
-        java_lang_String( const ::rtl::OUString& _par0 );
         operator ::rtl::OUString();
 
         static jclass st_getMyClass();