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

lcl_putNested*: support overwrite

Browse source
This commit is contained in:
Miklos Vajna 2011-06-27 11:32:36 +02:00
parent 0e856ae2c5
commit 8c1951cf6b
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,8 @@ Id lcl_getBorderTable(sal_uInt32 nIndex)
return aBorderIds[nIndex];
}
void lcl_putNestedAttribute(RTFSprms_t& rSprms, Id nParent, Id nId, RTFValue::Pointer_t pValue, bool bAttribute = true)
void lcl_putNestedAttribute(RTFSprms_t& rSprms, Id nParent, Id nId, RTFValue::Pointer_t pValue,
bool bOverwrite = false, bool bAttribute = true)
{
RTFValue::Pointer_t pParent = RTFSprm::find(rSprms, nParent);
if (!pParent.get())
@ -88,12 +89,19 @@ void lcl_putNestedAttribute(RTFSprms_t& rSprms, Id nParent, Id nId, RTFValue::Po
pParent = pParentValue;
}
RTFSprms_t& rAttributes = (bAttribute ? pParent->getAttributes() : pParent->getSprms());
if (bOverwrite)
for (RTFSprms_t::iterator i = rAttributes.begin(); i != rAttributes.end(); ++i)
if (i->first == nId)
{
i->second = pValue;
return;
}
rAttributes.push_back(make_pair(nId, pValue));
}
void lcl_putNestedSprm(RTFSprms_t& rSprms, Id nParent, Id nId, RTFValue::Pointer_t pValue)
void lcl_putNestedSprm(RTFSprms_t& rSprms, Id nParent, Id nId, RTFValue::Pointer_t pValue, bool bOverwrite = false)
{
lcl_putNestedAttribute(rSprms, nParent, nId, pValue, false);
lcl_putNestedAttribute(rSprms, nParent, nId, pValue, bOverwrite, false);
}
RTFSprms_t& lcl_getCellBordersAttributes(std::stack<RTFParserState>& aStates)