1 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index e5726901abdd..d4061aa1aee7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3558,6 +3558,12 @@ void DomainMapper::lcl_endShape( )
 {
     if (m_pImpl->GetTopContext())
     {
+        // End the current table, if there are any. Otherwise the unavoidable
+        // empty paragraph at the end of the shape text will cause problems: if
+        // the shape text ends with a table, the extra paragraph will be
+        // handled as an additional row of the ending table.
+        m_pImpl->getTableManager().endTable();
+
         lcl_endParagraphGroup();
         m_pImpl->PopShapeContext( );
     }