summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-12 09:34:50 +0000
committerMichael Stahl <mstahl@redhat.com>2016-01-18 15:35:17 +0000
commit86a15daa99f57ddf5ddbdb2d67ed9d69e3bbbf37 (patch)
tree3523c44c3c03af6fdfca33f55ff1a35296cbe6db /sfx2
parent2eaa3440cd34d6a3cdbb67a43457b14f5dba28ea (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>
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 f35c470dbaed..1b14eb1e6e39 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);
}
}