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

[Caolán McNamara]

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

New commits:
commit 290b922ed9e0c1a4f674d656f37c97ad18258797
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 17 09:13:38 2016 +0100

    Resolves: tdf#96251 address wizard crash when run from start center
    
    Change-Id: I20de1fbdd3ca609a1818dfe8f81ba66b1cb15281
    (cherry picked from commit d6665da4eae15cf21eecaf048d1c9eb7381b3b99)
    (cherry picked from commit 1cf6c67f629dd21a0fbcd223ef0dcdfabd4b6a9f)
    Reviewed-on: https://gerrit.libreoffice.org/26408
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 6ede832..486f89d 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -366,7 +366,8 @@ namespace abp
             OSL_ENSURE( xStorable.is(),"DataSource is no XStorable!" );
             if ( xStorable.is() )
             {
-                SfxObjectShell* pObjectShell = SfxViewFrame::Current()->GetObjectShell();
+                SfxViewFrame* pFrame = SfxViewFrame::Current();
+                SfxObjectShell* pObjectShell = pFrame ? pFrame->GetObjectShell() : nullptr;
                 OUString aOwnURL = lcl_getOwnURL(pObjectShell);
                 if (aOwnURL.isEmpty() || !rSettings.bEmbedDataSource)
                 {