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

coverity#706541 Uncaught exception

Browse Source 
and

coverity#706537 Uncaught exception

Change-Id: I403d83bb7aa4cf82edf1b6c608f9daac31576208
This commit is contained in:
Caolán McNamara
2014-07-26 15:22:46 +01:00
parent 850be5e3d1
commit 8ec047030f
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/source/inc/InterfaceContainer.hxx
View File

@@ -119,7 +119,7 @@ public:
OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfaceContainer& _cloneSource ); OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfaceContainer& _cloneSource );
// late constructor for cloning // late constructor for cloning
void clonedFrom( const OInterfaceContainer& _cloneSource ); void clonedFrom(const OInterfaceContainer& _cloneSource) throw(css::uno::RuntimeException, std::exception);
protected: protected:
virtual ~OInterfaceContainer(); virtual ~OInterfaceContainer();

11
forms/source/misc/InterfaceContainer.cxx
View File

@@ -29,6 +29,7 @@
#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/io/WrongFormatException.hpp>
#include <com/sun/star/io/XMarkableStream.hpp> #include <com/sun/star/io/XMarkableStream.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XForm.hpp>
@@ -199,8 +200,7 @@ OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfac
impl_createEventAttacher_nothrow(); impl_createEventAttacher_nothrow();
} }
void OInterfaceContainer::clonedFrom(const OInterfaceContainer& _cloneSource) throw(RuntimeException, std::exception)
void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
{ {
try try
{ {
@@ -213,9 +213,13 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
insertByIndex( i, makeAny( xClone ) ); insertByIndex( i, makeAny( xClone ) );
} }
} }
catch (const RuntimeException&)
{
throw;
}
catch (const Exception&) catch (const Exception&)
{ {
throw WrappedTargetException( throw WrappedTargetRuntimeException(
"Could not clone the given interface hierarchy.", "Could not clone the given interface hierarchy.",
static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ), static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ),
::cppu::getCaughtException() ::cppu::getCaughtException()
@@ -223,7 +227,6 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
} }
} }
void OInterfaceContainer::impl_createEventAttacher_nothrow() void OInterfaceContainer::impl_createEventAttacher_nothrow()
{ {
try try