[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d6df2cdd2e6b6d3aae70b63aa6ed1bade3b67105
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Oct 29 00:58:08 2011 +0200

    Fix crash of text frames inside RTF tables (fdo#39856)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5607ac0..f7dcef4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1989,7 +1989,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
     if (pSprm)
     {
         m_bNeedPap = true;
-        *pSprm = TWIP_TO_MM100(nParam);
+        // Don't try to support text frames inside tables for now.
+        if (m_pCurrentBuffer != &m_aTableBuffer)
+            *pSprm = TWIP_TO_MM100(nParam);
         return 0;
     }