x2t linux64 build - XlsFile

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

ASCOfficeDocFile/Linux/DocFileConverter.cpp

@@ -3,7 +3,7 @@
 #include "../Win32/ASCOfficeCriticalSection.h"
 
 #include <iostream>
-#include "../Win32/version.h"
+#include "../version.h"
 
 static std::wstring utf8_to_unicode(const char *src)
 {

ASCOfficeXlsFile2/source/XlsFormat/Auxiliary/HelpFunc.cpp

@@ -188,13 +188,16 @@ const std::string int2str(const int val, const int radix)
 
 const std::wstring int2wstr(const int val, const int radix)
 {
-    static wchar_t num_buf[10]={};
 #if defined(_WIN64) || defined(_WIN64)
+    static wchar_t num_buf[10]={};
     _itow_s(val, num_buf, 9, radix);
+    return std::wstring(num_buf);
 #else
-    wprintf( num_buf, "%d", val);
+    static char num_buf[10]={};
+    sprintf( num_buf, "%d", val);
+    std::string a_str(num_buf);
+    return std::wstring(a_str.begin(), a_str.end());
 #endif
-	return num_buf;
 }
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp

@@ -532,21 +532,25 @@ void xlsx_drawing_context::set_crop_top	(int val)
 {
 	if (drawing_state.size() < 1 )return;
 	drawing_state.back().image_crop[1] = val * 1.5;
+    drawing_state.back().image_crop_enabled = true;
 }
 void xlsx_drawing_context::set_crop_bottom(int val)
 {
 	if (drawing_state.size() < 1 )return;
 	drawing_state.back().image_crop[3] = val* 1.5;
+    drawing_state.back().image_crop_enabled = true;
 }
 void xlsx_drawing_context::set_crop_left (int val)
 {
 	if (drawing_state.size() < 1 )return;
 	drawing_state.back().image_crop[0]= val* 1.5;
+    drawing_state.back().image_crop_enabled = true;
 }
 void xlsx_drawing_context::set_crop_right (int val)
 {
 	if (drawing_state.size() < 1 )return;
 	drawing_state.back().image_crop[2] = val* 1.5;
+    drawing_state.back().image_crop_enabled = true;
 }
 void xlsx_drawing_context::set_rotation (int val)
 {