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 64 build. version 2.0.2.341.

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67716 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2016-01-26 09:27:01 +00:00
committed by Alexander Trofimov
parent e465e33d69
commit 00ccca6cf7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
View File

@ -453,7 +453,7 @@ void anyString::ReadComplexData(XLS::CFRecord& record)
#endif
if (!string_.empty())
{
int i, length = min(op, string_.length());
int i, length = (std::min)(op, (_INT32)string_.length());
for (i = 0; i < length; i++)
{

2
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
View File

@ -9,7 +9,7 @@
#include "MSO_enums.h"
#include <Logic/Biff_structures/HyperlinkObject.h>
#include "../../../ascofficepptxfile/editor/drawing/shapes/baseshape/pptshape/enums.h"
#include "../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Enums.h"
namespace XLS
{