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

x2t linux build version up

Browse Source
This commit is contained in:
ElenaSubbotina
2016-06-26 18:07:39 +03:00
parent 286f15c106
commit 9405b0680c
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp
View File

@ -89,7 +89,7 @@ namespace DocFileFormat
int cc = tdef.numberOfColumns;
this->_tGrid = tdef.rgdxaCenter;
this->_tcDef = tdef.rgTc80[min(_cellIndex, (int)tdef.rgTc80.size() - 1)]; // NOTE: fix for crash
this->_tcDef = tdef.rgTc80[(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1)]; // NOTE: fix for crash
appendValueElement( this->_tcPr, _T( "textDirection" ), FormatUtils::MapValueToWideString( this->_tcDef.textFlow, &Global::TextFlowMap[0][0], 6, 6 ).c_str(), false );
@ -114,8 +114,8 @@ namespace DocFileFormat
appendValueElement( _tcPr, _T( "noWrap" ), _T( "" ), true );
}
nComputedCellWidth = (short)( tdef.rgdxaCenter[(size_t)min(_cellIndex, (int)tdef.rgTc80.size() - 1) + 1] -
tdef.rgdxaCenter[min(_cellIndex, (int)tdef.rgTc80.size() - 1)] ); // NOTE: fix for crash
nComputedCellWidth = (short)( tdef.rgdxaCenter[(size_t)(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1) + 1] -
tdef.rgdxaCenter[(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1)] ); // NOTE: fix for crash
//borders
if (!IsTableBordersDefined(tapx->grpprl))
@ -413,4 +413,4 @@ namespace DocFileFormat
return false;
}
}
}