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

[Michael Meeks]

 svx/source/tbxctrls/grafctrl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 943e2040a7e3dce7c49acafeff7a0e2125c355c8
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Sat May 23 22:28:08 2015 +0100

    tdf#91431 - fix post-dispose focus issue in color window.
    
    Change-Id: I7990cbddc8c664da5ec6521cf8e036ca67d5ce0e

diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 3e5e255..cb5add9 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -307,7 +307,8 @@ void ImplGrafControl::dispose()
 
 void ImplGrafControl::GetFocus()
 {
-    maField->GrabFocus();
+    if (maField)
+        maField->GrabFocus();
 }
 
 class ImplGrafModeControl : public ListBox