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

[Caolán McNamara]

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

New commits:
commit 2a1a50b1d565270327a213f4e237b9655824a872
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 6 15:59:09 2014 +0100

    Resolves: fdo#84588 loop in TableInfo::getNextNode
    
    Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f
    (cherry picked from commit f0859c4eae0f567393811c308074723329f1faab)
    Reviewed-on: https://gerrit.libreoffice.org/11828
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 409eb82..f52a273 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2643,9 +2643,15 @@ void MSWordExportBase::WriteText()
         if ( pNd == &pNd->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