summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-17 09:13:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-17 09:16:58 +0100
commitd6665da4eae15cf21eecaf048d1c9eb7381b3b99 (patch)
tree430ea0c4f0cdcb8c63bd79ebb0db1333fa6d974c /extensions
parent59c45c8e6d16cb145f3551f9ecd1a3c45ca5d4d8 (diff)
Resolves: tdf#96251 address wizard crash when run from start center
Change-Id: I20de1fbdd3ca609a1818dfe8f81ba66b1cb15281
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 4ed9384162af..a8afb6299ed3 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)
{