[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Aug 24 07:41:05 UTC 2018
sfx2/source/doc/objserv.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2169b1f16356dbebc662b6f60fd176ca2d6c4e52
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 23 15:57:47 2018 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Aug 24 09:40:40 2018 +0200
tdf#117426 don't crash is infobar is disposed in preview view
Change-Id: Iff2dece2ea5f65c5d0896af888e05703ae709c65
Reviewed-on: https://gerrit.libreoffice.org/59520
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 1f14aa27b889..4ae9d094385e 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1046,7 +1046,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
if ( !sMessage.isEmpty() )
{
auto pInfoBar = pFrame->AppendInfoBar("signature", sMessage, aInfoBarType);
- if (pInfoBar == nullptr)
+ if (pInfoBar == nullptr || pInfoBar->IsDisposed())
return;
VclPtrInstance<PushButton> xBtn(&(pFrame->GetWindow()));
xBtn->SetText(SfxResId(STR_SIGNATURE_SHOW));
More information about the Libreoffice-commits
mailing list