x2t version up

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.cpp

@@ -33,9 +33,6 @@
 #include "CFRecord.h"
 #include "CFStream.h"
 
-#ifdef __linux__
-    #include <string.h>
-#endif
 
 namespace XLS
 {

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FileMoniker.cpp

@@ -68,7 +68,7 @@ void FileMoniker::load(XLS::CFRecord& record)
 #if defined(_WIN32) || defined(_WIN64)
         unicodePath = std::wstring(record.getCurData<wchar_t>(), cbUnicodePathBytes / 2);
 #else
-        unicodePath = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), cbUnicodePathBytes / 2);
+        unicodePath = convertUtf16ToWString(record.getCurData<UTF16>(), cbUnicodePathBytes / 2);
 #endif
 		record.skipNunBytes(cbUnicodePathBytes);
 	}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ItemMoniker.cpp

@@ -65,7 +65,7 @@ void ItemMoniker::load(XLS::CFRecord& record)
 #if defined(_WIN32) || defined(_WIN64)
         delimiterUnicode = std::wstring(record.getCurData<wchar_t>(), sizeof_delimiterUnicode / 2);
 #else
-        delimiterUnicode = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_delimiterUnicode / 2);
+        delimiterUnicode = convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_delimiterUnicode / 2);
 #endif
         record.skipNunBytes(sizeof_delimiterUnicode);
 	}
@@ -80,7 +80,7 @@ void ItemMoniker::load(XLS::CFRecord& record)
 #if defined(_WIN32) || defined(_WIN64)
         itemUnicode = std::wstring(record.getCurData<wchar_t>(), sizeof_itemUnicode / 2);
 #else
-        itemUnicode = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_itemUnicode / 2);
+        itemUnicode = convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_itemUnicode / 2);
 #endif
         record.skipNunBytes(sizeof_itemUnicode);
 	}

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

@@ -544,7 +544,7 @@ void anyString::ReadComplexData(XLS::CFRecord& record)
 #if defined(_WIN32) || defined(_WIN64)
         string_ = std::wstring(record.getCurData<wchar_t>(), op);
 #else
-        string_ = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), op);
+        string_ = convertUtf16ToWString(record.getCurData<UTF16>(), op);
 #endif
 	if (!string_.empty())
 	{

Common/3dParty/pole/pole.h

@@ -62,6 +62,10 @@ wide string into utf8 char*:
 #include <string>
 #include <list>
 
+#ifdef __linux__
+    #include <string.h>
+#endif
+
 #include "../../../Common/DocxFormat/Source/Base/unicode_util.h"
 
 static std::wstring convertUtf16ToWString(const UTF16 * Data, int nLength)

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.4.485.0
+VERSION = 2.4.486.0
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t