diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-06 15:59:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-06 16:19:13 +0100 |
| commit | f0859c4eae0f567393811c308074723329f1faab (patch) | |
| tree | e80dacd2b61b88709d01b8625df4471c99879046 | |
| parent | 1a725ff0b42a6a97720f4663b9c5426fd5919079 (diff) | |
Resolves: fdo#84588 loop in TableInfo::getNextNode
Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
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 |