diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-12-16 12:11:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-12-17 14:41:39 +0000 |
| commit | 8e807647c266ea0ebf4c10ed61187690cfd65f52 (patch) | |
| tree | 2c8b76be890f9746d6dfdf447113c24a9f343acb /scripting | |
| parent | 6aaf07b58253874c4e0c85d4d2c5399b3fa2a71d (diff) | |
check SfxObjectShell::Current()
SfxObjectShell::Current() can return null, it's based on the equally
vile SfxViewFrame::Current()
Change-Id: Ia5c7783680e9d8e5d3075078f16a2c15cb6f7a47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144355
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index d05c34612c45..5aabb4654b0a 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -327,8 +327,7 @@ ScriptProtocolHandler::getScriptInvocation() if ( pFrame->GetFrameInterface() == m_xFrame ) break; } - SfxObjectShell* pDocShell = pFrame ? pFrame->GetCurrentDocument() : SfxObjectShell::Current(); - if ( pDocShell ) + if (SfxObjectShell* pDocShell = pFrame ? pFrame->GetCurrentDocument() : SfxObjectShell::Current()) { Reference< XModel > xModel( pDocShell->GetModel() ); m_xScriptInvocation.set( xModel, UNO_QUERY ); |