[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b75e793621bbac52bf72e7b1032db542cce9dac8
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Dec 9 12:41:48 2015 +0000

    guard against missing RootDocument
    
    Change-Id: I1c6b58b58ab489a17419dbf7cd4ecec63359b7f3
    (cherry picked from commit 0f700d5bc9c0ebc1e1ebe60758fbbf02590790bc)
    Reviewed-on: https://gerrit.libreoffice.org/20517
    Reviewed-by: David Tardon <dtar...@redhat.com>
    Tested-by: David Tardon <dtar...@redhat.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index ba6ab58..fcbc894 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -634,8 +634,8 @@ LwpDocument* LwpDocument::GetPreviousDivision()
  LwpDocument* LwpDocument::GetLastDivisionThatHasEndnote()
 {
     LwpDocument* pRoot = GetRootDocument();
-    LwpDocument *pLastDoc = pRoot->GetLastDivisionWithContents();
-    while(pLastDoc)
+    LwpDocument *pLastDoc = pRoot ? pRoot->GetLastDivisionWithContents() : 
nullptr;
+    while (pLastDoc)
     {
         if(pLastDoc->GetEnSuperTableLayout())
             return pLastDoc;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits