strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

implement RTF_FFNAME

Browse source
This commit is contained in:
Miklos Vajna 2011-07-11 12:53:10 +02:00
parent bc49087c32
commit 0e7ac3bc01
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View file

@ -272,7 +272,9 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
m_nHeaderFooterPositions(),
m_nGroupStartPos(0),
m_aBookmarks(),
m_aAuthors()
m_aAuthors(),
m_aFormfieldSprms(),
m_aFormfieldAttributes()
{
OSL_ASSERT(xInputStream.is());
m_pInStream = utl::UcbStreamHelper::CreateStream(xInputStream, sal_True);
@ -629,6 +631,7 @@ void RTFDocumentImpl::text(OUString& rString)
case DESTINATION_BOOKMARKEND:
case DESTINATION_PICT:
case DESTINATION_SHAPEPROPERTYVALUEPICT:
case DESTINATION_FORMFIELDNAME:
m_aDestinationText.append(rString);
break;
default: bRet = false; break;
@ -930,6 +933,9 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
case RTF_FORMFIELD:
m_aStates.top().nDestinationState = DESTINATION_FORMFIELD;
break;
case RTF_FFNAME:
m_aStates.top().nDestinationState = DESTINATION_FORMFIELDNAME;
break;
case RTF_LISTTEXT:
// Should be ignored by any reader that understands Word 97 through Word 2007 numbering.
case RTF_NONESTTABLES:
@ -2149,7 +2155,8 @@ int RTFDocumentImpl::pushState()
else if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET)
m_aStates.top().nDestinationState = DESTINATION_STYLEENTRY;
else if (m_aStates.top().nDestinationState == DESTINATION_FIELDRESULT ||
m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT)
m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT ||
m_aStates.top().nDestinationState == DESTINATION_FORMFIELD)
m_aStates.top().nDestinationState = DESTINATION_NORMAL;
else if (m_aStates.top().nDestinationState == DESTINATION_REVISIONTABLE)
m_aStates.top().nDestinationState = DESTINATION_REVISIONENTRY;
@ -2352,6 +2359,22 @@ int RTFDocumentImpl::popState()
}
else if (m_aStates.top().nDestinationState == DESTINATION_SHAPETEXT)
m_pCurrentBuffer = 0; // Just disable buffering, don't empty it yet.
else if (m_aStates.top().nDestinationState == DESTINATION_FORMFIELDNAME)
{
RTFValue::Pointer_t pValue(new RTFValue(m_aDestinationText.makeStringAndClear()));
m_aFormfieldSprms.push_back(make_pair(NS_ooxml::LN_CT_FFData_name, pValue));
}
else if (m_aStates.top().nDestinationState == DESTINATION_FORMFIELD)
{
RTFValue::Pointer_t pValue(new RTFValue(m_aFormfieldAttributes, m_aFormfieldSprms));
RTFSprms_t aFFAttributes;
RTFSprms_t aFFSprms;
aFFSprms.push_back(make_pair(NS_ooxml::LN_ffdata, pValue));
writerfilter::Reference<Properties>::Pointer_t const pProperties(new RTFReferenceProperties(aFFAttributes, aFFSprms));
Mapper().props(pProperties);
aFFAttributes = RTFSprms_t();
aFFSprms = RTFSprms_t();
}
// See if we need to end a track change
RTFValue::Pointer_t pTrackchange = RTFSprm::find(m_aStates.top().aCharacterSprms, NS_ooxml::LN_trackchange);

6
writerfilter/source/rtftok/rtfdocumentimpl.hxx
View file

@ -93,7 +93,8 @@ namespace writerfilter {
DESTINATION_REVISIONTABLE,
DESTINATION_REVISIONENTRY,
DESTINATION_SHAPETEXT,
DESTINATION_FORMFIELD
DESTINATION_FORMFIELD,
DESTINATION_FORMFIELDNAME
};
enum RTFBorderState
@ -329,6 +330,9 @@ namespace writerfilter {
std::map<int, rtl::OUString> m_aAuthors;
/// Text from special destinations.
rtl::OUStringBuffer m_aDestinationText;
RTFSprms_t m_aFormfieldSprms;
RTFSprms_t m_aFormfieldAttributes;
};
} // namespace rtftok
} // namespace writerfilter