x2t XlsFormat коррекция под linux

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

ASCOfficeXlsFile2/source/XlsFormat/Crypt/rtl/cipher.h

 #pragma once
 
 #include <stddef.h>
+
+#ifdef __linux__
+    #include <inttypes.h>
+#endif
+
 #include "../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 class CipherARCFOUR

ASCOfficeXlsFile2/source/XlsFormat/Crypt/rtl/digest.h

 #pragma once
 
+#ifdef __linux__
+    #include <inttypes.h>
+#endif
+
 #include "../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 class DigestMD5

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Label.cpp

@@ -33,7 +33,7 @@ void Label::readFields(CFRecord& record)
 	
 	record >> cell >> st;
 
-	isst_ = pGlobalWorkbookInfoPtr->startAddedSharedStrings + pGlobalWorkbookInfoPtr->arAddedSharedStrings.size();
+    isst_ = pGlobalWorkbookInfoPtr->startAddedSharedStrings + pGlobalWorkbookInfoPtr->arAddedSharedStrings.size() + 1;
 	pGlobalWorkbookInfoPtr->arAddedSharedStrings.push_back(st.value());
 }
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp

@@ -153,7 +153,7 @@ XlsConverter::~XlsConverter()
 	if (output_document)	delete output_document;
 }
 
-XlsConverter::isError()
+bool XlsConverter::isError()
 {
 	if (!xlsx_context)		return true;
 	if (!output_document)	return true;