[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 06c62190b2c28720294a603d26878c2cb0b35b9c
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Mon Feb 6 10:58:12 2012 +0100

    n#228839 an empty table grid can't have implicit merges
    
    Signed-off-by: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 31d46bd..2331e57 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.