[Libreoffice-commits] .: sfx2/source vcl/source

[Julien Nabet]

 sfx2/source/appl/workwin.cxx |    2 +-
 vcl/source/gdi/sallayout.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3f15bfa050f79fd18ecb46d859c7dd79b79c230b
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Sep 16 23:59:27 2011 +0200

    Fix 2 bitwiseOnBoolean detected by cppcheck

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index f0eb712..bdd2c41 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 b2f724f..c9f969a 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);
 }
 
 // -----------------------------------------------------------------------