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

WaE: suggest explicit braces to avoid ambiguous 'else'

Browse Source
This commit is contained in:
David Tardon
2012-03-08 11:49:28 +01:00
parent 55afdcce6d
commit 1be53d0081
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
dtrans/source/win32/misc/ImplHelper.cxx
View File

@@ -385,39 +385,40 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
{ {
#endif #endif
if ( pFetcLhs != pFetcRhs ) if ( pFetcLhs != pFetcRhs )
{
if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) ||
( pFetcLhs->lindex != pFetcRhs->lindex ) ||
!CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) )
{
nMatch = FORMATETC_NO_MATCH;
}
if ( ( pFetcLhs->cfFormat != pFetcRhs->cfFormat ) || else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect )
( pFetcLhs->lindex != pFetcRhs->lindex ) || // same aspects; equal
!CompareTargetDevice( pFetcLhs->ptd, pFetcRhs->ptd ) ) ;
{ else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 )
nMatch = FORMATETC_NO_MATCH; {
} // left not subset of aspects of right; not equal
nMatch = FORMATETC_NO_MATCH;
}
else
// left subset of right
nMatch = FORMATETC_PARTIAL_MATCH;
else if ( pFetcLhs->dwAspect == pFetcRhs->dwAspect ) if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH )
// same aspects; equal {
; if ( pFetcLhs->tymed == pFetcRhs->tymed )
else if ( ( pFetcLhs->dwAspect & ~pFetcRhs->dwAspect ) != 0 ) // same medium flags; equal
{ ;
// left not subset of aspects of right; not equal else if ( ( pFetcLhs->tymed & ~pFetcRhs->tymed ) != 0 )
nMatch = FORMATETC_NO_MATCH; {
} // left not subset of medium flags of right; not equal
else nMatch = FORMATETC_NO_MATCH;
// left subset of right }
nMatch = FORMATETC_PARTIAL_MATCH; else
// left subset of right
if ( nMatch == FORMATETC_EXACT_MATCH || nMatch == FORMATETC_PARTIAL_MATCH ) nMatch = FORMATETC_PARTIAL_MATCH;
{ }
if ( pFetcLhs->tymed == pFetcRhs->tymed )
// same medium flags; equal
;
else if ( ( pFetcLhs->tymed & ~pFetcRhs->tymed ) != 0 )
{
// left not subset of medium flags of right; not equal
nMatch = FORMATETC_NO_MATCH;
}
else
// left subset of right
nMatch = FORMATETC_PARTIAL_MATCH;
} }
} }
#ifdef __MINGW32__ #ifdef __MINGW32__