diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-12-14 15:44:07 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-12-14 15:45:31 +0100 |
| commit | 31622ae00925ea07642151e7c97b30929d9a90a4 (patch) | |
| tree | 4f6b99c08cbc2825e0b17bfd1ebc814b7e887fc5 /writerfilter | |
| parent | . is not a valid TARFILE_ROOTDIR (diff) | |
| download | core-31622ae00925ea07642151e7c97b30929d9a90a4.tar.gz core-31622ae00925ea07642151e7c97b30929d9a90a4.zip | |
n#228839: Fix RTF import crasher with \keep in table properties
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2b6aa61afbfb..3f1deb698dcb 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1604,8 +1604,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) // Trivial paragraph flags switch (nKeyword) { - case RTF_KEEP: nParam = NS_sprm::LN_PFKeep; break; - case RTF_KEEPN: nParam = NS_sprm::LN_PFKeepFollow; break; + case RTF_KEEP: if (m_pCurrentBuffer != &m_aTableBuffer) nParam = NS_sprm::LN_PFKeep; break; + case RTF_KEEPN: if (m_pCurrentBuffer != &m_aTableBuffer) nParam = NS_sprm::LN_PFKeepFollow; break; case RTF_INTBL: m_pCurrentBuffer = &m_aTableBuffer; nParam = NS_sprm::LN_PFInTable; break; case RTF_PAGEBB: nParam = NS_sprm::LN_PFPageBreakBefore; break; default: break; |