Commit 00ccca6c authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

x2t linux 64 build. version 2.0.2.341.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@67716 954022d7-b5bf-4e40-9824-e11837661b57
parent e465e33d
......@@ -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++)
{
......
......@@ -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
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment