summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx6
-rw-r--r--bridges/source/jni_uno/jni_base.h2
-rw-r--r--bridges/source/jni_uno/jni_bridge.cxx2
-rw-r--r--bridges/source/jni_uno/jni_info.cxx2
-rw-r--r--bridges/source/jni_uno/jni_java2uno.cxx2
-rw-r--r--bridges/source/jni_uno/jni_uno2java.cxx6
8 files changed, 12 insertions, 12 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index 14673ab7d5e2..ac06a7de486c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -396,7 +396,7 @@ int cpp_vtable_call(
}
default:
{
- throw RuntimeException("no member description found!",
+ throw RuntimeException(u"no member description found!"_ustr,
reinterpret_cast<XInterface *>( pCppI ) );
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index d17f3d99c629..2b0b50f531aa 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -195,7 +195,7 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno)
__cxxabiv1::__cxa_exception * header = __cxxabiv1::__cxa_get_globals()->caughtExceptions;
if (! header)
{
- RuntimeException aRE( "no exception header!" );
+ RuntimeException aRE( u"no exception header!"_ustr );
Type const & rType = cppu::UnoType<decltype(aRE)>::get();
uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
SAL_WARN("bridges", aRE.Message);
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 25277857f82e..8934943622b4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -238,7 +238,7 @@ static void cpp_call(
"C++ code threw " + o3tl::runtimeToOUString(typeid(e).name())
+ ": " + o3tl::runtimeToOUString(e.what()));
} catch (...) {
- throw RuntimeException("C++ code threw unknown exception");
+ throw RuntimeException(u"C++ code threw unknown exception"_ustr);
}
*ppUnoExc = nullptr;
@@ -339,7 +339,7 @@ void unoInterfaceProxyDispatch(
aParam.bOut = false;
typelib_TypeDescriptionReference * pReturnTypeRef = nullptr;
- OUString aVoidName("void");
+ OUString aVoidName(u"void"_ustr);
typelib_typedescriptionreference_new(
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
@@ -418,7 +418,7 @@ void unoInterfaceProxyDispatch(
default:
{
::com::sun::star::uno::RuntimeException aExc(
- "illegal member type description!",
+ u"illegal member type description!"_ustr,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
Type const & rExcType = cppu::UnoType<decltype(aExc)>::get();
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index ce4f2833f6c7..4b7471381981 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -216,7 +216,7 @@ inline rtl_mem * rtl_mem::allocate( std::size_t bytes )
{
void * p = std::malloc( bytes );
if (nullptr == p)
- throw BridgeRuntimeError( "out of memory!" );
+ throw BridgeRuntimeError( u"out of memory!"_ustr );
return static_cast<rtl_mem *>(p);
}
diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index c0465424ed4e..bd11e0bbda6d 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -242,7 +242,7 @@ Bridge::Bridge(
if (static_cast<jni_uno::JniUnoEnvironmentData *>(m_java_env->pContext)
== nullptr)
{
- throw BridgeRuntimeError("error during JNI-UNO's uno_initEnvironment");
+ throw BridgeRuntimeError(u"error during JNI-UNO's uno_initEnvironment"_ustr);
}
(*m_uno_env->aBase.acquire)( &m_uno_env->aBase );
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index a1a837545530..2f84d0121e1d 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -742,7 +742,7 @@ JNI_info::JNI_info(
assert( m_method_AsynchronousFinalizer_drain != nullptr );
// get java env
- OUString java_env_type_name( UNO_LB_JAVA );
+ OUString java_env_type_name( u"" UNO_LB_JAVA ""_ustr );
JLocalAutoRef jo_java(
jni, ustring_to_jstring( jni, java_env_type_name.pData ) );
jvalue args[ 2 ];
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 600fbdbcee7e..449ed982a5d6 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -389,7 +389,7 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
if (info->m_td.get()->eTypeClass != typelib_TypeClass_INTERFACE)
{
throw BridgeRuntimeError(
- "queryInterface() call demands an INTERFACE type!" );
+ u"queryInterface() call demands an INTERFACE type!"_ustr );
}
JNI_interface_type_info const * iface_info =
static_cast< JNI_interface_type_info const * >( info );
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 83cedc1212dc..66715a7d9d26 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -648,7 +648,7 @@ void UNO_proxy_dispatch(
typelib_TypeClass_INTERFACE)
{
throw BridgeRuntimeError(
- "queryInterface() call demands an INTERFACE type!" );
+ u"queryInterface() call demands an INTERFACE type!"_ustr );
}
uno_Interface * pInterface = nullptr;
@@ -758,7 +758,7 @@ void UNO_proxy_dispatch(
default:
{
throw BridgeRuntimeError(
- "illegal member type description!" );
+ u"illegal member type description!"_ustr );
}
}
}
@@ -788,7 +788,7 @@ void UNO_proxy_dispatch(
{
// binary identical struct
css::uno::RuntimeException exc(
- "[jni_uno bridge error] attaching current thread to java failed!",
+ u"[jni_uno bridge error] attaching current thread to java failed!"_ustr,
css::uno::Reference<
css::uno::XInterface >() );
css::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get();
generated by cgit (git 2.34.1) at 2024-12-23 04:56:08 +0000