diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-04-16 13:52:02 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-04-16 14:37:27 +0000 |
| commit | 54c704ae2577ae2452d46c8e29f3e4c45f20f794 (patch) | |
| tree | 68348155b4269001172551ba8f21f72a0113f392 /bridges | |
| parent | a4e27ec2be678fe126e49a5c8a9be4adc5cd6159 (diff) | |
rhbz#867808 Do not throw RuntimeException by pointer
(cherry picked from commit e46564a0a6a74da90785a1b910d33e2b5bfdcfd9, plus
63b4633cf7b0da9eba63e752cec72cb10ed9d93e "Related: rhbz#867808 if one person
threw by pointer..." and 336353a87e6003e685aab87ea74a158546e1f297 "Related
rhbz#867808: More apparently bogus 'throw new ...' in C++ code")
Conflicts:
bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
sdext/source/presenter/PresenterController.cxx
stoc/source/registry_tdprovider/functiondescription.cxx
stoc/source/registry_tdprovider/methoddescription.cxx
toolkit/source/awt/vclxwindow1.cxx
Change-Id: I22b7d3d642e7ee0488d6b726a331d328065bbee7
Reviewed-on: https://gerrit.libreoffice.org/3418
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx | 4 | ||||
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index df0991c245ac..b7a5ff377272 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -74,7 +74,7 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) css::uno::Reference< css::lang::XMultiComponentFactory > factory( context->getServiceManager()); if (!factory.is()) { - throw new css::uno::RuntimeException( + throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )), static_cast< cppu::OWeakObject * >(this)); } @@ -94,7 +94,7 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) } relay->start(this); if (!data.setData(reinterpret_cast< void * >(12345))) { - throw new css::uno::RuntimeException( + throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl::ThreadData::setData failed" )), static_cast< cppu::OWeakObject * >(this)); } diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 607a05414c2e..3952ce9ee0e3 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -63,7 +63,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { css::uno::Reference< css::lang::XMultiComponentFactory > factory( context->getServiceManager()); if (!factory.is()) { - throw new css::uno::RuntimeException( + throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no component context service manager" )), static_cast< cppu::OWeakObject * >(this)); } |