[Libreoffice-commits] core.git: sfx2/source

Tor Lillqvist tml at iki.fi
Mon Sep 2 06:22:58 PDT 2013


 sfx2/source/dialog/dinfdlg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 953d46610369171785fd2c148d2baf4641b51bb2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Sep 2 15:27:23 2013 +0300

    WaE: use of logical '&&' with constant operand
    
    A warning that reveals what surely must be coding glitches. Thanks,
    Clang.
    
    Change-Id: Ieb1e09b91a4ab63c2ab15bb4874ac82b57c174cf

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4c46eab..48aad69 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2474,7 +2474,7 @@ CmisPropertiesControl::CmisPropertiesControl(SfxTabPage* pParent)
     , m_rVertScroll( m_rScrolledWindow.getVertScrollBar())
 {
     m_rVertScroll.EnableDrag();
-    m_rVertScroll.Show( m_rScrolledWindow.GetStyle() && WB_VSCROLL);
+    m_rVertScroll.Show( m_rScrolledWindow.GetStyle() & WB_VSCROLL);
     m_rVertScroll.SetRangeMin(0);
     m_rVertScroll.SetVisibleSize( 0xFFFF );
 
@@ -2498,9 +2498,9 @@ IMPL_LINK( CmisPropertiesControl, ScrollHdl, ScrollBar*, pScrollBar )
 void CmisPropertiesControl::checkAutoVScroll()
 {
     WinBits nBits = m_rScrolledWindow.GetStyle();
-    if (nBits && WB_VSCROLL)
+    if (nBits & WB_VSCROLL)
         return;
-    if (nBits && WB_AUTOVSCROLL)
+    if (nBits & WB_AUTOVSCROLL)
     {
         sal_Bool bShow = m_rVertScroll.GetRangeMax() > m_rVertScroll.GetVisibleSize();
         if (bShow != m_rVertScroll.IsVisible())


More information about the Libreoffice-commits mailing list