diff options
| author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
| commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
| tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /testtools | |
| parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) | |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'testtools')
4 files changed, 4 insertions, 4 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index c0cecc981a11..332f15060e54 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -1221,7 +1221,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) catch (Exception & exc) { OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - fprintf( stderr, "exception occured: %s\n", cstr.getStr() ); + fprintf( stderr, "exception occurred: %s\n", cstr.getStr() ); throw; } diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx index db1a8ace2118..0dd532cac5b2 100644 --- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx +++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx @@ -965,7 +965,7 @@ static bool raiseException(XBridgeTest* xLBT ) catch (System::Exception* exc) { System::Text::StringBuilder* s = new System::Text::StringBuilder(); - s->Append(S"cli_cpp_bridgetest: unexpected exception occured in XMain::run. Original exception: "); + s->Append(S"cli_cpp_bridgetest: unexpected exception occurred in XMain::run. Original exception: "); s->Append(exc->GetType()->Name); s->Append(S"\n Message: "); s->Append(exc->Message); diff --git a/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs b/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs index 7468120d7c5a..7591896bed88 100644 --- a/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs +++ b/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs @@ -1020,7 +1020,7 @@ static bool raiseException(XBridgeTest xLBT ) catch (System.Exception exc) { throw new unoidl.com.sun.star.uno.RuntimeException( - "cli_cs_bridgetest.cs: unexpected exception occured in XMain::run. Original exception: " + + "cli_cs_bridgetest.cs: unexpected exception occurred in XMain::run. Original exception: " + exc.GetType().Name + "\n Message: " + exc.Message , null); } } diff --git a/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb b/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb index 3a697ee94c4f..e24281e907d0 100644 --- a/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb +++ b/testtools/source/bridgetest/cli/cli_vb_bridgetest.vb @@ -846,7 +846,7 @@ Public Class BridgeTest Throw Catch e as System.Exception Throw New unoidl.com.sun.star.uno.RuntimeException( _ - "cli_vb_bridgetest.vb: unexpected exception occured in XMain::run. " _ + "cli_vb_bridgetest.vb: unexpected exception occurred in XMain::run. " _ & "Original exception: " + e.GetType().Name + "\n Message: " _ & e.Message , Nothing) |