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

INTEGRATION: CWS ooo20040329 (1.12.8); FILE MERGED

Browse Source 
2004/03/17 11:50:32 waratah 1.12.8.1: #i1858# alter the order of some definitions to fix some -Wall warnings
break up some if statements into two statements instead of assinging in if
This commit is contained in:
Sander Vesik
2004-04-21 13:07:47 +00:00
parent c1426ed779
commit f690e86642
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cppuhelper/source/interfacecontainer.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: interfacecontainer.cxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: hr $ $Date: 2004-02-04 11:55:23 $
* last change: $Author: svesik $ $Date: 2004-04-21 14:07:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -215,10 +215,10 @@ void OInterfaceIteratorHelper::remove() SAL_THROW( () )
OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THROW( () )
: rMutex( rMutex_ )
: pData( 0 )
, rMutex( rMutex_ )
, bInUse( sal_False )
, bIsList( sal_False )
, pData( 0 )
{
}
@@ -442,7 +442,8 @@ Sequence< Type > OMultiTypeInterfaceContainerHelper::getContainedTypes() const
t_type2ptr::size_type nSize;
::osl::MutexGuard aGuard( rMutex );
if( nSize = pMap->size() )
nSize = pMap->size();
if( nSize )
{
::com::sun::star::uno::Sequence< Type > aInterfaceTypes( nSize );
Type * pArray = aInterfaceTypes.getArray();
@@ -518,7 +519,8 @@ void OMultiTypeInterfaceContainerHelper::disposeAndClear( const EventObject & rE
{
::osl::MutexGuard aGuard( rMutex );
t_type2ptr * pMap = (t_type2ptr *)m_pMap;
if( nSize = pMap->size() )
nSize = pMap->size();
if( nSize )
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];
@@ -598,7 +600,8 @@ Sequence< sal_Int32 > OMultiTypeInterfaceContainerHelperInt32::getContainedTypes
t_long2ptr::size_type nSize;
::osl::MutexGuard aGuard( rMutex );
if( nSize = pMap->size() )
nSize = pMap->size();
if( nSize )
{
::com::sun::star::uno::Sequence< sal_Int32 > aInterfaceTypes( nSize );
sal_Int32 * pArray = aInterfaceTypes.getArray();
@@ -674,7 +677,8 @@ void OMultiTypeInterfaceContainerHelperInt32::disposeAndClear( const EventObject
{
::osl::MutexGuard aGuard( rMutex );
t_long2ptr * pMap = (t_long2ptr *)m_pMap;
if( nSize = pMap->size() )
nSize = pMap->size();
if( nSize )
{
typedef OInterfaceContainerHelper* ppp;
ppListenerContainers = new ppp[nSize];