[PATCH] Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges
Christina Roßmanith (via_Code_Review)
gerrit at gerrit.libreoffice.org
Sun Mar 31 11:45:23 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3139
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3139/1
Remove RTL_CONSTASCII_(U)STRINGPARAM in bridges
Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5
---
M bridges/inc/bridges/cpp_uno/bridge.hxx
M bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
M bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
M bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
M bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
M bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
M bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
M bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
M bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
M bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
M bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
M bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
M bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
M bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
M bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
M bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
M bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
M bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
M bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
M bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
M bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
M bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
M bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
M bridges/source/cpp_uno/mingw_intel/except.cxx
M bridges/source/cpp_uno/msvc_win32_intel/except.cxx
M bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
M bridges/source/cpp_uno/shared/component.cxx
M bridges/source/jni_uno/jni_data.cxx
M bridges/source/jni_uno/jni_info.cxx
M bridges/source/jni_uno/jni_info.h
M bridges/source/jni_uno/jni_java2uno.cxx
M bridges/source/jni_uno/jni_uno2java.cxx
M bridges/test/java_uno/any/transport.cxx
M bridges/test/testclient.cxx
M bridges/test/testoffice.cxx
M bridges/test/testsameprocess.cxx
M bridges/test/testserver.cxx
37 files changed, 127 insertions(+), 161 deletions(-)
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 3fe9bc5..3e8eca4 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -399,7 +399,7 @@
if (! s_pStaticOidPart)
{
OUStringBuffer aRet( 64 );
- aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
+ aRet.append( "];" );
// good guid
sal_uInt8 ar[16];
::rtl_getGlobalProcessId( ar );
diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 5afea9d..9ce12f61 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 41af149..45c6956 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -122,7 +122,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 1e8917e..bb3694e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -136,7 +136,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 73124c4..73ddede 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -130,7 +130,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 95259f9..3eaceb4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -135,7 +135,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 73124c4..73ddede 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -130,7 +130,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 3014c13..e8608b3 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -127,7 +127,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index 72774e3..95e44d4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -129,7 +129,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 2870b38..5c4ad93 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -128,7 +128,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
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 6991d5b..ea38f29 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -137,7 +137,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
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 d5711a5..cbf45bb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -239,9 +239,9 @@
throw;
} catch (const std::exception & e) {
OUStringBuffer buf;
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("C++ code threw "));
+ buf.append("C++ code threw ");
appendCString(buf, typeid(e).name());
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(": "));
+ buf.append(": ");
appendCString(buf, e.what());
throw RuntimeException(
buf.makeStringAndClear(), Reference< XInterface >());
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index c5dd246..f00c0ed 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -183,7 +183,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
index 04ad578..a4ba995 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx
@@ -128,7 +128,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 1c2c54c..3147d6d 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -186,7 +186,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index d5711a5..cbf45bb 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -239,9 +239,9 @@
throw;
} catch (const std::exception & e) {
OUStringBuffer buf;
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("C++ code threw "));
+ buf.append("C++ code threw ");
appendCString(buf, typeid(e).name());
- buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(": "));
+ buf.append(": ");
appendCString(buf, e.what());
throw RuntimeException(
buf.makeStringAndClear(), Reference< XInterface >());
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index d3058e4..97fbbc9 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -130,7 +130,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 5bce487..996eb5a 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -127,7 +127,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
+ buf.append( "_ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx
index e86ab57..ae82fbb 100644
--- a/bridges/source/cpp_uno/mingw_intel/except.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/except.cxx
@@ -130,7 +130,7 @@
{
// RTTI symbol
OStringBuffer buf( 64 );
- buf.append( RTL_CONSTASCII_STRINGPARAM("__ZTIN") );
+ buf.append( "__ZTIN" );
sal_Int32 index = 0;
do
{
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 497958d..c6345e2 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -67,7 +67,7 @@
static inline OUString toRTTIname( OUString const & rUNOname ) throw ()
{
OUStringBuffer aRet( 64 );
- aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM(".?AV") ); // class ".?AV"; struct ".?AU"
+ aRet.appendAscii( ".?AV" ); // class ".?AV"; struct ".?AU"
sal_Int32 nPos = rUNOname.getLength();
while (nPos > 0)
{
@@ -550,15 +550,13 @@
if (pExcTypeDescr == 0)
{
OUStringBuffer buf;
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM(
+ buf.append(
"[msci_uno bridge error] UNO type of "
- "C++ exception unknown: \"") );
+ "C++ exception unknown: \"" );
buf.append( aUNOname );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
- "\", RTTI-name=\"") );
+ buf.append( "\", RTTI-name=\"" );
buf.append( aRTTIname );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+ buf.append( "\"!" );
RuntimeException exc(
buf.makeStringAndClear(), Reference< XInterface >() );
uno_type_any_constructAndConvert(
@@ -586,9 +584,8 @@
// though this unknown exception leaks now, no user-defined exception
// is ever thrown thru the binary C-UNO dispatcher call stack.
RuntimeException exc(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "[msci_uno bridge error] unexpected "
- "C++ exception occurred!") ),
+ OUString( "[msci_uno bridge error] unexpected "
+ "C++ exception occurred!" ),
Reference< XInterface >() );
uno_type_any_constructAndConvert(
pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 5f47dc5..fa3f3ae 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -285,7 +285,7 @@
throw ()
{
OUStringBuffer aRet( 64 );
- aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM(".?AV") ); // class ".?AV"; struct ".?AU"
+ aRet.append( ".?AV" ); // class ".?AV"; struct ".?AU"
sal_Int32 nPos = rUNOname.getLength();
while (nPos > 0)
{
@@ -776,15 +776,13 @@
if (pExcTD == NULL)
{
OUStringBuffer buf;
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM(
+ buf.append(
"[mscx_uno bridge error] UNO type of "
- "C++ exception unknown: \"") );
+ "C++ exception unknown: \"" );
buf.append( aUNOname );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
- "\", RTTI-name=\"") );
+ buf.append( "\", RTTI-name=\"" );
buf.append( aRTTIname );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
+ buf.append( "\"!" );
RuntimeException exc(
buf.makeStringAndClear(), Reference< XInterface >() );
uno_type_any_constructAndConvert(
@@ -807,9 +805,8 @@
// though this unknown exception leaks now, no user-defined exception
// is ever thrown thru the binary C-UNO dispatcher call stack.
RuntimeException exc(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "[mscx_uno bridge error] unexpected "
- "C++ exception occurred!") ),
+ OUString( "[mscx_uno bridge error] unexpected "
+ "C++ exception occurred!" ),
Reference< XInterface >() );
uno_type_any_constructAndConvert(
pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno );
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index fe89c7b..89422eb 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -64,7 +64,7 @@
if (! s_pStaticOidPart)
{
OUStringBuffer aRet( 64 );
- aRet.appendAscii( RTL_CONSTASCII_STRINGPARAM("];") );
+ aRet.append( "];" );
// good guid
sal_uInt8 ar[16];
::rtl_getGlobalProcessId( ar );
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index be63f03..b73866c 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -386,9 +386,9 @@
if (0 == java_data.l)
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+ buf.append( "] null-ref given!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -411,9 +411,9 @@
if (0 == java_data.l)
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+ buf.append( "] null-ref given!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -425,11 +425,10 @@
if (! jo_type_name.is())
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] incomplete type object: "
- "no type name!") );
+ buf.append("] incomplete type object: "
+ "no type name!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -439,10 +438,9 @@
if (! td.is())
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] UNO type not found: ") );
+ buf.append( "] UNO type not found: " );
buf.append( type_name );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -489,11 +487,9 @@
if (! jo_type.is())
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] no type set at "
- "com.sun.star.uno.Any!") );
+ buf.append( "] no type set at " "com.sun.star.uno.Any!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -532,10 +528,9 @@
if (! value_td.is())
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] UNO type not found: ") );
+ buf.append( "] UNO type not found: " );
buf.append( type_name );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -684,11 +679,9 @@
default:
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( type_name );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] unsupported value type "
- "of any!") );
+ buf.append( "] unsupported value type " "of any!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -720,9 +713,9 @@
if (0 == java_data.l)
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+ buf.append( "] null-ref given!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -745,9 +738,9 @@
if (0 == java_data.l)
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+ buf.append( "] null-ref given!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -1017,9 +1010,9 @@
if (0 == java_data.l)
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] null-ref given!") );
+ buf.append( "] null-ref given!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -1155,11 +1148,9 @@
default:
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] unsupported sequence element"
- " type: ") );
+ buf.append( "] unsupported sequence element" " type: " );
buf.append( OUString::unacquired( &element_type->pTypeName ) );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -1212,9 +1203,9 @@
default:
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_uno():") );
+ buf.append( "[map_to_uno():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
+ buf.append( "] unsupported type!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
@@ -1878,7 +1869,7 @@
{
// call static <enum_class>.fromInt( int )
OStringBuffer sig_buf( 5 + class_name.getLength() );
- sig_buf.append( RTL_CONSTASCII_STRINGPARAM("(I)L") );
+ sig_buf.append( "(I)L" );
sig_buf.append( class_name.replace( '.', '/' ) );
sig_buf.append( ';' );
OString sig( sig_buf.makeStringAndClear() );
@@ -2367,7 +2358,7 @@
{
// call static <enum_class>.fromInt( int )
OStringBuffer sig_buf( 5 + class_name.getLength() );
- sig_buf.append( RTL_CONSTASCII_STRINGPARAM("(I)L") );
+ sig_buf.append( "(I)L" );
sig_buf.append( class_name.replace( '.', '/' ) );
sig_buf.append( ';' );
OString sig( sig_buf.makeStringAndClear() );
@@ -2486,10 +2477,9 @@
default:
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_java():") );
+ buf.append( "[map_to_java():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("] unsupported element type: ") );
+ buf.append( "] unsupported element type: " );
buf.append( OUString::unacquired( &element_type->pTypeName ) );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -2568,9 +2558,9 @@
default:
{
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("[map_to_java():") );
+ buf.append( "[map_to_java():" );
buf.append( OUString::unacquired( &type->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] unsupported type!") );
+ buf.appendAscii( "] unsupported type!" );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
}
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 61dd3e8..ad0b52b 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -46,8 +46,7 @@
if (! m_td.get()->bComplete)
{
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("cannot make type complete: ") );
+ buf.append( "cannot make type complete: " );
buf.append( OUString::unacquired( &m_td.get()->pTypeName ) );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -168,11 +167,11 @@
&attribute_td->aBase.pMemberName );
// getter
- sig_buf.append( RTL_CONSTASCII_STRINGPARAM("()") );
+ sig_buf.append( "()" );
sig_buf.append( type_sig );
OString method_signature( sig_buf.makeStringAndClear() );
OUStringBuffer name_buf( 3 + member_name.getLength() );
- name_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("get") );
+ name_buf.append( "get" );
name_buf.append( member_name );
OString method_name(
OUStringToOString(
@@ -190,11 +189,10 @@
sig_buf.ensureCapacity( 64 );
sig_buf.append( '(' );
sig_buf.append( type_sig );
- sig_buf.append( RTL_CONSTASCII_STRINGPARAM(")V") );
+ sig_buf.append( ")V" );
method_signature = sig_buf.makeStringAndClear();
name_buf.ensureCapacity( 3 + member_name.getLength() );
- name_buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("set") );
+ name_buf.append( "set" );
name_buf.append( member_name );
method_name = OUStringToOString(
name_buf.makeStringAndClear(),
@@ -312,8 +310,7 @@
&& reinterpret_cast< typelib_StructTypeDescription * >(
td)->pParameterizedTypes[nPos])
{
- sig = OString(
- RTL_CONSTASCII_STRINGPARAM("Ljava/lang/Object;"));
+ sig = OString( "Ljava/lang/Object;" );
} else {
OStringBuffer sig_buf( 32 );
JNI_info::append_sig( &sig_buf, td->ppTypeRefs[ nPos ] );
@@ -366,8 +363,7 @@
default:
{
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("type info not supported for ") );
+ buf.append( "type info not supported for " );
buf.append( uno_name );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -466,8 +462,7 @@
if (! td.is())
{
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("UNO type not found: ") );
+ buf.append( "UNO type not found: " );
buf.append( uno_name );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -756,7 +751,7 @@
OSL_ASSERT( 0 != m_field_JNI_proxy_m_oid );
// get java env
- OUString java_env_type_name( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_JAVA) );
+ OUString java_env_type_name( UNO_LB_JAVA );
JLocalAutoRef jo_java(
jni, ustring_to_jstring( jni, java_env_type_name.pData ) );
jvalue args[ 2 ];
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index de63914..ecc1cc2 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -279,25 +279,23 @@
break;
case typelib_TypeClass_STRING:
if ( use_slashes ) {
- buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava/lang/String;") );
+ buf->append( "Ljava/lang/String;" );
} else {
- buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava.lang.String;") );
+ buf->append( "Ljava.lang.String;" );
}
break;
case typelib_TypeClass_TYPE:
if ( use_slashes ) {
- buf->append(
- RTL_CONSTASCII_STRINGPARAM("Lcom/sun/star/uno/Type;") );
+ buf->append( "Lcom/sun/star/uno/Type;" );
} else {
- buf->append(
- RTL_CONSTASCII_STRINGPARAM("Lcom.sun.star.uno.Type;") );
+ buf->append( "Lcom.sun.star.uno.Type;" );
}
break;
case typelib_TypeClass_ANY:
if ( use_slashes ) {
- buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava/lang/Object;") );
+ buf->append( "Ljava/lang/Object;" );
} else {
- buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava.lang.Object;") );
+ buf->append( "Ljava.lang.Object;" );
}
break;
case typelib_TypeClass_ENUM:
@@ -337,9 +335,9 @@
if (use_Object_for_type_XInterface && is_XInterface( type ))
{
if ( use_slashes ) {
- buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava/lang/Object;") );
+ buf->append( "Ljava/lang/Object;" );
} else {
- buf->append( RTL_CONSTASCII_STRINGPARAM("Ljava.lang.Object;") );
+ buf->append( "Ljava.lang.Object;" );
}
}
else
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 9107cc7..b6a200e 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -97,10 +97,9 @@
#if OSL_DEBUG_LEVEL > 1
{
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("exception occurred java->uno: [") );
+ buf.append( "exception occurred java->uno: [" );
buf.append( OUString::unacquired( &uno_exc->pType->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
+ buf.append( "] " );
buf.append(
reinterpret_cast< ::com::sun::star::uno::Exception const * >(
uno_exc->pData )->Message );
@@ -135,8 +134,7 @@
jo_exc.get(), m_jni_info->m_method_Object_toString, 0 ) );
jni.ensure_no_exception();
OUStringBuffer buf( 128 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
- "throwing java exception failed: ") );
+ buf.append( "throwing java exception failed: " );
buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -401,9 +399,9 @@
#if OSL_DEBUG_LEVEL > 1
{
OUStringBuffer trace_buf( 64 );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("java->uno call: ") );
+ trace_buf.append( "java->uno call: " );
trace_buf.append( method_name );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" on oid ") );
+ trace_buf.append( " on oid " );
JLocalAutoRef jo_oid(
jni, jni->GetObjectField(
jo_proxy, jni_info->m_field_JNI_proxy_m_oid ) );
@@ -596,11 +594,10 @@
}
// the thing that should not be... no method info found!
OUStringBuffer buf( 64 );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
- "calling undeclared function on interface ") );
+ buf.append( "calling undeclared function on interface " );
buf.append( OUString::unacquired(
&((typelib_TypeDescription *)td)->pTypeName ) );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+ buf.append( ": " );
buf.append( method_name );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -608,11 +605,9 @@
catch (const BridgeRuntimeError & err)
{
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("[jni_uno bridge error] "
- "Java calling UNO method ") );
+ buf.append( "[jni_uno bridge error] " "Java calling UNO method " );
buf.append( method_name );
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+ buf.append( ": " );
buf.append( err.m_message );
// notify RuntimeException
OString cstr_msg(
@@ -629,9 +624,8 @@
catch (const ::jvmaccess::VirtualMachine::AttachGuard::CreationException &)
{
OString cstr_msg(
- OString( RTL_CONSTASCII_STRINGPARAM(
- "[jni_uno bridge error] "
- "attaching current thread to java failed!") ) +
+ OString( "[jni_uno bridge error] "
+ "attaching current thread to java failed!" ) +
OUStringToOString(
jni.get_stack_trace(), RTL_TEXTENCODING_JAVA_UTF8 ) );
OSL_FAIL( cstr_msg.getStr() );
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 88922ca..9ba852f 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -88,8 +88,7 @@
jo_exc.get(), m_jni_info->m_method_Object_toString, 0 ) );
jni.ensure_no_exception();
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("non-UNO exception occurred: ") );
+ buf.append( "non-UNO exception occurred: " );
buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
buf.append( jni.get_stack_trace( jo_exc.get() ) );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -116,10 +115,9 @@
#if OSL_DEBUG_LEVEL > 1
OUStringBuffer trace_buf( 128 );
- trace_buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("exception occurred uno->java: [") );
+ trace_buf.append( "exception occurred uno->java: [" );
trace_buf.append( exc_name );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("] ") );
+ trace_buf.append( "] " );
trace_buf.append(
reinterpret_cast< ::com::sun::star::uno::Exception const * >(
uno_exc->pData )->Message );
@@ -152,8 +150,7 @@
iface_holder.makeComplete();
if (! iface_holder.get()->bComplete) {
OUStringBuffer buf;
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM("cannot make type complete: ") );
+ buf.append( "cannot make type complete: " );
buf.append( OUString::unacquired(&iface_holder.get()->pTypeName) );
buf.append( jni.get_stack_trace() );
throw BridgeRuntimeError( buf.makeStringAndClear() );
@@ -226,7 +223,7 @@
#if OSL_DEBUG_LEVEL > 1
OUStringBuffer trace_buf( 128 );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("calling ") );
+ trace_buf.append( "calling " );
JLocalAutoRef jo_method(
jni, jni->ToReflectedMethod( info->m_class, method_id, JNI_FALSE ) );
jni.ensure_no_exception();
@@ -235,20 +232,20 @@
jo_method.get(), m_jni_info->m_method_Object_toString, 0 ) );
jni.ensure_no_exception();
trace_buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" on ") );
+ trace_buf.append( " on " );
jo_descr.reset(
jni->CallObjectMethodA(
javaI, m_jni_info->m_method_Object_toString, 0 ) );
jni.ensure_no_exception();
trace_buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" (") );
+ trace_buf.append( " (" );
JLocalAutoRef jo_class( jni, jni->GetObjectClass( javaI ) );
jo_descr.reset(
jni->CallObjectMethodA(
jo_class.get(), m_jni_info->m_method_Object_toString, 0 ) );
jni.ensure_no_exception();
trace_buf.append( jstring_to_oustring( jni, (jstring) jo_descr.get() ) );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(")") );
+ trace_buf.append( ")" );
OString cstr_trace(
OUStringToOString(
trace_buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
@@ -612,9 +609,9 @@
#if OSL_DEBUG_LEVEL > 1
OUStringBuffer trace_buf( 64 );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("uno->java call: ") );
+ trace_buf.append( "uno->java call: " );
trace_buf.append( OUString::unacquired( &member_td->pTypeName ) );
- trace_buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" on oid ") );
+ trace_buf.append( " on oid " );
trace_buf.append( that->m_oid );
OString cstr_msg(
OUStringToOString(
@@ -815,9 +812,7 @@
catch (BridgeRuntimeError & err)
{
OUStringBuffer buf( 128 );
- buf.appendAscii(
- RTL_CONSTASCII_STRINGPARAM(
- "[jni_uno bridge error] UNO calling Java method ") );
+ buf.append( "[jni_uno bridge error] UNO calling Java method " );
if (typelib_TypeClass_INTERFACE_METHOD == member_td->eTypeClass ||
typelib_TypeClass_INTERFACE_ATTRIBUTE == member_td->eTypeClass)
{
@@ -826,7 +821,7 @@
typelib_InterfaceMemberTypeDescription const * >(
member_td )->pMemberName ) );
}
- buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(": ") );
+ buf.append( ": " );
buf.append( err.m_message );
// binary identical struct
::com::sun::star::uno::RuntimeException exc(
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index dbf900a..fda6249 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -77,8 +77,8 @@
throw;
}
// create uno envs
- OUString java_name( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_JAVA) );
- OUString cpp_name( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+ OUString java_name( UNO_LB_JAVA );
+ OUString cpp_name( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
Environment java_env, cpp_env;
uno_getEnvironment( (uno_Environment **)&java_env, java_name.pData, vm.get() );
OSL_ASSERT( java_env.is() );
diff --git a/bridges/test/testclient.cxx b/bridges/test/testclient.cxx
index 052f598..52f70bf 100644
--- a/bridges/test/testclient.cxx
+++ b/bridges/test/testclient.cxx
@@ -132,7 +132,7 @@
Reference < XConnector > rConnector(
createComponent( OUString("com.sun.star.connection.Connector"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
+ OUString( "connector.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
@@ -155,12 +155,12 @@
{
// just ensure that it is registered
createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
+ OUString( "remotebridge.uno" SAL_DLLEXTENSION),
rSMgr );
Reference < XBridgeFactory > rFactory(
createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
+ OUString( "bridgefac.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
diff --git a/bridges/test/testoffice.cxx b/bridges/test/testoffice.cxx
index 3f9157d..8c18fbf 100644
--- a/bridges/test/testoffice.cxx
+++ b/bridges/test/testoffice.cxx
@@ -209,17 +209,17 @@
Reference < XConnector > rConnector(
createComponent( OUString("com.sun.star.connection.Connector"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
+ OUString( "connector.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
+ OUString( "remotebridge.uno" SAL_DLLEXTENSION),
rSMgr );
Reference < XBridgeFactory > rFactory(
createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
+ OUString( "bridgefac.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
diff --git a/bridges/test/testsameprocess.cxx b/bridges/test/testsameprocess.cxx
index 00d399b..675ec85 100644
--- a/bridges/test/testsameprocess.cxx
+++ b/bridges/test/testsameprocess.cxx
@@ -123,24 +123,24 @@
Reference < XConnector > rConnector(
createComponent( OUString("com.sun.star.connection.Connector"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("connector.uno" SAL_DLLEXTENSION)),
+ OUString( "connector.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
Reference < XAcceptor > rAcceptor(
createComponent( OUString("com.sun.star.connection.Acceptor"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)),
+ OUString( "acceptor.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
// just ensure that it is registered
// createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
-// OUString( RTL_CONSTASCII_USTRINGPARAM("iiopbrdg" SAL_DLLEXTENSION)),
+// OUString( "iiopbrdg" SAL_DLLEXTENSION),
// rSMgr );
Reference < XBridgeFactory > rFactory(
createComponent( OUString("com.sun.star.bridge.BridgeFactory"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION)),
+ OUString( "bridgefac.uno" SAL_DLLEXTENSION),
rSMgr ),
UNO_QUERY );
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index 4617b23..8aefdfd 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -194,19 +194,19 @@
Reference < XBridgeFactory > rBridgeFactory ( createComponent(
OUString("com.sun.star.bridge.BridgeFactory"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("bridgefac.uno" SAL_DLLEXTENSION )),
+ OUString( "bridgefac.uno" SAL_DLLEXTENSION ),
rSMgr ),
UNO_QUERY );
createComponent( OUString("com.sun.star.bridge.Bridge.iiop"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("remotebridge.uno" SAL_DLLEXTENSION)),
+ OUString( "remotebridge.uno" SAL_DLLEXTENSION),
rSMgr );
Reference < XAcceptor > rAcceptor(
createComponent( OUString("com.sun.star.connection.Acceptor"),
- OUString( RTL_CONSTASCII_USTRINGPARAM("acceptor.uno" SAL_DLLEXTENSION)),
+ OUString( "acceptor.uno" SAL_DLLEXTENSION),
rSMgr ) ,
UNO_QUERY );
--
To view, visit https://gerrit.libreoffice.org/3139
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8777ee7f587846399e95cf3b1b37d669a76bae5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith <ChrRossmanith at web.de>
More information about the LibreOffice
mailing list