diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2011-09-16 23:59:27 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2011-09-16 23:59:27 +0200 |
| commit | 3f15bfa050f79fd18ecb46d859c7dd79b79c230b (patch) | |
| tree | a90aed40aa9737788ff76053133c18006ef2cb5a | |
| parent | 91a7e5adce8178ba83abc3a701dfd622dbbcc1bf (diff) | |
Fix 2 bitwiseOnBoolean detected by cppcheck
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index f0eb712824cc..bdd2c417a36e 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1070,7 +1070,7 @@ void SfxWorkWindow::ShowChilds_Impl() // the child window even in situations where no child window is // visible. sal_uInt16 nFlags = pCW->aInfo.nFlags; - bVisible = !bInvisible || ( bInvisible & (( nFlags & SFX_CHILDWIN_NEVERHIDE ) != 0 )); + bVisible = !bInvisible || (( nFlags & SFX_CHILDWIN_NEVERHIDE ) != 0 ); } if ( CHILD_VISIBLE == (pCli->nVisible & CHILD_VISIBLE) && bVisible ) diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index b2f724fa323a..c9f969af9c54 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -740,7 +740,7 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics, } } - return (bAllOk & bOneOk); + return (bAllOk && bOneOk); } // ----------------------------------------------------------------------- |