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

[Maxim Monastirsky]

 svx/source/sidebar/line/LineWidthControl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a223ad5ac390881b54eeed7b39ea181962b1274
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Aug 13 14:55:34 2015 +0300

    tdf#93407 GrabFocus during dispose
    
    Reproduced with the gen vclplug
    
    Change-Id: Ia8a5c73908f5af47ef55b4431b6e1e5a21609e7d
    (cherry picked from commit b556f14fab25ddccbe9a54fe53450a641dbc5a49)
    Reviewed-on: https://gerrit.libreoffice.org/17705
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx
index 2ee411c..37bac4a 100644
--- a/svx/source/sidebar/line/LineWidthControl.cxx
+++ b/svx/source/sidebar/line/LineWidthControl.cxx
@@ -184,9 +184,9 @@ void LineWidthControl::Initialize()
 
 void LineWidthControl::GetFocus()
 {
-    if(!mbVSFocus)
+    if (!mbVSFocus && maMFWidth)
         maMFWidth->GrabFocus();
-    else
+    else if (maVSWidth)
         maVSWidth->GrabFocus();
 }