diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2015-06-28 12:43:19 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-30 11:25:38 +0000 |
commit | cb813b392d1f59ad8927b87e899d8a33d1db2504 (patch) | |
tree | 4b1f69c1cdf03b061c62d972ecf4c8f9740c6fcd | |
parent | 9ce8f73550e327ecffeed3f4f8697f8b1f2548ed (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/source/uibase/app/docsh.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index e060a1e9ab03..32cc3039accd 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1261,11 +1261,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; } |