From c4f757318163a391c6831e78c8324b68912c960c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 11 Jul 2011 13:42:43 +0200 Subject: [PATCH] ignore formfield outside fldinst --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 96caeb219efb..72e5bab01989 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -932,7 +932,8 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) m_pCurrentBuffer = &m_aShapetextBuffer; break; case RTF_FORMFIELD: - m_aStates.top().nDestinationState = DESTINATION_FORMFIELD; + if (m_aStates.top().nDestinationState == DESTINATION_FIELDINSTRUCTION) + m_aStates.top().nDestinationState = DESTINATION_FORMFIELD; break; case RTF_FFNAME: m_aStates.top().nDestinationState = DESTINATION_FORMFIELDNAME;