[Libreoffice-commits] .: connectivity/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Sep 6 01:19:32 PDT 2011


 connectivity/source/drivers/hsqldb/HStorageAccess.cxx           |    2 +-
 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b9b22fa7f81bb2c0e2aa3f56e76785210ed1f1a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 6 09:19:11 2011 +0100

    IBM jni.h has non-const SetByteArrayRegion final arg

diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 0e2856a..e692e75 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -257,7 +257,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
 
         if (nBytesRead <= 0)
             return -1;
-        env->SetByteArrayRegion(buffer,off,nBytesRead,(const jbyte*) &aData[0]);
+        env->SetByteArrayRegion(buffer,off,nBytesRead,(jbyte*) &aData[0]);
 
 #ifdef HSQLDB_DBG
         if ( logger )
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 1b13ed6..f96eae2 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -294,7 +294,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNat
         }
         OSL_ENSURE(nLen >= nBytesRead,"Buffer is too small!");
         OSL_ENSURE(aData.getLength() >= nBytesRead,"Buffer is too small!");
-        env->SetByteArrayRegion(buffer,0,nBytesRead,(const jbyte*) &aData[0]);
+        env->SetByteArrayRegion(buffer, 0, nBytesRead, (jbyte*) &aData[0]);
 #ifdef HSQLDB_DBG
         aDataLog.write( &aData[0], nBytesRead );
 #endif


More information about the Libreoffice-commits mailing list