pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

DocFormatReader - fix bug #44864

Browse Source
This commit is contained in:
Elena.Subbotina
2020-06-19 10:03:51 +03:00
parent 302f3aa7b6
commit 9c5e79619a
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
View File

@ -1344,7 +1344,7 @@ namespace DocFileFormat
{
ParagraphPropertyExceptions* backup = _lastValidPapx;
std::map<short, short> boundaries;
std::map<short, short> mapBoundaries;
int cp = initialCp;
int fc = m_document->FindFileCharPos( cp );
@ -1406,19 +1406,26 @@ namespace DocFileFormat
boundary1 = FormatUtils::BytesToInt16( iter->Arguments + 1, i * 2 , iter->argumentsSize );
boundary2 = FormatUtils::BytesToInt16( iter->Arguments + 1, ( i + 1 ) * 2, iter->argumentsSize );
AddBoundary(boundary1, boundary2, boundaries);
//if (boundary1 < 0) boundary1 = 0;
//if (boundary2 < 0) boundary2 = 0;
mapBoundaries.insert(std::make_pair(boundary1, 0));
mapBoundaries.insert(std::make_pair(boundary2, 0));
//AddBoundary(boundary1, boundary2, mapBoundaries);
}
if (max_boundary < boundary2)
max_boundary = boundary2;
AddBoundary(boundary2, max_boundary, boundaries);
mapBoundaries.insert(std::make_pair(boundary2, 0));
mapBoundaries.insert(std::make_pair(max_boundary, 0));
//AddBoundary(boundary2, max_boundary, mapBoundaries);
}break;
default:
break;
}
}
}
if (nestingLevel != iTap_current && fEndNestingLevel && !boundaries.empty())
if (nestingLevel != iTap_current && fEndNestingLevel && !mapBoundaries.empty())
break;
//get the next papx
papx = findValidPapx( fcRowEnd );
@ -1431,11 +1438,16 @@ namespace DocFileFormat
}
if ( !boundaries.empty() )
if ( !mapBoundaries.empty() )
{
for ( std::map<short, short>::iterator it = boundaries.begin(); it != boundaries.end(); ++it)
std::map<short, short>::iterator it = mapBoundaries.begin();
std::map<short, short>::iterator it_next = it; it_next++;
for ( ; it_next != mapBoundaries.end(); ++it_next, ++it)
{
grid.push_back( it->second );
int sz = it_next->first - it->first;
if (sz > 2)
grid.push_back( it_next->first - it->first );
}
}
_lastValidPapx = backup;