mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some OSL_FAIL to SAL_WARN

Browse Source 
Change-Id: I5101e42b7a34cca9055fc805d9a392ba4f920a3d
This commit is contained in:
Caolán McNamara
2017-03-09 20:57:31 +00:00
parent 3b7054e0bb
commit 01112d2a63
8 changed files with 19 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slideshow/source/engine/activitiesqueue.cxx
View File

@@ -55,12 +55,9 @@ namespace slideshow
for( const auto& pActivity : maCurrentActivitiesReinsert ) for( const auto& pActivity : maCurrentActivitiesReinsert )
pActivity->dispose(); pActivity->dispose();
} }
catch (uno::Exception &) catch (const uno::Exception&)
{ {
OSL_FAIL( OUStringToOString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }

7
slideshow/source/engine/eventqueue.cxx
View File

@@ -73,12 +73,9 @@ namespace slideshow
{ {
maEvents.top().pEvent->dispose(); maEvents.top().pEvent->dispose();
} }
catch (uno::Exception &) catch (const uno::Exception&)
{ {
OSL_FAIL( OUStringToOString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
maEvents.pop(); maEvents.pop();
} }

7
slideshow/source/engine/rehearsetimingsactivity.cxx
View File

@@ -179,12 +179,9 @@ RehearseTimingsActivity::~RehearseTimingsActivity()
{ {
stop(); stop();
} }
catch (uno::Exception &) catch (const uno::Exception&)
{ {
OSL_FAIL( OUStringToOString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }

7
slideshow/source/engine/shapesubset.cxx
View File

@@ -79,12 +79,9 @@ namespace slideshow
// if not done yet: revoke subset from original // if not done yet: revoke subset from original
disableSubsetShape(); disableSubsetShape();
} }
catch (uno::Exception &) catch (const uno::Exception&)
{ {
OSL_FAIL( OUStringToOString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }

7
slideshow/source/engine/slide/userpaintoverlay.cxx
View File

@@ -487,12 +487,9 @@ namespace slideshow
mrMultiplexer.removeViewHandler( mpHandler ); mrMultiplexer.removeViewHandler( mpHandler );
mpHandler->dispose(); mpHandler->dispose();
} }
catch (uno::Exception &) catch (const uno::Exception&)
{ {
OSL_FAIL( OUStringToOString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }
} }

10
slideshow/source/engine/transitions/shapetransitionfactory.cxx
View File

@@ -110,12 +110,9 @@ ClippingAnimation::~ClippingAnimation()
{ {
end_(); end_();
} }
catch (uno::Exception &) catch (const uno::Exception&)
{ {
OSL_FAIL( OUStringToOString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
comphelper::anyToString(
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }
@@ -354,9 +351,6 @@ AnimationActivitySharedPtr createShapeTransitionByType(
SAL_WARN("slideshow", SAL_WARN("slideshow",
"createShapeTransitionByType(): Unknown type/subtype combination encountered: " "createShapeTransitionByType(): Unknown type/subtype combination encountered: "
<< xTransition->getTransition() << " " << xTransition->getSubtype() ); << xTransition->getTransition() << " " << xTransition->getSubtype() );
OSL_FAIL(
"createShapeTransitionByType(): Unknown type/subtype "
"combination encountered" );
} }
return pGeneratedActivity; return pGeneratedActivity;

8
slideshow/source/engine/usereventqueue.cxx
View File

@@ -558,11 +558,9 @@ UserEventQueue::~UserEventQueue()
// unregister all handlers // unregister all handlers
clear(); clear();
} }
catch (uno::Exception &) { catch (const uno::Exception&)
OSL_FAIL( OUStringToOString( {
comphelper::anyToString( SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 ).getStr() );
} }
} }

11
svx/source/svdraw/svdoole2.cxx
View File

@@ -945,14 +945,11 @@ void SdrOle2Obj::CheckFileLink_Impl()
} }
} }
} }
catch( css::uno::Exception& ) catch (const css::uno::Exception&)
{ {
OSL_FAIL( SAL_WARN( "svx", "SdrOle2Obj::CheckFileLink_Impl(),"
OString(OString("SdrOle2Obj::CheckFileLink_Impl(), " "exception caught: "
"exception caught: ") + << comphelper::anyToString(cppu::getCaughtException() ) );
OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
} }
} }
} }