strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

coverity#707355 Uncaught exception, help coverity out here

Browse source 
hopefully loads of other ones too

Change-Id: I8445602adc76205448926efe23c9770cef0eb5dc
This commit is contained in:
Caolán McNamara 2014-04-03 20:58:07 +01:00
parent 675194c83d
commit 9e8d4c439f
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ucbhelper/source/client/content.cxx
View file

@ -255,11 +255,9 @@ static Reference< XContentIdentifier > getContentIdentifierNoThrow(
return rBroker->createContentIdentifier(rURL);
}
static Reference< XContent > getContent(
static Reference< XContent > getContentThrow(
const Reference< XUniversalContentBroker > & rBroker,
const Reference< XContentIdentifier > & xId,
bool bThrow )
const Reference< XContentIdentifier > & xId)
throw ( ContentCreationException, RuntimeException )
{
Reference< XContent > xContent;
@ -274,10 +272,7 @@ static Reference< XContent > getContent(
// handled below.
}
if ( xContent.is() )
return xContent;
if ( bThrow )
if ( !xContent.is() )
{
ensureContentProviderForURL( rBroker, xId->getContentIdentifier() );
@ -287,7 +282,25 @@ static Reference< XContent > getContent(
ContentCreationError_CONTENT_CREATION_FAILED );
}
return Reference< XContent >();
return xContent;
}
static Reference< XContent > getContentNoThrow(
const Reference< XUniversalContentBroker > & rBroker,
const Reference< XContentIdentifier > & xId)
throw ( RuntimeException )
{
Reference< XContent > xContent;
try
{
xContent = rBroker->queryContent( xId );
}
catch ( IllegalIdentifierException const & e )
{
}
return xContent;
}
@ -315,7 +328,7 @@ Content::Content( const OUString& rURL,
Reference< XContentIdentifier > xId
= getContentIdentifierThrow(pBroker, rURL);
Reference< XContent > xContent = getContent( pBroker, xId, true );
Reference< XContent > xContent = getContentThrow(pBroker, xId);
m_xImpl = new Content_Impl( rCtx, xContent, rEnv );
}
@ -350,7 +363,7 @@ bool Content::create( const OUString& rURL,
if ( !xId.is() )
return false;
Reference< XContent > xContent = getContent( pBroker, xId, false );
Reference< XContent > xContent = getContentNoThrow(pBroker, xId);
if ( !xContent.is() )
return false;