summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-12-28 11:11:58 +0100
committerDavid Tardon <dtardon@redhat.com>2017-12-28 11:11:58 +0100
commit5409761baa20c34286620adcf23d2388ea40cc93 (patch)
tree6c28748a46431f673d7d3356c6dda56afc4a2898
parent1964f1b56f26b902a54f3b499f44a9c5dadfc808 (diff)
tdf#89393 handle multiple paragraphs in cell correctly
Change-Id: If621c41aaa624ed1a61e8e659a2326efb66a2eba
-rw-r--r--src/lib/MSPUBCollector.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index d40070d..062b7dd 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -222,13 +222,16 @@ void mapTableTextToCells(
assert(paraTexts.back().size() <= text[para].spans.size());
- if (offset > tableCellTextEnds[paraToCellMap.size()])
+ if (offset >= tableCellTextEnds[paraToCellMap.size()])
{
- MSPUB_DEBUG_MSG(("text of cell %u ends in the middle of a paragraph!\n", unsigned(paraToCellMap.size())));
- }
+ if (offset > tableCellTextEnds[paraToCellMap.size()])
+ {
+ MSPUB_DEBUG_MSG(("text of cell %u ends in the middle of a paragraph!\n", unsigned(paraToCellMap.size())));
+ }
- paraToCellMap.push_back(std::make_pair(firstPara, para));
- firstPara = para + 1;
+ paraToCellMap.push_back(std::make_pair(firstPara, para));
+ firstPara = para + 1;
+ }
}
assert(paraTexts.size() == text.size());