diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-10-29 00:58:08 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-10-29 00:58:08 +0200 |
| commit | d6df2cdd2e6b6d3aae70b63aa6ed1bade3b67105 (patch) | |
| tree | cc353f57c38042d86c3646b31f801a6c79e1cb97 /writerfilter | |
| parent | 43d5a03d02d4c1c9756d1080b7fee418e24717a3 (diff) | |
Fix crash of text frames inside RTF tables (fdo#39856)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 5607ac0ea513..f7dcef47cef4 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; } |