[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Maxim Monastirsky]

 sc/source/ui/sidebar/CellLineStyleControl.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit c22d7f440885d4370c583eba3778851194013f2f
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Aug 13 15:39:54 2015 +0300

    Another GrabFocus during dispose
    
    Change-Id: I89f8aa5e087e95c96d63695be0ec4e9b4fbe0a0c
    (cherry picked from commit 4622823a800804acf15c0f4a5adecce03ae65189)
    Reviewed-on: https://gerrit.libreoffice.org/17706
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 3098858..c250b90 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -96,14 +96,10 @@ void CellLineStyleControl::Initialize()
 
 void CellLineStyleControl::GetFocus()
 {
-    if(!mbVSfocus)
-    {
+    if (!mbVSfocus && maPushButtonMoreOptions)
         maPushButtonMoreOptions->GrabFocus();
-    }
-    else
-    {
+    else if (maCellLineStyleValueSet)
         maCellLineStyleValueSet->GrabFocus();
-    }
 }
 
 void CellLineStyleControl::SetAllNoSel()