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

coverity#983698 Uncaught exception

Change-Id: I3f597643c1f743314ca17346901f11dc4f1f7302
üst dd9a1bae
......@@ -2587,12 +2587,33 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData()
::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() );
if (!m_pImpl)
return sal_False;
return false;
bool bRet = false;
bool bRet = m_pImpl->IsEncrypted();
try
{
bRet = m_pImpl->IsEncrypted();
if (!bRet && m_pImpl->m_bUseCommonEncryption && m_pImpl->m_pParent)
bRet = m_pImpl->m_pParent->m_bHasCommonEncryptionData;
if (!bRet && m_pImpl->m_bUseCommonEncryption && m_pImpl->m_pParent)
bRet = m_pImpl->m_pParent->m_bHasCommonEncryptionData;
}
catch( const uno::RuntimeException& rRuntimeException )
{
m_pImpl->AddLog( rRuntimeException.Message );
m_pImpl->AddLog( "Rethrow" );
throw;
}
catch( const uno::Exception& rException )
{
m_pImpl->AddLog( rException.Message );
m_pImpl->AddLog( "Rethrow" );
uno::Any aCaught( ::cppu::getCaughtException() );
throw lang::WrappedTargetRuntimeException( "Problems on hasEncryptionData!",
static_cast< ::cppu::OWeakObject* >( this ),
aCaught );
}
return bRet;
}
......
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