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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c84a4af12fc83b911bf29958e83e8e2154890bfb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 10:13:51 2015 +0000

    guard against infinite recursion
    
    Change-Id: I43e195df570990f21c780311a98be64b682e5315
    (cherry picked from commit 338c6ba3a0983009cfd1faff52ac56d6ea092d6f)
    Reviewed-on: https://gerrit.libreoffice.org/20583
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index a2ff123..ba6ab58 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -540,7 +540,7 @@ LwpDocument* LwpDocument::GetPreviousDivision()
 
     LwpDocument* pDivision = GetLastDivision();
 
-    while(pDivision)
+    while (pDivision && pDivision != this)
     {
         LwpDocument* pContentDivision = pDivision->GetLastDivisionWithContents();
         if(pContentDivision)