writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 42d176fd3e7c310c63d325826e6d3ffb3124c777
Author: Cédric Bosdonnat <cedric.bosdonnat....@free.fr>
Date: Wed Dec 14 15:44:07 2011 +0100
n#228839: Fix RTF import crasher with \keep in table properties
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 57d8b9b..4c8648e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1609,8 +1609,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;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
