summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-10-01 09:09:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-11 14:22:22 +0200
commit4f5b3e4bd53d6d61df1f65f496f7bc8dc525c8a1 (patch)
treee0ac44b8f22f944f3303bac8e494da41d6c7b164 /bridges
parent5f84c44e3d5ff19b800b6358e61228546e318d4f (diff)
In O[U]StringBuffer, make string_view params replacements for OUString ones
...for LIBO_INTERNAL_ONLY, instead of having them as additional overloads. That way, loplugin:bufferadd and loplugin:stringviewparam found many further opportunities for simplification (all addressed here). Some notes: * There is no longer an implicit conversion from O[U]String to O[U]StringBuffer (as that goes via user-defined conversions through string_view now), which was most noticeable in copy initializations like OStringBuffer buf = someStr; that had to be changed to direct initialization, OStringBuffer buf(someStr); But then again, it wasn't too many places that were affected and I think we can live with that. * I made the O[U]StringBuffer ctors taking string_view non-explicit, mainly to get them in line with their counterparts taking O[U]String. * I added an OUStringBuffer::lastIndexOf string_view overload that was missing (relative to OUStringBuffer::indexOf). * loplugin:stringconstant needed some addition to keep the compilerplugins/clang/test/stringconstant.cxx checks related to OStringBuffer::append and OStringBuffer::insert working. * loplugin:stringviewparam no longer needs the special O[U]StringBuffer-related code that had been introduced in 1250aecd71fabde4dba990bfceb61bbe8e06b8ea "loplugin:stringviewparam extend to new.." Change-Id: Ib1bb8c4632d99b744e742605a9fef6eae959fd72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122904 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx22
1 files changed, 10 insertions, 12 deletions
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index eb152c110ec7..b8b69789a2ce 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -208,31 +208,29 @@ void Bridge::call_java(
jmethodID method_id = info->m_methods[ function_pos ];
#if OSL_DEBUG_LEVEL > 0
- OUStringBuffer trace_buf( 128 );
- trace_buf.append( "calling " );
JLocalAutoRef jo_method(
jni, jni->ToReflectedMethod( info->m_class, method_id, JNI_FALSE ) );
jni.ensure_no_exception();
- JLocalAutoRef jo_descr(
+ JLocalAutoRef jo_descr1(
jni, jni->CallObjectMethodA(
jo_method.get(), getJniInfo()->m_method_Object_toString, nullptr ) );
jni.ensure_no_exception();
- trace_buf.append( jstring_to_oustring( jni, static_cast<jstring>(jo_descr.get()) ) );
- trace_buf.append( " on " );
- jo_descr.reset(
+ JLocalAutoRef jo_descr2(
+ jni,
jni->CallObjectMethodA(
javaI, getJniInfo()->m_method_Object_toString, nullptr ) );
jni.ensure_no_exception();
- trace_buf.append( jstring_to_oustring( jni, static_cast<jstring>(jo_descr.get()) ) );
- trace_buf.append( " (" );
JLocalAutoRef jo_class( jni, jni->GetObjectClass( javaI ) );
- jo_descr.reset(
+ JLocalAutoRef jo_descr3(
+ jni,
jni->CallObjectMethodA(
jo_class.get(), getJniInfo()->m_method_Object_toString, nullptr ) );
jni.ensure_no_exception();
- trace_buf.append( jstring_to_oustring( jni, static_cast<jstring>(jo_descr.get()) ) );
- trace_buf.append( ")" );
- SAL_INFO("bridges", trace_buf.makeStringAndClear());
+ SAL_INFO(
+ "bridges",
+ "calling " << jstring_to_oustring( jni, static_cast<jstring>(jo_descr1.get()) ) << " on "
+ << jstring_to_oustring( jni, static_cast<jstring>(jo_descr2.get()) ) << " ("
+ << jstring_to_oustring( jni, static_cast<jstring>(jo_descr3.get()) ) << ")");
#endif
// complex return value