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

[Caolán McNamara]

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

New commits:
commit 12bc593da98be68961a9ea7d31619a7718fd1d4b
Author: Caolán McNamara <caol...@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)

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index d27db01..1d22bce 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -723,7 +723,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
                 const SfxBoolItem* saveTo = 
rReq.GetArg<SfxBoolItem>(SID_SAVETO);
                 if (saveTo == nullptr || !saveTo->GetValue())
                 {
-                    GetFrame()->RemoveInfoBar("readonly");
+                    SfxViewFrame *pFrame = GetFrame();
+                    if (pFrame)
+                        pFrame->RemoveInfoBar("readonly");
                     SetReadOnlyUI(false);
                 }
             }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits