diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-06-17 09:13:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-17 09:17:40 +0100 |
commit | 1cf6c67f629dd21a0fbcd223ef0dcdfabd4b6a9f (patch) | |
tree | d72bf6f84212f0beebed05cca9b09364068adc43 | |
parent | edd2f7b4793b29ae1aff05e1e54c957ac0fed15d (diff) |
Resolves: tdf#96251 address wizard crash when run from start center
Change-Id: I20de1fbdd3ca609a1818dfe8f81ba66b1cb15281
(cherry picked from commit d6665da4eae15cf21eecaf048d1c9eb7381b3b99)
-rw-r--r-- | extensions/source/abpilot/datasourcehandling.cxx | 3 |
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) { |