[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source

[Caolán McNamara]

 sfx2/source/doc/objserv.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 86a15daa99f57ddf5ddbdb2d67ed9d69e3bbbf37
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 12 09:34:50 2016 +0000

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index f35c470..1b14eb1 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);
                 }
             }