mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return the std::unique_ptr itself here, not a raw pointer

Browse Source 
Change-Id: I786e05bebd243d661ced147ad51e4a843916a3b0
This commit is contained in:
Stephan Bergmann
2015-09-28 10:06:26 +02:00
parent 0067b4df75
commit c762354ceb
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bridges/source/jni_uno/jni_data.cxx
View File

@@ -31,14 +31,15 @@ namespace jni_uno
{ {
inline rtl_mem * seq_allocate( sal_Int32 nElements, sal_Int32 nSize ) inline std::unique_ptr<rtl_mem> seq_allocate(
sal_Int32 nElements, sal_Int32 nSize )
{ {
std::unique_ptr< rtl_mem > seq( std::unique_ptr< rtl_mem > seq(
rtl_mem::allocate( SAL_SEQUENCE_HEADER_SIZE + (nElements * nSize) ) ); rtl_mem::allocate( SAL_SEQUENCE_HEADER_SIZE + (nElements * nSize) ) );
uno_Sequence * p = reinterpret_cast<uno_Sequence *>(seq.get()); uno_Sequence * p = reinterpret_cast<uno_Sequence *>(seq.get());
p->nRefCount = 1; p->nRefCount = 1;
p->nElements = nElements; p->nElements = nElements;
return seq.release(); return seq;
} }
@@ -972,21 +973,21 @@ void Bridge::map_to_uno(
switch (element_type->eTypeClass) switch (element_type->eTypeClass)
{ {
case typelib_TypeClass_CHAR: case typelib_TypeClass_CHAR:
seq.reset( seq_allocate( nElements, sizeof (sal_Unicode) ) ); seq = seq_allocate( nElements, sizeof (sal_Unicode) );
jni->GetCharArrayRegion( jni->GetCharArrayRegion(
static_cast<jcharArray>(java_data.l), 0, nElements, static_cast<jcharArray>(java_data.l), 0, nElements,
reinterpret_cast<jchar *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jchar *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
jni.ensure_no_exception(); jni.ensure_no_exception();
break; break;
case typelib_TypeClass_BOOLEAN: case typelib_TypeClass_BOOLEAN:
seq.reset( seq_allocate( nElements, sizeof (sal_Bool) ) ); seq = seq_allocate( nElements, sizeof (sal_Bool) );
jni->GetBooleanArrayRegion( jni->GetBooleanArrayRegion(
static_cast<jbooleanArray>(java_data.l), 0, nElements, static_cast<jbooleanArray>(java_data.l), 0, nElements,
reinterpret_cast<jboolean *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jboolean *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
jni.ensure_no_exception(); jni.ensure_no_exception();
break; break;
case typelib_TypeClass_BYTE: case typelib_TypeClass_BYTE:
seq.reset( seq_allocate( nElements, sizeof (sal_Int8) ) ); seq = seq_allocate( nElements, sizeof (sal_Int8) );
jni->GetByteArrayRegion( jni->GetByteArrayRegion(
static_cast<jbyteArray>(java_data.l), 0, nElements, static_cast<jbyteArray>(java_data.l), 0, nElements,
reinterpret_cast<jbyte *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jbyte *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
@@ -994,7 +995,7 @@ void Bridge::map_to_uno(
break; break;
case typelib_TypeClass_SHORT: case typelib_TypeClass_SHORT:
case typelib_TypeClass_UNSIGNED_SHORT: case typelib_TypeClass_UNSIGNED_SHORT:
seq.reset( seq_allocate( nElements, sizeof (sal_Int16) ) ); seq = seq_allocate( nElements, sizeof (sal_Int16) );
jni->GetShortArrayRegion( jni->GetShortArrayRegion(
static_cast<jshortArray>(java_data.l), 0, nElements, static_cast<jshortArray>(java_data.l), 0, nElements,
reinterpret_cast<jshort *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jshort *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
@@ -1002,7 +1003,7 @@ void Bridge::map_to_uno(
break; break;
case typelib_TypeClass_LONG: case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_UNSIGNED_LONG:
seq.reset( seq_allocate( nElements, sizeof (sal_Int32) ) ); seq = seq_allocate( nElements, sizeof (sal_Int32) );
jni->GetIntArrayRegion( jni->GetIntArrayRegion(
static_cast<jintArray>(java_data.l), 0, nElements, static_cast<jintArray>(java_data.l), 0, nElements,
reinterpret_cast<jint *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jint *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
@@ -1010,21 +1011,21 @@ void Bridge::map_to_uno(
break; break;
case typelib_TypeClass_HYPER: case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
seq.reset( seq_allocate( nElements, sizeof (sal_Int64) ) ); seq = seq_allocate( nElements, sizeof (sal_Int64) );
jni->GetLongArrayRegion( jni->GetLongArrayRegion(
static_cast<jlongArray>(java_data.l), 0, nElements, static_cast<jlongArray>(java_data.l), 0, nElements,
reinterpret_cast<jlong *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jlong *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
jni.ensure_no_exception(); jni.ensure_no_exception();
break; break;
case typelib_TypeClass_FLOAT: case typelib_TypeClass_FLOAT:
seq.reset( seq_allocate( nElements, sizeof (float) ) ); seq = seq_allocate( nElements, sizeof (float) );
jni->GetFloatArrayRegion( jni->GetFloatArrayRegion(
static_cast<jfloatArray>(java_data.l), 0, nElements, static_cast<jfloatArray>(java_data.l), 0, nElements,
reinterpret_cast<jfloat *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jfloat *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
jni.ensure_no_exception(); jni.ensure_no_exception();
break; break;
case typelib_TypeClass_DOUBLE: case typelib_TypeClass_DOUBLE:
seq.reset( seq_allocate( nElements, sizeof (double) ) ); seq = seq_allocate( nElements, sizeof (double) );
jni->GetDoubleArrayRegion( jni->GetDoubleArrayRegion(
static_cast<jdoubleArray>(java_data.l), 0, nElements, static_cast<jdoubleArray>(java_data.l), 0, nElements,
reinterpret_cast<jdouble *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) ); reinterpret_cast<jdouble *>(reinterpret_cast<uno_Sequence *>(seq.get())->elements) );
@@ -1040,7 +1041,7 @@ void Bridge::map_to_uno(
case typelib_TypeClass_INTERFACE: case typelib_TypeClass_INTERFACE:
{ {
TypeDescr element_td( element_type ); TypeDescr element_td( element_type );
seq.reset( seq_allocate( nElements, element_td.get()->nSize ) ); seq = seq_allocate( nElements, element_td.get()->nSize );
JNI_type_info const * element_info; JNI_type_info const * element_info;
if (typelib_TypeClass_STRUCT == element_type->eTypeClass || if (typelib_TypeClass_STRUCT == element_type->eTypeClass ||