summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2019-02-11 15:16:06 +0200
committerTor Lillqvist <tml@collabora.com>2019-02-11 15:16:06 +0200
commit4f7f1dd12406655f71195c577ba7f7d128a93ce4 (patch)
treeffdd4ffedf2bb31a9a436b7738003d13c560c4df /bridges
parent9191b59ac13d59a50f88e74604f02eb97e969e89 (diff)
Revert "tdf#112689: Replace changed O(U)StringBuffer::append() with operator+"
Sorry, but this change breaks the build: bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx(884): error C2110: '+': cannot add two pointers This reverts commit 867384792244667a33cad79a7348b34b6008822b.
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx15
1 files changed, 9 insertions, 6 deletions
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 0ddc64b16f08..753f814a3367 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -879,12 +879,15 @@ int mscx_filterCppException(
&pExcTD, aUNOname.pData );
if (pExcTD == nullptr)
{
- OUString sMsg = "[mscx_uno bridge error] UNO type of "
- + "C++ exception unknown: \""
- + aUNOname + "\", RTTI-name=\""
- + aRTTIname + "\"!";
- RuntimeException exc( sMsg );
-
+ OUStringBuffer buf;
+ buf.append(
+ "[mscx_uno bridge error] UNO type of "
+ "C++ exception unknown: \"" );
+ buf.append( aUNOname );
+ buf.append( "\", RTTI-name=\"" );
+ buf.append( aRTTIname );
+ buf.append( "\"!" );
+ RuntimeException exc( buf.makeStringAndClear() );
uno_type_any_constructAndConvert(
pUnoExc, &exc,
cppu::UnoType<decltype(exc)>::get().getTypeLibType(), pCpp2Uno );