summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 409eb82a2af4..f52a273aacb3 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