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

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp

@@ -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++)
 		{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h

@@ -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
 {