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

#98040# fixed exception spec

Browse Source
This commit is contained in:
Daniel Boelzle
2002-03-13 08:47:37 +00:00
parent 96aa0a28cc
commit 0c7c93ea61
2 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cppu/inc/com/sun/star/uno/Reference.hxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: Reference.hxx,v $
*
* $Revision: 1.13 $
* $Revision: 1.14 $
*
* last change: $Author: dbo $ $Date: 2001-11-09 09:14:30 $
* last change: $Author: dbo $ $Date: 2002-03-13 09:45:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -85,10 +85,21 @@ inline sal_Bool BaseReference::operator == ( XInterface * pInterface ) const SAL
{
if (_pInterface == pInterface)
return sal_True;
// only the query to XInterface must return the same pointer if they belong to same objects
Reference< XInterface > x1( _pInterface, UNO_QUERY );
Reference< XInterface > x2( pInterface, UNO_QUERY );
return (x1._pInterface == x2._pInterface);
#ifndef EXCEPTIONS_OFF
try
{
#endif
// only the query to XInterface must return the same pointer if they belong to same objects
Reference< XInterface > x1( _pInterface, UNO_QUERY );
Reference< XInterface > x2( pInterface, UNO_QUERY );
return (x1._pInterface == x2._pInterface);
#ifndef EXCEPTIONS_OFF
}
catch (RuntimeException &)
{
return sal_False;
}
#endif
}
//__________________________________________________________________________________________________
inline sal_Bool BaseReference::operator != ( XInterface * pInterface ) const SAL_THROW( () )

28
cppuhelper/source/weak.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: weak.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: dbo $ $Date: 2001-11-09 13:49:16 $
* last change: $Author: dbo $ $Date: 2002-03-13 09:47:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -387,15 +387,21 @@ OWeakRefListener::OWeakRefListener() SAL_THROW( () )
OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW( () )
: m_aRefCount( 0 )
{
try
{
m_XWeakConnectionPoint = rRef.m_XWeakConnectionPoint;
if (m_XWeakConnectionPoint.is())
m_XWeakConnectionPoint->addReference((XReference*)this);
}
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
}
OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW( () )
: m_aRefCount( 0 )
{
try
{
Reference< XWeak > xWeak( Reference< XWeak >::query( xInt ) );
if (xWeak.is())
@@ -407,13 +413,19 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO
m_XWeakConnectionPoint->addReference((XReference*)this);
}
}
}
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
}
OWeakRefListener::~OWeakRefListener() SAL_THROW( () )
{
try
{
acquire(); // dont die again
if (m_XWeakConnectionPoint.is())
m_XWeakConnectionPoint->removeReference((XReference*)this);
}
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
}
// XInterface
@@ -479,6 +491,8 @@ WeakReferenceHelper::WeakReferenceHelper(const WeakReferenceHelper& rWeakRef) SA
WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& rWeakRef) SAL_THROW( () )
{
try
{
if (this != &rWeakRef)
{
Reference< XInterface > xInt( rWeakRef.get() );
@@ -498,11 +512,15 @@ WeakReferenceHelper& WeakReferenceHelper::operator=(const WeakReferenceHelper& r
m_pImpl->acquire();
}
}
}
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
return *this;
}
WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () )
{
try
{
if (m_pImpl)
{
if (m_pImpl->m_XWeakConnectionPoint.is())
@@ -513,10 +531,14 @@ WeakReferenceHelper::~WeakReferenceHelper() SAL_THROW( () )
m_pImpl->release();
m_pImpl = 0; // for safety
}
}
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
}
Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
{
try
{
Reference< XAdapter > xAdp;
{
MutexGuard guard(cppu::getWeakMutex());
@@ -526,6 +548,8 @@ Reference< XInterface > WeakReferenceHelper::get() const SAL_THROW( () )
if (xAdp.is())
return xAdp->queryAdapted();
}
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
return Reference< XInterface >();
}