bug 29815 linux build x2t

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

ASCOfficeDocxFile2/version.h

 #pragma once
 //2
 //0
-//1
+//2
 //328
-#define INTVER 2,0,1,328
-#define STRVER "2,0,1,328\0"
+#define INTVER 2,0,2,328
+#define STRVER "2,0,2,328\0"

DesktopEditor/fontengine/fontconverter/FontFileType1.cpp

@@ -462,7 +462,7 @@ namespace NSFontConverter
 
                         if ( m_oPrivateDict.nLenIV > 0 && m_oPrivateDict.nLenIV < nLength )
                         {
-                            Type1Charstring& oCharstring = DecodeCharString( sData + m_oPrivateDict.nLenIV, nLength - m_oPrivateDict.nLenIV );
+                            Type1Charstring oCharstring = DecodeCharString( sData + m_oPrivateDict.nLenIV, nLength - m_oPrivateDict.nLenIV );
                             if ( bGlyphsSection )
                             {
                                 int nUnicode = Type1NameToUnicodeW( sGlyph.c_str() );

DesktopEditor/fontengine/fontconverter/MemoryUtils.h

@@ -5,6 +5,10 @@
 #include <limits>
 #include <string>
 
+#ifdef __linux__
+    #include <string.h>
+#endif
+
 namespace NSFontConverter
 {
     //------------------------------------------------------------------------
@@ -59,7 +63,7 @@ namespace NSFontConverter
             return NULL;
 
         int nSize = nObjectsCount * nObjectSize;
-        if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= INT_MAX / nObjectSize )
+        if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= 0x7fffffff / nObjectSize )
         {
             // TO DO: Выдать ошибку выделения памяти
         }
@@ -83,7 +87,7 @@ namespace NSFontConverter
         }
         int nSize = nObjectsCount * nObjectSize;
 
-        if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= INT_MAX / nObjectSize )
+        if ( nObjectSize <= 0 || nObjectsCount < 0 || nObjectsCount >= 0x7fffffff / nObjectSize )
         {
             // TO DO: Выдать ошибку выделения памяти
         }