summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-12 09:34:50 +0000
committerAndras Timar <andras.timar@collabora.com>2016-01-18 22:53:35 +0100
commit953b6a44580808b532da8082720bde9ca0c97557 (patch)
treec0e0a8c9ed904e2838ae1bf53a9ef24734bf685b /sfx2
parent636f40196a0d34872c1e00737866818b259043c4 (diff)
fix a crash found in passing
save a spreadsheet with an embedded formula in it to xlsx and alt tab away before the save has completed Change-Id: I9df996d4cb459a2aa688d06a7d53465518bebf5c (cherry picked from commit 50c2d561981d99abad9978811655365ff9884c87) (cherry picked from commit 12bc593da98be68961a9ea7d31619a7718fd1d4b) Reviewed-on: https://gerrit.libreoffice.org/21578 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 86a15daa99f57ddf5ddbdb2d67ed9d69e3bbbf37)
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objserv.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index bc1a668f5f12..9cb9b6dd0978 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -732,7 +732,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
rReq.GetArg(SID_SAVETO, false, TYPE(SfxBoolItem)));
if (saveTo == nullptr || !saveTo->GetValue())
{
- GetFrame()->RemoveInfoBar("readonly");
+ SfxViewFrame *pFrame = GetFrame();
+ if (pFrame)
+ pFrame->RemoveInfoBar("readonly");
SetReadOnlyUI(false);
}
}