[Libreoffice-commits] core.git: 3 commits - svtools/source vcl/source

[Caolán McNamara]

 svtools/source/contnr/iconviewimpl.cxx |   11 ++++-------
 svtools/source/contnr/svimpbox.cxx     |   11 ++++-------
 vcl/source/window/toolbox.cxx          |    5 +++++
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit e8826d814e4067724b53420c06a79005ad28c943
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 16 09:37:08 2016 +0000

    coverity#1355502 Dereference before null check
    
    Change-Id: I2833454ca4afd9e11a6c0c4fb1386f0dbb0d13d8

diff --git a/svtools/source/contnr/iconviewimpl.cxx b/svtools/source/contnr/iconviewimpl.cxx
index e361414..aad4e0fa 100644
--- a/svtools/source/contnr/iconviewimpl.cxx
+++ b/svtools/source/contnr/iconviewimpl.cxx
@@ -511,13 +511,10 @@ bool IconViewImpl::KeyInput( const KeyEvent& rKEvt )
             if (!pNewCursor)
                 pNewCursor = pCursor;
 
-            if( pNewCursor )
-            {
-                aSelEng.CursorPosChanging( bShift, bMod1 );
-                SetCursor( pNewCursor, bMod1 );     // no selection, when Ctrl is on
-                if( !IsEntryInView( pNewCursor ) )
-                    KeyUp( false );
-            }
+            aSelEng.CursorPosChanging( bShift, bMod1 );
+            SetCursor( pNewCursor, bMod1 );     // no selection, when Ctrl is on
+            if( !IsEntryInView( pNewCursor ) )
+                KeyUp( false );
             break;
 
         case KEY_RIGHT:
commit 338b8bec48cf31822d3de1bd7aa6e212848490be
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 16 09:34:41 2016 +0000

    coverity#1355503 Dereference before null check
    
    Change-Id: Ie5791423546c15470d0e0aaeb80f8bc9c1c99eeb

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 7ae2371..8d72e31 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2152,13 +2152,10 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             if (!pNewCursor)
                 pNewCursor = pCursor;
 
-            if( pNewCursor )
-            {
-                aSelEng.CursorPosChanging( bShift, bMod1 );
-                SetCursor( pNewCursor, bMod1 );     // no selection, when Ctrl is on
-                if( !IsEntryInView( pNewCursor ) )
-                    KeyUp( false );
-            }
+            aSelEng.CursorPosChanging( bShift, bMod1 );
+            SetCursor( pNewCursor, bMod1 );     // no selection, when Ctrl is on
+            if( !IsEntryInView( pNewCursor ) )
+                KeyUp( false );
             break;
 
         case KEY_DOWN:
commit ba21f5fc6a15dd2be10082a3c696ddf9a78918d7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 16 09:32:41 2016 +0000

    coverity#1355505 Uninitialized scalar field
    
    Change-Id: I95d76b6c06d194b762ecd0534c51314744eb42ae

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index f05dbb2..03388b3 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1370,6 +1370,7 @@ void ToolBox::ImplInitToolBoxData()
     mnCurLines        = 1;
     mnVisLines        = 1;
     mnFloatLines      = 0;
+    mnDockLines       = 0;
     mnConfigItem      = 0;
     mnMouseClicks     = 0;
     mnMouseModifier   = 0;
@@ -1384,6 +1385,7 @@ void ToolBox::ImplInitToolBoxData()
     mbFullPaint       = false;
     mbHorz            = true;
     mbScroll          = false;
+    mbLastFloatMode   = false;
     mbCustomize       = false;
     mbCustomizeMode   = false;
     mbDragging        = false;
@@ -1391,14 +1393,17 @@ void ToolBox::ImplInitToolBoxData()
     mbIsShift         = false;
     mbIsKeyEvent = false;
     mbChangingHighlight = false;
+    mbImagesMirrored  = false;
     meButtonType      = ButtonType::SYMBOLONLY;
     meAlign           = WindowAlign::Top;
+    meDockAlign       = WindowAlign::Top;
     meLastStyle       = PointerStyle::Arrow;
     mnWinStyle        = 0;
     meLayoutMode      = TBX_LAYOUT_NORMAL;
     mnLastFocusItemId = 0;
     mnKeyModifier     = 0;
     mnActivateCount   = 0;
+    mnImagesRotationAngle = 0;
     mpStatusListener  = new VclStatusListener<ToolBox>(this, ".uno:ImageOrientation");
 
     mpIdle = new Idle("toolbox update");