summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-06-28 12:43:19 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-06-30 12:27:04 +0100
commit41c328a982bce85b83f2644b49412db4be64ce29 (patch)
tree11a48fb05c737deb7f0cdb04af8b153b0df3e688 /sw
parentcb8e0034d6bac557277c86d4819f3bea476db892 (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> (cherry picked from commit cb813b392d1f59ad8927b87e899d8a33d1db2504)
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/app/docsh.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1d275dd11cea..0b66f3127569 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;
}