pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-11 02:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Elena.Subbotina
2023-07-25 11:00:14 +03:00
parent 93dc58c49e
commit cb01a629bc
11 changed files with 65 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MsBinaryFile/DocFile/CharacterPropertiesMapping.cpp
View File

@ -586,9 +586,10 @@ namespace DocFileFormat
/*========================================================================================================*/
std::list<CharacterPropertyExceptions*> CharacterPropertiesMapping::buildHierarchy( const StyleSheet* styleSheet, unsigned short istdStart )
std::vector<CharacterPropertyExceptions*> CharacterPropertiesMapping::buildHierarchy( const StyleSheet* styleSheet, unsigned short istdStart )
{
std::list<CharacterPropertyExceptions*> hierarchy;
std::vector<CharacterPropertyExceptions*> hierarchy;
unsigned int istd = (unsigned int)istdStart;
bool goOn = true;
@ -637,15 +638,13 @@ namespace DocFileFormat
{
bool ret = false;
std::list<CharacterPropertyExceptions*>::const_iterator end = _hierarchy.end();
for (std::list<CharacterPropertyExceptions*>::const_iterator iter = _hierarchy.begin(); iter != end; ++iter)
for (auto& iter : _hierarchy)
{
std::vector<SinglePropertyModifier>::const_iterator end_grpprl = (*iter)->grpprl->end();
for (std::vector<SinglePropertyModifier>::const_iterator grpprlIter = (*iter)->grpprl->begin(); grpprlIter != end_grpprl; ++grpprlIter)
for (auto& grpprlIter : *(iter->grpprl))
{
if (grpprlIter->OpCode == sprm.OpCode)
if (grpprlIter.OpCode == sprm.OpCode)
{
unsigned char ancient = grpprlIter->Arguments[0];
unsigned char ancient = grpprlIter.Arguments[0];
ret = toogleValue(ret, ancient);
break;
}