summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2012-02-06 10:58:12 +0100
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2012-02-07 12:02:38 +0100
commit06c62190b2c28720294a603d26878c2cb0b35b9c (patch)
tree78e40e235fea7d625ce97b73e5b527ead39474b9
parentde998662158e3654ac14469989d27ce963cce935 (diff)
n#228839 an empty table grid can't have implicit merges
Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 31d46bd5b4a0..2331e570f83b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -477,7 +477,7 @@ void DomainMapperTableManager::endOfRowAction()
#endif
insertRowProps(pPropMap);
}
- else if (m_bImplicitMerges)
+ else if (m_bImplicitMerges && pTableGrid->size())
{
// More grid than cells definitions? Then take the last ones.
// This feature is used by the RTF implicit horizontal cell merges.