Kaydet (Commit) 01112d2a authored tarafından Caolán McNamara's avatar Caolán McNamara

some OSL_FAIL to SAL_WARN

Change-Id: I5101e42b7a34cca9055fc805d9a392ba4f920a3d
üst 3b7054e0
......@@ -55,12 +55,9 @@ namespace slideshow
for( const auto& pActivity : maCurrentActivitiesReinsert )
pActivity->dispose();
}
catch (uno::Exception &)
catch (const uno::Exception&)
{
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
}
......
......@@ -73,12 +73,9 @@ namespace slideshow
{
maEvents.top().pEvent->dispose();
}
catch (uno::Exception &)
catch (const uno::Exception&)
{
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
maEvents.pop();
}
......
......@@ -179,12 +179,9 @@ RehearseTimingsActivity::~RehearseTimingsActivity()
{
stop();
}
catch (uno::Exception &)
catch (const uno::Exception&)
{
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
}
......
......@@ -79,12 +79,9 @@ namespace slideshow
// if not done yet: revoke subset from original
disableSubsetShape();
}
catch (uno::Exception &)
catch (const uno::Exception&)
{
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
}
......
......@@ -487,12 +487,9 @@ namespace slideshow
mrMultiplexer.removeViewHandler( mpHandler );
mpHandler->dispose();
}
catch (uno::Exception &)
catch (const uno::Exception&)
{
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
}
}
......
......@@ -110,12 +110,9 @@ ClippingAnimation::~ClippingAnimation()
{
end_();
}
catch (uno::Exception &)
catch (const uno::Exception&)
{
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
}
......@@ -354,9 +351,6 @@ AnimationActivitySharedPtr createShapeTransitionByType(
SAL_WARN("slideshow",
"createShapeTransitionByType(): Unknown type/subtype combination encountered: "
<< xTransition->getTransition() << " " << xTransition->getSubtype() );
OSL_FAIL(
"createShapeTransitionByType(): Unknown type/subtype "
"combination encountered" );
}
return pGeneratedActivity;
......
......@@ -558,11 +558,9 @@ UserEventQueue::~UserEventQueue()
// unregister all handlers
clear();
}
catch (uno::Exception &) {
OSL_FAIL( OUStringToOString(
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
catch (const uno::Exception&)
{
SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
}
}
......
......@@ -945,14 +945,11 @@ void SdrOle2Obj::CheckFileLink_Impl()
}
}
}
catch( css::uno::Exception& )
catch (const css::uno::Exception&)
{
OSL_FAIL(
OString(OString("SdrOle2Obj::CheckFileLink_Impl(), "
"exception caught: ") +
OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
SAL_WARN( "svx", "SdrOle2Obj::CheckFileLink_Impl(),"
"exception caught: "
<< comphelper::anyToString(cppu::getCaughtException() ) );
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment