sw/source/uibase/app/docsh.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 41c328a982bce85b83f2644b49412db4be64ce29
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun Jun 28 12:43:19 2015 +0200
tdf#92386: Writer crashes in print preview if document in 2 windows
2 changes for the 2 following bts
First bt: see https://bugs.documentfoundation.org/attachment.cgi?id=116883
Second bt: see https://bugs.documentfoundation.org/attachment.cgi?id=116888
Change-Id: I92ed3b7305bb5b714532f2dcffd615a8337db8b6
Reviewed-on: https://gerrit.libreoffice.org/16557
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit cb813b392d1f59ad8927b87e899d8a33d1db2504)
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1d275dd..0b66f31 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1239,11 +1239,15 @@ const ::sfx2::IXmlIdRegistry*
SwDocShell::GetXmlIdRegistry() const
bool SwDocShell::IsChangeRecording() const
{
+ if (!m_pWrtShell)
+ return false;
return (m_pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0;
}
bool SwDocShell::HasChangeRecordProtection() const
{
+ if (!m_pWrtShell)
+ return false;
return
m_pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
