cximage договорились собирать без юникода

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59341 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/cximage/CxImage/ximaiter.h

@@ -31,6 +31,8 @@
 
 #include "ximage.h"
 #include "ximadef.h"
+
+#include <algorithm>
 /*
 #ifndef min
 #define min(a,b) (((a)<(b))?(a):(b))

DesktopEditor/cximage/CxImage/xiofile.h

@@ -2,18 +2,6 @@
 #define __xiofile_h
 
 #include "xfile.h"
-#ifndef _WIN32
-#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
-#endif
-//#include <TCHAR.h>
-
-#ifndef WIN32
-    #ifdef _UNICODE
-        typedef wchar_t TCHAR;
-    #else
-        typedef char TCHAR;
-    #endif
-#endif
 
 class DLL_EXP CxIOFile : public CxFile
 	{