INTEGRATION: CWS warnings01 (1.6.146); FILE MERGED

2006/04/07 19:54:30 sb 1.6.146.4: RESYNC: (1.7-1.8); FILE MERGED
2005/10/31 14:38:11 sb 1.6.146.3: #i53898# Made code warning-free.
2005/09/22 19:57:31 sb 1.6.146.2: RESYNC: (1.6-1.7); FILE MERGED
2005/09/19 15:24:00 sb 1.6.146.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 23:05:35 +00:00
parent c58acb7ccd
commit d6a669a55e

View file

@ -4,9 +4,9 @@
*
* $RCSfile: permissions.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: rt $ $Date: 2006-03-06 10:12:00 $
* last change: $Author: hr $ $Date: 2006-06-20 00:05:35 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -201,7 +201,7 @@ inline bool SocketPermission::resolveHost() const SAL_THROW( () )
SocketAddr addr;
SocketAddr::resolveHostname( m_host, addr );
OUString ip;
m_resolveErr = (::osl_Socket_E_None != ::osl_getDottedInetAddrOfSocketAddr(
m_resolveErr = (::osl_Socket_Ok != ::osl_getDottedInetAddrOfSocketAddr(
addr.getHandle(), &ip.pData ));
if (m_resolveErr)
return false;
@ -543,7 +543,6 @@ PermissionCollection::PermissionCollection(
buf.append( perm_type.getTypeName() );
throw RuntimeException(
buf.makeStringAndClear(), Reference< XInterface >() );
OSL_ASSERT( 0 );
}
}
}
@ -601,7 +600,6 @@ static void throwAccessControlException(
buf.append( perm.toString() );
throw security::AccessControlException(
buf.makeStringAndClear(), Reference< XInterface >(), demanded_perm );
OSL_ASSERT( 0 );
}
//==================================================================================================
void PermissionCollection::checkPermission( Any const & perm ) const
@ -670,7 +668,6 @@ void PermissionCollection::checkPermission( Any const & perm ) const
buf.append( demanded_type.getTypeName() );
throw RuntimeException(
buf.makeStringAndClear(), Reference< XInterface >() );
OSL_ASSERT( 0 );
}
}