From f0859c4eae0f567393811c308074723329f1faab Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 6 Oct 2014 15:59:09 +0100
Subject: Resolves: fdo#84588 loop in TableInfo::getNextNode

Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f
---
 sw/source/filter/ww8/wrtww8.cxx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e64c9dd488ab..64e86d00a771 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2645,9 +2645,15 @@ void MSWordExportBase::WriteText()
         if ( &rNd == &rNd.GetNodes().GetEndOfContent() )
             break;
 
-        SwNode * pCurrentNode = &pCurPam->GetPoint()->nNode.GetNode();
+        const SwNode * pCurrentNode = &pCurPam->GetPoint()->nNode.GetNode();
         const SwNode * pNextNode = mpTableInfo->getNextNode(pCurrentNode);
 
+        if (pCurrentNode == pNextNode)
+        {
+            SAL_WARN("sw.ww8", "loop in TableInfo");
+            pNextNode = NULL;
+        }
+
         if (pNextNode != NULL)
             pCurPam->GetPoint()->nNode = SwNodeIndex(*pNextNode);
         else
-- 
cgit v1.2.3