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

d6df2cdd · Miklos Vajna · 43d5a03d · d6df2cdd
Kaydet (Commit) d6df2cdd authored Eki 28, 2011 tarafından Miklos Vajna
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

rtfdocumentimpl.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx +3 -1

No files found.
--- 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;
    }