x2t linux 64 build version 2.0.2.345

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

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

@@ -99,7 +99,7 @@ void BiffString::load(CFRecord& record, const size_t cch1, const bool is_wide1)
 		if (record.getGlobalWorkbookInfo()->CodePage == 1200)
 		{
 			int inp_str_size = inp_str.length();
-			wchar_t *out_str = new wchar_t[inp_str_size + 1];
+            UTF16 *out_str = new UTF16[inp_str_size + 1];
 			char* out_str_char = (char*) out_str;
 			for (int i = 0; i < inp_str_size; i++)
 			{
@@ -108,7 +108,11 @@ void BiffString::load(CFRecord& record, const size_t cch1, const bool is_wide1)
 			}
 			out_str[inp_str_size] = 0;
 
-			str_ = std::wstring(out_str, inp_str_size);
+#if defined(_WIN32) || defined(_WIN64)
+                str_ = std::wstring((wchar_t*)out_str, inp_str_size);
+#else
+                str_ = convertUtf16ToWString(out_str, inp_str_size);
+#endif
 			delete []out_str;
 		}
 		else

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

@@ -314,7 +314,7 @@ void XLUnicodeRichExtendedString::loadSymbols(CFRecord& record, const size_t cch
 			if (record.getGlobalWorkbookInfo()->CodePage == 1200)
 			{
 				int inp_str_size = inp_str.length();
-				wchar_t *out_str = new wchar_t[inp_str_size + 1];
+                UTF16 *out_str = new UTF16[inp_str_size + 1];
 				char* out_str_char = (char*) out_str;
 				for (int i = 0; i < inp_str_size; i++)
 				{
@@ -323,8 +323,12 @@ void XLUnicodeRichExtendedString::loadSymbols(CFRecord& record, const size_t cch
 				}
 				out_str[inp_str_size] = 0;
 
-				str_ = std::wstring(out_str, inp_str_size);
-				delete []out_str;
+#if defined(_WIN32) || defined(_WIN64)
+                str_ = std::wstring((wchar_t*)out_str, inp_str_size);
+#else
+                str_ = convertUtf16ToWString(out_str, inp_str_size);
+#endif
+                delete []out_str;
 			}
 			else
 			{