desktop/source/lib/init.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a912ec7dad25bdb099f80f18b7f8d4892747000b
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Thu Sep 22 09:11:55 2016 +0200

    desktop: guard against nullptr frame in doc_registerCallback()
    
    Change-Id: I96956d6631ed574c06df62e9b633d7e1e4d5a5f2

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a0e9d5f4..dfaf159 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1630,7 +1630,7 @@ static void doc_registerCallback(LibreOfficeKitDocument* 
pThis,
         }
     }
 
-    if (SfxViewShell* pViewShell = SfxViewFrame::Current()->GetViewShell())
+    if (SfxViewShell* pViewShell = SfxViewShell::Current())
         
pViewShell->registerLibreOfficeKitViewCallback(CallbackFlushHandler::callback, 
pDocument->mpCallbackFlushHandlers[nView].get());
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to