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

[David Tardon]

 extensions/source/propctrlr/propertyeditor.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ac633cec1b2b7d6f2ffaa128490f2b90f977b024
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 28 10:05:58 2015 +0200

    tdf#91671 avoid use of already disposed control
    
    Change-Id: I9cf5feeb2fc0ea91c7684aaf8adc2809907fa5d7
    (cherry picked from commit a14d7e3b41e1083edcebdeb3484e3cc6666dd63c)

diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 73d8389..60f72f4 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -166,7 +166,8 @@ namespace pcr
 
     void OPropertyEditor::GetFocus()
     {
-        m_aTabControl->GrabFocus();
+        if ( m_aTabControl )
+            m_aTabControl->GrabFocus();
     }