From ef513fd4b049b214a03fbe6e62a5ea43680a7a9b Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 26 May 2017 10:58:42 +0200 Subject: remove unnecessary use of OString::getStr Change-Id: I0490efedf459190521f4339854b3394d57765fdb Reviewed-on: https://gerrit.libreoffice.org/38058 Tested-by: Jenkins Reviewed-by: Noel Grandin --- slideshow/source/engine/activitiesqueue.cxx | 4 +--- .../source/engine/animationnodes/animationbasenode.cxx | 4 +--- slideshow/source/engine/eventqueue.cxx | 4 +--- slideshow/source/engine/pointersymbol.cxx | 4 +--- slideshow/source/engine/shapes/drawinglayeranimation.cxx | 4 +--- slideshow/source/engine/shapes/externalshapebase.cxx | 5 +---- slideshow/source/engine/shapes/viewappletshape.cxx | 5 +---- slideshow/source/engine/shapes/viewbackgroundshape.cxx | 5 +---- slideshow/source/engine/shapes/viewmediashape.cxx | 13 +++---------- slideshow/source/engine/slide/layermanager.cxx | 5 +---- slideshow/source/engine/slide/slideanimations.cxx | 5 +---- slideshow/source/engine/slide/slideimpl.cxx | 15 +++------------ slideshow/source/engine/slidebitmap.cxx | 5 +---- slideshow/source/engine/slideshowimpl.cxx | 7 ++----- slideshow/source/engine/soundplayer.cxx | 5 +---- slideshow/source/engine/waitsymbol.cxx | 4 +--- 16 files changed, 21 insertions(+), 73 deletions(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx index 531e421ab6f4..3f6c7d73bc33 100644 --- a/slideshow/source/engine/activitiesqueue.cxx +++ b/slideshow/source/engine/activitiesqueue.cxx @@ -122,9 +122,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } catch( SlideShowException& ) { diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx index ace0570aa98d..d7e3c0ed01c1 100644 --- a/slideshow/source/engine/animationnodes/animationbasenode.cxx +++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx @@ -207,9 +207,7 @@ bool AnimationBaseNode::init_st() mpActivity = createActivity(); } catch (uno::Exception const&) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString(cppu::getCaughtException()), - RTL_TEXTENCODING_UTF8).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException()) ); // catch and ignore. We later handle empty activities, but for // other nodes to function properly, the core functionality of // this node must remain up and running. diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 2cb928cc3436..b202f4d3a6e8 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -238,9 +238,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } catch( SlideShowException& ) { diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx index 2b50addcd71c..b539cf6a1055 100644 --- a/slideshow/source/engine/pointersymbol.cxx +++ b/slideshow/source/engine/pointersymbol.cxx @@ -125,9 +125,7 @@ void PointerSymbol::viewAdded( const UnoViewSharedPtr& rView ) } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } maViews.push_back( ViewsVecT::value_type( rView, sprite ) ); diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx index d4941f8300cf..503a0a4dc250 100644 --- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx +++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx @@ -934,9 +934,7 @@ std::shared_ptr createDrawingLayerAnimActivity( catch( uno::Exception& ) { // translate any error into empty factory product. - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } return pActivity; diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx index 40c0d99b2df0..13800cefa450 100644 --- a/slideshow/source/engine/shapes/externalshapebase.cxx +++ b/slideshow/source/engine/shapes/externalshapebase.cxx @@ -107,10 +107,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( - cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 3f13d2259633..8550ed5e2f56 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -106,10 +106,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( - cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx index ec2d611fec58..c2a3d533b18c 100644 --- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx +++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx @@ -184,10 +184,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); return false; } diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index dcc14b913560..0ff36b81f6dc 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -105,10 +105,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( - cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } @@ -341,9 +338,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } } @@ -518,9 +513,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } } diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index e3c024398f6f..702e00513516 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -624,10 +624,7 @@ namespace slideshow { // TODO(E1): Might be superfluous. Nowadays, // addViewLayer swallows all errors, anyway. - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); // at least one shape could not be rendered bRet = false; } diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 9c82dbafd87d..330d204bfcd8 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -54,10 +54,7 @@ namespace slideshow } catch (uno::Exception &) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( - cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException() ) ); } } } diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index ecd3725538ab..95582c37b718 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -776,10 +776,7 @@ bool SlideImpl::implPrefetchShow() } catch( uno::Exception& ) { - OSL_FAIL( - OUStringToOString( - comphelper::anyToString(cppu::getCaughtException()), - RTL_TEXTENCODING_UTF8).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString(cppu::getCaughtException()) ); // TODO(E2): Error handling. For now, bail out } @@ -1037,10 +1034,7 @@ bool SlideImpl::loadShapes() } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); return false; } } @@ -1079,10 +1073,7 @@ bool SlideImpl::loadShapes() } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); return false; } diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx index c13a38f15667..3dd5a329b022 100644 --- a/slideshow/source/engine/slidebitmap.cxx +++ b/slideshow/source/engine/slidebitmap.cxx @@ -84,10 +84,7 @@ namespace slideshow } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); return false; } diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 8e8023e0146f..50d6f5ab70db 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1037,8 +1037,7 @@ public: } else { - OSL_FAIL( OUStringToOString( - rProperty.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", rProperty.Name ); } } private: @@ -2088,9 +2087,7 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index a685dd18d583..24a809faf68e 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -120,10 +120,7 @@ namespace slideshow dispose(); } catch (uno::Exception &) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( - cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } } diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx index e278d609c464..918ca961e04c 100644 --- a/slideshow/source/engine/waitsymbol.cxx +++ b/slideshow/source/engine/waitsymbol.cxx @@ -129,9 +129,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView ) } catch( uno::Exception& ) { - OSL_FAIL( OUStringToOString( - comphelper::anyToString( cppu::getCaughtException() ), - RTL_TEXTENCODING_UTF8 ).getStr() ); + SAL_WARN( "slideshow", comphelper::anyToString( cppu::getCaughtException() ) ); } maViews.push_back( ViewsVecT::value_type( rView, sprite ) ); -- cgit