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

[Caolán McNamara]

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

New commits:
commit d6665da4eae15cf21eecaf048d1c9eb7381b3b99
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

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 4ed9384..a8afb62 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -365,7 +365,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)
                 {