[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Aron Budea]

 sw/source/uibase/docvw/srcedtw.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4995e2b316f4c5c5028a0df1b2e8aad7218fb976
Author: Aron Budea <aron.budea at collabora.com>
Date:   Tue Oct 31 13:15:34 2017 +0100

    tdf#113548: another case of crash in GrabFocus during dispose
    
    Change-Id: I70776b80f70985a122e28854177c6d0c43839d65
    Reviewed-on: https://gerrit.libreoffice.org/44113
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>
    (cherry picked from commit a83a0345e493b928b0b0b93bf106ddb71df69893)
    Reviewed-on: https://gerrit.libreoffice.org/44136
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index 1e7da99e0b69..3aa380234d7f 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -794,7 +794,8 @@ void SwSrcEditWindow::HandleWheelCommand( const CommandEvent& rCEvt )
 
 void SwSrcEditWindow::GetFocus()
 {
-    m_pOutWin->GrabFocus();
+    if (m_pOutWin)
+        m_pOutWin->GrabFocus();
 }
 
 static bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType aLanguages[])