[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Julien Nabet]

 sw/source/uibase/app/docsh.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit de43a2fd64085c6887c66fede95ee9cdf0e431d4
Author: Julien Nabet <serval2412 at 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
    
    Reviewed-on: https://gerrit.libreoffice.org/16557
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit cb813b392d1f59ad8927b87e899d8a33d1db2504)
    
    Change-Id: I92ed3b7305bb5b714532f2dcffd615a8337db8b6
    Reviewed-on: https://gerrit.libreoffice.org/16618
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1879e7e..eb680fa 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1270,11 +1270,17 @@ const ::sfx2::IXmlIdRegistry* SwDocShell::GetXmlIdRegistry() const
 
 bool SwDocShell::IsChangeRecording() const
 {
+    if (!mpWrtShell)
+        return false;
+
     return (mpWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0;
 }
 
 bool SwDocShell::HasChangeRecordProtection() const
 {
+    if (!mpWrtShell)
+        return false;
+
     return mpWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength() > 0;
 }