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

DocFormatReader - fix after testing

Browse Source
This commit is contained in:
ElenaSubbotina
2018-08-28 15:13:41 +03:00
parent c94e1e3223
commit a74c927e7e
22 changed files with 328 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp
View File

@ -345,22 +345,23 @@ namespace DocFileFormat
_tcPr->AppendChild( tcW );
//if ( ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
//{
// //check the number of merged cells
// int w = _grid->at( _gridIndex );
if ( _gridSpan == 1 && ( _gridIndex < (int)_grid->size() ) && ( nComputedCellWidth > _grid->at( _gridIndex ) ) )
{
//check the number of merged cells
int w = _grid->at( _gridIndex );
// for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
// {
// _gridSpan++;
for ( size_t i = _gridIndex + 1; i < _grid->size(); i++ )
{
_gridSpan++;
// w += _grid->at( i );
w += _grid->at( i );
// if ( w >= nComputedCellWidth )
// {
// break;
// }
// }
if ( w >= nComputedCellWidth )
{
break;
}
}
}
if (_gridSpan > 1)
{
appendValueElement( _tcPr, L"gridSpan", FormatUtils::IntToWideString( _gridSpan ), true );