diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /svx/source/svdraw/svdoole2.cxx | |
| parent | rdm#2247 enable Upper Sorbian for languagepack/UI (diff) | |
| download | core-ef513fd4b049b214a03fbe6e62a5ea43680a7a9b.tar.gz core-ef513fd4b049b214a03fbe6e62a5ea43680a7a9b.zip | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdoole2.cxx')
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 58 |
1 files changed, 15 insertions, 43 deletions
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 2935d8e4b902..2206b8bb8a36 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -836,14 +836,10 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() if ( nCurState != embed::EmbedStates::LOADED ) mpImpl->mxObjRef->changeState(nCurState); } - catch( css::uno::Exception& ) + catch( css::uno::Exception const & ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::UpdateLinkURL_Impl(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::UpdateLinkURL_Impl(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } } @@ -878,12 +874,8 @@ void SdrOle2Obj::BreakFileLink_Impl() } catch( css::uno::Exception& ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::BreakFileLink_Impl(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::BreakFileLink_Impl(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } } } @@ -1003,12 +995,8 @@ void SdrOle2Obj::Connect_Impl() } catch( css::uno::Exception& ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::Connect_Impl(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::Connect_Impl(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } } @@ -1087,12 +1075,8 @@ void SdrOle2Obj::RemoveListeners_Impl() } catch( css::uno::Exception& ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::RemoveListeners_Impl(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::RemoveListeners_Impl(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } } } @@ -1169,12 +1153,8 @@ void SdrOle2Obj::Disconnect_Impl() } catch( css::uno::Exception& ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::Disconnect_Impl(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::Disconnect_Impl(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } mpImpl->mbConnected = false; @@ -1300,12 +1280,8 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) } catch( css::uno::Exception& ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::SetModel(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::SetModel(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } } @@ -1813,12 +1789,8 @@ bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, s } catch( css::uno::Exception& ) { - OSL_FAIL( - OString(OString("SdrOle2Obj::Unload=(), " - "exception caught: ") + - OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 )).getStr() ); + SAL_WARN( "svx", "SdrOle2Obj::Unload=(), exception caught: " + << comphelper::anyToString( cppu::getCaughtException() ) ); } } |