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

introduce lcl_putNestedAttribute

Browse source
This commit is contained in:
Miklos Vajna 2011-06-17 22:12:22 +02:00
parent 4df4955319
commit 5710898ee7
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,6 +117,21 @@ void lcl_putBorderProperty(std::stack<RTFParserState>& aStates, Id nId, RTFValue
} }
} }
// This works on any container (sprm, attribute), as long as the nested value is an attribute.
void lcl_putNestedAttribute(RTFSprms_t& rSprms, Id nParent, Id nId, RTFValue::Pointer_t pValue)
{
RTFValue::Pointer_t pParent = RTFSprm::find(rSprms, nParent);
if (!pParent.get())
{
RTFSprms_t aAttributes;
RTFValue::Pointer_t pParentValue(new RTFValue(aAttributes));
rSprms.push_back(make_pair(nParent, pParentValue));
pParent = pParentValue;
}
RTFSprms_t& rAttributes = pParent->getAttributes();
rAttributes.push_back(make_pair(nId, pValue));
}
RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& xContext, RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& xContext,
uno::Reference<io::XInputStream> const& xInputStream, uno::Reference<io::XInputStream> const& xInputStream,
uno::Reference<lang::XComponent> const& xDstDoc, uno::Reference<lang::XComponent> const& xDstDoc,
@ -1055,29 +1070,21 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
break; break;
case RTF_CHCBPAT: case RTF_CHCBPAT:
{ {
RTFSprms_t aAttributes; RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
RTFValue::Pointer_t pInnerValue(new RTFValue(getColorTable(nParam))); lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
aAttributes.push_back(make_pair(NS_ooxml::LN_CT_Shd_fill, pInnerValue));
RTFValue::Pointer_t pValue(new RTFValue(aAttributes));
m_aStates.top().aCharacterSprms.push_back(make_pair(NS_sprm::LN_CShd, pValue));
} }
break; break;
case RTF_CLCBPAT: case RTF_CLCBPAT:
{ {
RTFSprms_t aAttributes; RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
RTFValue::Pointer_t pInnerValue(new RTFValue(getColorTable(nParam))); lcl_putNestedAttribute(*m_aStates.top().aTableCellsSprms.back(),
aAttributes.push_back(make_pair(NS_ooxml::LN_CT_Shd_fill, pInnerValue)); NS_ooxml::LN_CT_TcPrBase_shd, NS_ooxml::LN_CT_Shd_fill, pValue);
RTFValue::Pointer_t pValue(new RTFValue(aAttributes));
m_aStates.top().aTableCellsSprms.back()->push_back(make_pair(NS_ooxml::LN_CT_TcPrBase_shd, pValue));
} }
break; break;
case RTF_CBPAT: case RTF_CBPAT:
{ {
RTFSprms_t aAttributes; RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
RTFValue::Pointer_t pInnerValue(new RTFValue(getColorTable(nParam))); lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_sprm::LN_PShd, NS_ooxml::LN_CT_Shd_fill, pValue);
aAttributes.push_back(make_pair(NS_ooxml::LN_CT_Shd_fill, pInnerValue));
RTFValue::Pointer_t pValue(new RTFValue(aAttributes));
m_aStates.top().aParagraphSprms.push_back(make_pair(NS_sprm::LN_PShd, pValue));
} }
break; break;
case RTF_ULC: case RTF_ULC: