diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-07 10:29:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-07 12:08:29 +0200 |
| commit | 3273d800cd50e6f80b629262198f3508fb5bbc7d (patch) | |
| tree | 8fd8d59287f9b387c89991b8bddbecf399344145 | |
| parent | 93f5d5a9190e0e03bf4822663652a4b068c44f75 (diff) | |
SwFmtCntnt::operator==: most probably bool was intended here
The code here counted the numerical XOR of the two pointer values, but
most probably the logical XOR was intended (in case only we or only they
have a node index, then we are not equal).
Change-Id: I261b8c4b498eb860fa0e0fa72ba5a5e0758064e6
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 428a90683a32..558ddbd30d73 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -560,7 +560,7 @@ void SwFmtCntnt::SetNewCntntIdx( const SwNodeIndex *pIdx ) bool SwFmtCntnt::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" ); - if( (sal_IntPtr)pStartNode ^ (sal_IntPtr)((SwFmtCntnt&)rAttr).pStartNode ) + if( (bool)pStartNode ^ (bool)((SwFmtCntnt&)rAttr).pStartNode ) return false; if( pStartNode ) return ( *pStartNode == *((SwFmtCntnt&)rAttr).GetCntntIdx() ); |