From 290b922ed9e0c1a4f674d656f37c97ad18258797 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 17 Jun 2016 09:13:38 +0100 Subject: 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 Reviewed-by: Michael Stahl --- extensions/source/abpilot/datasourcehandling.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 6ede832f8e25..486f89d85259 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) { -- cgit