[ios][x2t] fixed build

This reverts commit 05694d13f3.

ASCOfficeDocFile/DocDocxConverter/Converter.cpp

@@ -61,7 +61,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	long Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
+	_UINT32 Converter::Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress)
 	{
 		if (!doc || !docx) return S_FALSE;
 		
@@ -202,20 +202,18 @@ namespace DocFileFormat
 		return S_OK;
 	}
 
-	long Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
+	_UINT32 Converter::LoadAndConvert(const std::wstring& strSrcFile, const std::wstring& strDstDirectory, const std::wstring& password, const ProgressCallback* progress, bool &bMacros)
 	{
-        long result = S_FALSE;
-
 		WordDocument			doc(progress, m_sTempFolder);
 		WordprocessingDocument	docx(strDstDirectory, &doc);
 		
-		result = doc.LoadDocument(strSrcFile, password);
+		_UINT32 result = doc.LoadDocument(strSrcFile, password);
 
-        if (result == S_OK)
+        if (result == 0)
 		{
 			result = Convert(&doc, &docx, progress);
 
-            if (result == S_OK)
+            if (result == 0)
 			{
 				docx.SaveDocument(bMacros);
 

ASCOfficeDocFile/DocDocxConverter/Converter.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include <string>
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 struct ProgressCallback;
 
@@ -48,9 +49,9 @@ namespace DocFileFormat
 
 		std::wstring m_sTempFolder;
 
-		long LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
+		_UINT32 LoadAndConvert(const std::wstring & strSrcFile, const std::wstring &  strDstDirectory, const std::wstring & password, const ProgressCallback* progress, bool &bMacros);
 	
 	private:
-		long Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
+		_UINT32 Convert(WordDocument* doc, WordprocessingDocument* docx, const ProgressCallback* progress);	
 	};
 }

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -117,7 +117,7 @@ namespace DocFileFormat
 
 namespace DocFileFormat
 {
-	int WordDocument::LoadDocument(const std::wstring & fileName, const std::wstring & password)
+	_UINT32 WordDocument::LoadDocument(const std::wstring & fileName, const std::wstring & password)
 	{
 		m_sFileName = fileName;
 		m_sPassword = password;

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -94,7 +94,7 @@ namespace DocFileFormat
 		WordDocument (const ProgressCallback* pCallFunc, const std::wstring & tempFolder );
 		virtual ~WordDocument();
 
-		int LoadDocument(const std::wstring & fileName, const std::wstring & password);
+		_UINT32 LoadDocument(const std::wstring & fileName, const std::wstring & password);
 
 		int		nWordVersion;
 		int		nDocumentCodePage;

ASCOfficeDocFile/DocFormatLib/DocFormatLib.cpp

@@ -34,9 +34,9 @@
 #include "../DocDocxConverter/Converter.h"
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
-HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
+_UINT32 COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::wstring & docxDirectory, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack)
 {
-	HRESULT hr = S_FALSE;
+	_UINT32 hr = 0;
 
 	DocFileFormat::Converter docToDocx;
 	docToDocx.m_sTempFolder = m_sTempFolder;
@@ -46,7 +46,7 @@ HRESULT COfficeDocFile::LoadFromFile(const std::wstring &  docFile, const std::w
 	return hr;
 }
 
-HRESULT COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
+_UINT32 COfficeDocFile::SaveToFile (const std::wstring &  sDstFileName, const std::wstring &   sSrcFileName, ProgressCallback *ffCallBack )
 {
-    return S_OK;
+    return 0;
 }

ASCOfficeDocFile/DocFormatLib/DocFormatLib.h

@@ -53,8 +53,8 @@ public:
 
 	std::wstring m_sTempFolder;
 
-    HRESULT LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack = NULL);
-    HRESULT SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName, ProgressCallback *ffCallBack = NULL);
+    _UINT32 LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstFileName, const std::wstring & password, bool &bMacros, ProgressCallback *ffCallBack = NULL);
+    _UINT32 SaveToFile(const std::wstring &  sDstFileName, const std::wstring &  sSrcFileName, ProgressCallback *ffCallBack = NULL);
 
 };
 

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -85,7 +85,7 @@ namespace BinXlsxRW{
 		sMediaPath = pathMediaDir.GetPath();
 		sEmbedPath = pathEmbedDir.GetPath();
 	}
-    int CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
+    _UINT32 CXlsxSerializer::loadFromFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedDir)
 	{
         std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
 
@@ -100,7 +100,7 @@ namespace BinXlsxRW{
 		BinXlsxRW::BinaryFileReader oBinaryFileReader;		
 		return oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oDrawingConverter, sXMLOptions);
 	}
-    int CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
+    _UINT32 CXlsxSerializer::saveToFile(const std::wstring& sDstFileName, const std::wstring& sSrcPath, const std::wstring& sXMLOptions)
 	{
 		COfficeFontPicker* pFontPicker = new COfficeFontPicker();
 		pFontPicker->Init(m_sFontDir);
@@ -136,7 +136,7 @@ namespace BinXlsxRW{
 		oOfficeDrawingConverter.SetFontPicker(pFontPicker);
 
 		BinXlsxRW::BinaryFileWriter oBinaryFileWriter(fp);
-		int result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
+		_UINT32 result = oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
 
 		RELEASEOBJECT(pFontPicker);
 		return result;

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -33,6 +33,7 @@
 #define XLSX_SERIALIZER
 
 #include <string>
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 namespace OOX
 {
@@ -62,8 +63,8 @@ namespace BinXlsxRW {
 		
         static void CreateXlsxFolders  (const std::wstring& sXmlOptions, const std::wstring& sDstPath, std::wstring& sMediaPath, std::wstring& sEmbedPath);
 
-        int loadFromFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
-        int saveToFile			(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
+        _UINT32 loadFromFile	(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sMediaDir, const std::wstring& sEmbedPath);
+        _UINT32 saveToFile		(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
 		
         bool saveChart          (NSBinPptxRW::CBinaryFileReader* pReader, long lLength, const std::wstring& sFilename, const long& lChartNumber);
 		

ASCOfficeOdfFile/src/ConvertOO2OOX.cpp

@@ -43,7 +43,7 @@
 
 #include "../include/odf/odf_document.h"
 
-int ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+_UINT32 ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::xlsx_document outputXlsx;
 	cpdoccore::oox::xlsx_conversion_context conversionContext( &inputOdf);
@@ -56,7 +56,7 @@ int ConvertOds2Xlsx(cpdoccore::odf_reader::odf_document & inputOdf, const std::w
 	outputXlsx.write(dstPath);
     return 0;
 }
-int ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+_UINT32 ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::docx_document	outputDocx;
     cpdoccore::oox::docx_conversion_context conversionContext(&inputOdf);
@@ -70,7 +70,7 @@ int ConvertOdt2Docx(cpdoccore::odf_reader::odf_document & inputOdf, const std::w
 		
     return 0;
 }
-int ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
+_UINT32 ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::wstring & dstPath, const std::wstring & fontsPath)
 {
     cpdoccore::oox::package::pptx_document	outputPptx;
     cpdoccore::oox::pptx_conversion_context conversionContext(&inputOdf);
@@ -83,9 +83,9 @@ int ConvertOdp2Pptx(cpdoccore::odf_reader::odf_document & inputOdf, const std::w
 
     return 0;
 }
-int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
+_UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack)
 {
-	int nResult = 0;
+	_UINT32 nResult = 0;
 
 	try 
     {
@@ -134,9 +134,9 @@ int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath,
 
 }
 
-int ConvertOTF2ODF(const std::wstring & srcPath)
+_UINT32 ConvertOTF2ODF(const std::wstring & srcPath)
 {
-	int nResult = 0;
+	_UINT32 nResult = 0;
 	
 	std::wstring manifest_xml	= srcPath + FILE_SEPARATOR_STR + L"META-INF" + FILE_SEPARATOR_STR + L"manifest.xml";
 	std::wstring mimetype_xml	= srcPath + FILE_SEPARATOR_STR + L"mimetype";

ASCOfficeOdfFile/src/ConvertOO2OOX.h

@@ -31,10 +31,11 @@
  */
 
 #include "../../DesktopEditor/common/Types.h"
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 #include <string>
 
 struct ProgressCallback;
 
-int ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
+_UINT32 ConvertODF2OOXml(const std::wstring & srcPath, const std::wstring & dstPath, const std::wstring & fontsPath, const std::wstring & tempPath, const std::wstring & password, const ProgressCallback* CallBack);
 
-int ConvertOTF2ODF(const std::wstring & otfPath);
+_UINT32 ConvertOTF2ODF(const std::wstring & otfPath);

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp

@@ -52,7 +52,7 @@ COfficePPTFile::~COfficePPTFile()
     CloseFile();
 }
 
-long COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstring & password, bool &bMacros)
+_UINT32 COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstring & password, bool &bMacros)
 {
 	CloseFile();
 	
@@ -103,14 +103,14 @@ bool COfficePPTFile::CloseFile()
 	return S_OK;
 }
 
-HRESULT COfficePPTFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring password, bool &bMacros)
+_UINT32 COfficePPTFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring password, bool &bMacros)
 {
     if (m_strTempDirectory.empty())
     {
         m_strTempDirectory = NSDirectory::GetTempPath();
     }
 
-    long nResult = OpenFile(sSrcFileName, password, bMacros);
+    _UINT32 nResult = OpenFile(sSrcFileName, password, bMacros);
 	if (nResult != S_OK)
     {
 		CloseFile();

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h

@@ -66,9 +66,9 @@ public:
 		return m_strTempDirectory;
 	}
 
-    HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring password, bool &bMacros);
+    _UINT32 LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring password, bool &bMacros);
    
-	long OpenFile(const std::wstring & fileName, const std::wstring & password, bool &bMacros);
+	_UINT32 OpenFile(const std::wstring & fileName, const std::wstring & password, bool &bMacros);
     bool CloseFile();
 private:
 

ASCOfficePPTXFile/ASCOfficePPTXFile.h

@@ -74,9 +74,9 @@ public:
 
 	~CPPTXFile();
 
-	HRESULT LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring sXMLOptions);
+	_UINT32 LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring sXMLOptions);
 
-	HRESULT SaveToFile(std::wstring sDstFileName, std::wstring sSrcPath, std::wstring sXMLOptions);
+	_UINT32 SaveToFile(std::wstring sDstFileName, std::wstring sSrcPath, std::wstring sXMLOptions);
 
     HRESULT get_TempDirectory(std::wstring* pVal);
     HRESULT put_TempDirectory(std::wstring newVal);
@@ -96,8 +96,9 @@ public:
     HRESULT SetThemesDir		(std::wstring bsDir);
     HRESULT SetUseSystemFonts	(bool useSystemFonts);
     void SetIsNoBase64			(bool bIsNoBase64);
-    HRESULT OpenFileToPPTY		(std::wstring bsInput, std::wstring bsOutput);
-    HRESULT OpenDirectoryToPPTY	(std::wstring bsInput, std::wstring bsOutput);
-    HRESULT ConvertPPTYToPPTX	(std::wstring bsInput, std::wstring bsOutput, std::wstring bsThemesFolder);
+    
+	_UINT32 OpenFileToPPTY		(std::wstring bsInput, std::wstring bsOutput);
+    _UINT32 OpenDirectoryToPPTY	(std::wstring bsInput, std::wstring bsOutput);
+    _UINT32 ConvertPPTYToPPTX	(std::wstring bsInput, std::wstring bsOutput, std::wstring bsThemesFolder);
 };
 #endif //ASC_OFFICE_PPTX_FILE

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

@@ -47,6 +47,7 @@
 #include "Editor/PPTXWriter.h"
 
 #include "PPTXFormat/PPTXEvent.h"
+#include "../Common/OfficeFileErrorDescription.h"
 
 CPPTXFile::CPPTXFile(extract_to_directory fCallbackExtract, compress_from_directory fCallbackCompress, progress_operation fCallbackProgress, void* pCallbackArg)
 {
@@ -82,20 +83,20 @@ CPPTXFile::~CPPTXFile()
 {
 	RELEASEOBJECT(m_pPptxDocument);
 }
-HRESULT CPPTXFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring sXMLOptions)
+_UINT32 CPPTXFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath, std::wstring sXMLOptions)
 {
 	std::wstring localTempDir(sDstPath);
     if(!localTempDir.empty())
 	{
         bool res = NSDirectory::CreateDirectory(localTempDir);
-        if (res == false) return S_FALSE;
+        if (res == false) return AVS_FILEUTILS_ERROR_CONVERT;
 
 		put_TempDirectory(sDstPath);
 	}
 	else
 	{
         bool res = NSDirectory::CreateDirectory(m_strTempDir);
-        if (res == false) return S_FALSE;
+        if (res == false) return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 	localTempDir = m_strTempDir;
 
@@ -103,7 +104,7 @@ HRESULT CPPTXFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath
 	if (m_pCallbackArg)
 	{
 		if(!m_fCallbackExtract(m_pCallbackArg, srcFileName , localTempDir))
-			return S_FALSE;
+			return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 	else
 	{
@@ -116,19 +117,19 @@ HRESULT CPPTXFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath
 	if(!m_pPptxDocument->isValid(localTempDir))
 	{
 		RELEASEOBJECT(m_pPptxDocument);
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 	m_pPptxDocument->read(localTempDir, (PPTX::IPPTXEvent*)this);
 	if(GetPercent() < 1000000)
 	{
 		RELEASEOBJECT(m_pPptxDocument);
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 	smart_ptr<PPTX::Presentation> presentation = m_pPptxDocument->Get(OOX::Presentation::FileTypes::Presentation).smart_dynamic_cast<PPTX::Presentation>();
 	if (!presentation.is_init())
 	{
         NSDirectory::DeleteDirectory(m_strTempDir, false);
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 
     m_strDirectory = sSrcFileName;
@@ -136,12 +137,12 @@ HRESULT CPPTXFile::LoadFromFile(std::wstring sSrcFileName, std::wstring sDstPath
 	if (-1 != nIndex)
 		m_strDirectory = m_strDirectory.substr(0, nIndex);
 
-	return S_OK;
+	return 0;
 }
-HRESULT CPPTXFile::SaveToFile(std::wstring sDstFileName, std::wstring sSrcPath, std::wstring sXMLOptions)
+_UINT32 CPPTXFile::SaveToFile(std::wstring sDstFileName, std::wstring sSrcPath, std::wstring sXMLOptions)
 {
 	if (NULL == m_pPptxDocument)
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 
 	OOX::CPath oPath;
 	oPath.m_strFilename = std::wstring(sSrcPath);
@@ -149,7 +150,7 @@ HRESULT CPPTXFile::SaveToFile(std::wstring sDstFileName, std::wstring sSrcPath,
 
     std::wstring srcFilePath = sSrcPath;
     std::wstring dstFileName = sDstFileName;
-	return m_fCallbackCompress ? (m_fCallbackCompress(m_pCallbackArg, srcFilePath, dstFileName) ? S_OK : S_FALSE) : S_OK;
+	return m_fCallbackCompress ? (m_fCallbackCompress(m_pCallbackArg, srcFilePath, dstFileName) ? 0 : AVS_FILEUTILS_ERROR_CONVERT) : 0;
 }
 HRESULT CPPTXFile::get_TempDirectory(std::wstring* pVal)
 {
@@ -237,7 +238,7 @@ void CPPTXFile::SetIsNoBase64(bool bIsNoBase64)
 {
 	m_bIsNoBase64 = bIsNoBase64;
 }
-HRESULT CPPTXFile::OpenFileToPPTY(std::wstring bsInput, std::wstring bsOutput)
+_UINT32 CPPTXFile::OpenFileToPPTY(std::wstring bsInput, std::wstring bsOutput)
 {
     if (m_strTempDir.empty())
 	{
@@ -268,14 +269,14 @@ HRESULT CPPTXFile::OpenFileToPPTY(std::wstring bsInput, std::wstring bsOutput)
 	}
 	std::wstring bsLocalInputTemp= pathLocalInputTemp.GetPath();
 
-	HRESULT hr = OpenDirectoryToPPTY(bsLocalInputTemp, bsOutput);
+	_UINT32 hr = OpenDirectoryToPPTY(bsLocalInputTemp, bsOutput);
 
 	if (notDeleteInput == false)
         NSDirectory::DeleteDirectory(pathLocalInputTemp.GetPath());
 	
 	return hr;
 }
-HRESULT CPPTXFile::OpenDirectoryToPPTY(std::wstring bsInput, std::wstring bsOutput)
+_UINT32 CPPTXFile::OpenDirectoryToPPTY(std::wstring bsInput, std::wstring bsOutput)
 {
 	OOX::CPath pathInputDirectory = bsInput;
 
@@ -285,20 +286,20 @@ HRESULT CPPTXFile::OpenDirectoryToPPTY(std::wstring bsInput, std::wstring bsOutp
 	if (!m_pPptxDocument->isValid(pathInputDirectory.GetPath())) // true ???
 	{
 		RELEASEOBJECT(m_pPptxDocument);
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 
 	m_pPptxDocument->read(pathInputDirectory.GetPath() + FILE_SEPARATOR_STR, (PPTX::IPPTXEvent*)this);
 	if(GetPercent() < 1000000)
 	{
 		RELEASEOBJECT(m_pPptxDocument);
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 	smart_ptr<PPTX::Presentation> presentation = m_pPptxDocument->Get(OOX::Presentation::FileTypes::Presentation).smart_dynamic_cast<PPTX::Presentation>();
 	if (!presentation.is_init())
 	{
         NSDirectory::DeleteDirectory(m_strTempDir, false);
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 
 	m_strDirectory = pathInputDirectory.GetDirectory();
@@ -335,7 +336,7 @@ HRESULT CPPTXFile::OpenDirectoryToPPTY(std::wstring bsInput, std::wstring bsOutp
 	return S_OK;
 }
 
-HRESULT CPPTXFile::ConvertPPTYToPPTX(std::wstring bsInput, std::wstring bsOutput, std::wstring bsThemesFolder)//bsOutput и файл и директория может быть 
+_UINT32 CPPTXFile::ConvertPPTYToPPTX(std::wstring bsInput, std::wstring bsOutput, std::wstring bsThemesFolder)//bsOutput и файл и директория может быть 
 {
 	OOX::CPath pathLocalTempDirectory;
 	
@@ -368,14 +369,15 @@ HRESULT CPPTXFile::ConvertPPTYToPPTX(std::wstring bsInput, std::wstring bsOutput
 	oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, bsThemesFolder);
 	
 	RELEASEARRAYOBJECTS(pSrcBuffer);
-	HRESULT hRes = S_OK;
+	
+	_UINT32 hRes = 0;
 
 	if (m_fCallbackCompress)
 	{
         std::wstring strOutput = bsOutput;
         std::wstring strInput = pathLocalTempDirectory.GetPath();
 
-        hRes = m_fCallbackCompress(m_pCallbackArg, strInput, strOutput) ? S_OK : S_FALSE;
+        hRes = m_fCallbackCompress(m_pCallbackArg, strInput, strOutput) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
 
         NSDirectory::DeleteDirectory(strInput);
 	}

ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.cpp

@@ -39,6 +39,8 @@
 #include "Writer/OOXWriter.h"
 #include "Reader/OOXReader.h"
 
+#include "../../../Common/OfficeFileErrorDescription.h"
+
 const double g_cdMaxReadRtfPercent = 0.70;
 const double g_cdMaxWriteRtfPercent = 0.30;
 const double g_cdMaxReadOoxPercent = 0.70;
@@ -50,7 +52,7 @@ const double g_cdMaxWriteOoxPercent = 0.30;
     #pragma comment(lib, "Gdi32.lib")
 #endif
 
-HRESULT RtfConvertationManager::ConvertRtfToOOX( std::wstring sSrcFileName, std::wstring sDstPath )
+_UINT32 RtfConvertationManager::ConvertRtfToOOX( std::wstring sSrcFileName, std::wstring sDstPath )
 {
     m_bParseFirstItem = true;
 
@@ -91,11 +93,11 @@ HRESULT RtfConvertationManager::ConvertRtfToOOX( std::wstring sSrcFileName, std:
     NSDirectory::DeleteDirectory(oWriter.m_sTempFolder);
 
     if( true == succes )
-        return S_OK;
+        return 0;
     else
-        return S_FALSE;
+        return AVS_FILEUTILS_ERROR_CONVERT;
 }
-HRESULT RtfConvertationManager::ConvertOOXToRtf( std::wstring sDstFileName, std::wstring sSrcPath )
+_UINT32 RtfConvertationManager::ConvertOOXToRtf( std::wstring sDstFileName, std::wstring sSrcPath )
 {
     m_bParseFirstItem = true;
 
@@ -127,8 +129,8 @@ HRESULT RtfConvertationManager::ConvertOOXToRtf( std::wstring sDstFileName, std:
     NSDirectory::DeleteDirectory(oReader.m_sTempFolder);
     NSDirectory::DeleteDirectory(oWriter.m_sTempFolder);
 
-    if( true == succes) return S_OK;
-    return S_FALSE;
+    if( true == succes) return 0;
+    return AVS_FILEUTILS_ERROR_CONVERT;
 }
 void RtfConvertationManager::OnCompleteItemRtf()
 {

ASCOfficeRtfFile/RtfFormatLib/source/ConvertationManager.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include <string>
+#include "../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 class OOXWriter;
 class OOXReader;
@@ -54,9 +55,9 @@ public:
         m_poRtfReader = NULL;
     }
 
-    long ConvertRtfToOOX( std::wstring sSrcFileName, std::wstring sDstPath);
+    _UINT32 ConvertRtfToOOX( std::wstring sSrcFileName, std::wstring sDstPath);
 
-    long ConvertOOXToRtf( std::wstring sDstFileName, std::wstring sSrcPath);
+    _UINT32 ConvertOOXToRtf( std::wstring sDstFileName, std::wstring sSrcPath);
 
     void OnCompleteItemRtf();
     void OnCompleteItemOOX();

ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.cpp

@@ -43,7 +43,7 @@
 #include "../../../Common/DocxFormat/Source/DocxFormat/App.h"
 #include "../../../Common/DocxFormat/Source/DocxFormat/Core.h"
 #include "../../../DesktopEditor/common/SystemUtils.h"
-
+#include "../../../Common/OfficeFileErrorDescription.h"
 namespace NSBinPptxRW
 {
 	class  CDrawingConverter;
@@ -106,10 +106,10 @@ static int ParseTxtOptions(const std::wstring & sXmlOptions)
 }
 
 
-HRESULT CTxtXmlFile::txt_LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstPath, const std::wstring & sXMLOptions)
+_UINT32 CTxtXmlFile::txt_LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstPath, const std::wstring & sXMLOptions)
 {
     Writers::FileWriter *pDocxWriter =  new Writers::FileWriter(sDstPath, L"", true, 1, false, NULL, L"");
-	if (pDocxWriter == NULL) return S_FALSE;
+	if (pDocxWriter == NULL) return AVS_FILEUTILS_ERROR_CONVERT;
 
     CreateDocxEmpty(sDstPath, pDocxWriter);
 
@@ -127,7 +127,7 @@ HRESULT CTxtXmlFile::txt_LoadFromFile(const std::wstring & sSrcFileName, const s
 	}
 	catch(...)
 	{
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 
 	pDocxWriter->m_oDocumentWriter.Write(); //overwrite document.xml
@@ -135,11 +135,11 @@ HRESULT CTxtXmlFile::txt_LoadFromFile(const std::wstring & sSrcFileName, const s
 	delete pDocxWriter;
 	pDocxWriter = NULL;
 
-	return S_OK;
+	return 0;
 }
 
 
-HRESULT CTxtXmlFile::txt_SaveToFile(const std::wstring & sDstFileName, const std::wstring & sSrcPath, const std::wstring & sXMLOptions)
+_UINT32 CTxtXmlFile::txt_SaveToFile(const std::wstring & sDstFileName, const std::wstring & sSrcPath, const std::wstring & sXMLOptions)
 {
 	try
 	{
@@ -170,10 +170,10 @@ HRESULT CTxtXmlFile::txt_SaveToFile(const std::wstring & sDstFileName, const std
 	}
 	catch(...)
 	{
-		return S_FALSE;
+		return AVS_FILEUTILS_ERROR_CONVERT;
 	}
 
-  return S_OK;
+  return 0;
 }
 
 

ASCOfficeTxtFile/TxtXmlFormatLib/Source/TxtXmlFile.h

@@ -51,8 +51,8 @@ class CTxtXmlFile : public TxtXml::ITxtXmlEvent
 public:
 	virtual bool Progress(long ID, long Percent);
 
-    HRESULT txt_LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstPath, const std::wstring & sXMLOptions);
-    HRESULT txt_SaveToFile	(const std::wstring & sDstFileName, const std::wstring & sSrcPath, const std::wstring & sXMLOptions);
+    _UINT32 txt_LoadFromFile(const std::wstring & sSrcFileName, const std::wstring & sDstPath, const std::wstring & sXMLOptions);
+    _UINT32 txt_SaveToFile	(const std::wstring & sDstFileName, const std::wstring & sSrcPath, const std::wstring & sXMLOptions);
 
 	CTxtXmlFile();
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertXls2Xlsx.cpp

@@ -36,7 +36,7 @@
 #include "../../../Common/OfficeFileErrorDescription.h"
 
 
-long ConvertXls2Xlsx(const std::wstring & srcFile, const std::wstring & dstPath, const std::wstring & password, const std::wstring & fontsPath, const std::wstring & tempPath, const ProgressCallback* pCallBack, bool &bMacros)
+_UINT32 ConvertXls2Xlsx(const std::wstring & srcFile, const std::wstring & dstPath, const std::wstring & password, const std::wstring & fontsPath, const std::wstring & tempPath, const ProgressCallback* pCallBack, bool &bMacros)
 {
 	XlsConverter converter(srcFile, dstPath, password, fontsPath, tempPath, pCallBack, bMacros);
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertXls2Xlsx.h

@@ -30,7 +30,8 @@
  *
  */
 #include <string>
+#include "../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 struct ProgressCallback;
 
-long ConvertXls2Xlsx(const std::wstring & srcFile, const std::wstring & dstPath, const std::wstring & password, const std::wstring& fontsPath, const std::wstring & tempPath, const ProgressCallback* CallBack, bool & bMacros);
+_UINT32 ConvertXls2Xlsx(const std::wstring & srcFile, const std::wstring & dstPath, const std::wstring & password, const std::wstring& fontsPath, const std::wstring & tempPath, const ProgressCallback* CallBack, bool & bMacros);

Common/OfficeFileFormatChecker2.cpp

@@ -34,9 +34,9 @@
 #include "../DesktopEditor/common/File.h"
 #include "../OfficeUtils/src/OfficeUtils.h"
 
-#if defined FILE_FORMAT_CHECKER_WITH_MACRO
-	#include "../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
-#endif
+//#if defined FILE_FORMAT_CHECKER_WITH_MACRO
+//	#include "../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
+//#endif
 
 #include "3dParty/pole/pole.h"
 #include <algorithm>
@@ -362,17 +362,17 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & _fileName)
         }
         else if ( isPptFormatFile(&storage) )
         {
-#if defined FILE_FORMAT_CHECKER_WITH_MACRO
-			COfficePPTFile pptFile;
-			
-			bMacroEnabled = true;
-			long nResult = pptFile.OpenFile(fileName, L"", bMacroEnabled);
-			if (nResult != S_OK)
-			{
-				return false;
-			}         
-			pptFile.CloseFile();
-#endif
+//#if defined FILE_FORMAT_CHECKER_WITH_MACRO
+//			COfficePPTFile pptFile;
+//			
+//			bMacroEnabled = true;
+//			long nResult = pptFile.OpenFile(fileName, L"", bMacroEnabled);
+//			if (nResult != S_OK)
+//			{
+//				return false;
+//			}         
+//			pptFile.CloseFile();
+//#endif
 			nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT;
             return true;
         }

DesktopEditor/fontengine/FontFile.cpp

@@ -35,6 +35,10 @@
 #include "../common/Types.h"
 #include "../common/File.h"
 
+#ifdef GetCharWidth
+#undef GetCharWidth
+#endif
+
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))
 #endif

X2tConverter/build/Mac/X2tConverter/X2tConverter/version.h

@@ -1,6 +1,6 @@
 #ifndef X2T_VERSION_H
 #define X2T_VERSION_H
 
-#define X2T_VERSION "2.4.545.0"
+#define X2T_VERSION "2.4.547.0"
 
 #endif

X2tConverter/src/ASCConverters.h

@@ -40,6 +40,7 @@
 #endif
 
 #include <string>
+#include "../../Common/DocxFormat/Source/Base/Types_32.h"
 
 namespace NExtractTools
 {
@@ -48,160 +49,160 @@ class InputParamsMailMerge;
 }
 namespace NExtractTools
 {
-    int docx2doct_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int docx_dir2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int docx2doct			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doct_bin2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-    int doct_bin2docx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-	int doct2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 docx2doct_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 docx_dir2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 docx2doct			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doct_bin2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 doct_bin2docx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+	_UINT32 doct2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
 
-    int dotm2docm			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int dotm2docm_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-	int dotx2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int dotx2docx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int docm2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int docm2docx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int dotm2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int dotm2docx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 dotm2docm			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 dotm2docm_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+	_UINT32 dotx2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 dotx2docx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 docm2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 docm2docx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 dotm2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 dotm2docx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
 
-	int xlsx2xlst_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-	int xlsx_dir2xlst_bin	(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params, bool bXmlOptions, const std::wstring &sXlsxFile);
-    int xlsx2xlst			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-	int xlst_bin2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-    int xlst_bin2xlsx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-	int xlst2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+	_UINT32 xlsx2xlst_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+	_UINT32 xlsx_dir2xlst_bin	(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params, bool bXmlOptions, const std::wstring &sXlsxFile);
+    _UINT32 xlsx2xlst			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+	_UINT32 xlst_bin2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 xlst_bin2xlsx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+	_UINT32 xlst2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
    
-	int xltx2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xltx2xlsx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int xltm2xlsm			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xltm2xlsm_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-	int xlsm2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xlsm2xlsx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-	int xltm2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xltm2xlsx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+	_UINT32 xltx2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xltx2xlsx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 xltm2xlsm			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xltm2xlsm_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+	_UINT32 xlsm2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xlsm2xlsx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+	_UINT32 xltm2xlsx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xltm2xlsx_dir		(const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
 
-    int pptx2pptt_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int pptx_dir2pptt_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int pptx2pptt			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-	int pptt_bin2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-    int pptt_bin2pptx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-	int pptt2pptx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 pptx2pptt_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 pptx_dir2pptt_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 pptx2pptt			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+	_UINT32 pptt_bin2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 pptt_bin2pptx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+	_UINT32 pptt2pptx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
 
-    int csv2xlst		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int csv2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int csv2xlst_bin    (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int xlst2csv		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xlsx2csv		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xlst_bin2csv    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 csv2xlst		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 csv2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 csv2xlst_bin    (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 xlst2csv		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xlsx2csv		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xlst_bin2csv    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
 
-    int bin2pdf			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 bin2pdf			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params);
 
-    int ppsx2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppsx2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int potx2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int potx2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-	int ppsm2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppsm2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int potm2pptm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int potm2pptm_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-	int ppsm2pptm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppsm2pptm_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int pptm2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int pptm2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
-    int potm2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int potm2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 ppsx2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppsx2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 potx2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 potx2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+	_UINT32 ppsm2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppsm2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 potm2pptm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 potm2pptm_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+	_UINT32 ppsm2pptm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppsm2pptm_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 pptm2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 pptm2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
+    _UINT32 potm2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 potm2pptx_dir   (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params);
 
-    int ppt2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppt2pptx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppt2pptt_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppt2pptt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppt2pptm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int ppt2pptm_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppt2pptx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppt2pptx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppt2pptt_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppt2pptt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppt2pptm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 ppt2pptm_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
 
-    int rtf2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int rtf2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int rtf2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int rtf2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int docx2rtf		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int docx_dir2rtf    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doct2rtf        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
-    int doct_bin2rtf    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 rtf2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 rtf2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 rtf2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 rtf2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 docx2rtf		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 docx_dir2rtf    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doct2rtf        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 doct_bin2rtf    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
 
-    int doc2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doc2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doc2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doc2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int docx_dir2doc    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doc2docm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int doc2docm_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doc2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doc2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doc2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doc2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 docx_dir2doc    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doc2docm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 doc2docm_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
 
-    int xls2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xls2xlsx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xls2xlst        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xls2xlst_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xls2xlsm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int xls2xlsm_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xls2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xls2xlsx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xls2xlst        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xls2xlst_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xls2xlsm		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 xls2xlsm_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
 
-    int txt2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int txt2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int txt2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int txt2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
-    int docx_dir2txt    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 txt2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 txt2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 txt2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 txt2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
+    _UINT32 docx_dir2txt    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
 
-    int odf2oox         (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int odf2oox_dir     (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int odf2oot         (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int odf2oot_bin     (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf2oox         (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf2oox_dir     (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf2oot         (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf2oot_bin     (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
-    int odf_flat2oox	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int odf_flat2oox_dir(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int odf_flat2oot	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int odf_flat2oot_bin(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf_flat2oox	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf_flat2oox_dir(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf_flat2oot	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 odf_flat2oot_bin(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
-	int docx2odt        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int docx_dir2odt    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int xlsx2ods        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int xlsx_dir2ods    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int pptx2odp        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int pptx_dir2odp    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 docx2odt        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 docx_dir2odt    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 xlsx2ods        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 xlsx_dir2ods    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 pptx2odp        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 pptx_dir2odp    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
-	int fromMscrypt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-	int mscrypt2oox		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-	int mscrypt2oot		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-	int mscrypt2oot_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 fromMscrypt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 mscrypt2oox		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 mscrypt2oot		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 mscrypt2oot_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 	
-	int oox2mscrypt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 oox2mscrypt		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
-	int html2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-	int html2doct		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
-    int html2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 html2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+	_UINT32 html2doct		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
+    _UINT32 html2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params);
 
 //-------------------------------------------------------------------------------------------------------------------------------------------------
-    int dir2zip			(const std::wstring &sFrom, const std::wstring &sTo);
-    int zip2dir			(const std::wstring &sFrom, const std::wstring &sTo);
+    _UINT32 dir2zip			(const std::wstring &sFrom, const std::wstring &sTo);
+    _UINT32 zip2dir			(const std::wstring &sFrom, const std::wstring &sTo);
 
-    int convertmailmerge (const InputParamsMailMerge& oMailMergeSend,const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params);
+    _UINT32 convertmailmerge (const InputParamsMailMerge& oMailMergeSend,const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params);
 
-    int fromDocxDir     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-    int fromDoctBin     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-	int fromDocument    (const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params);
+    _UINT32 fromDocxDir     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+    _UINT32 fromDoctBin     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+	_UINT32 fromDocument    (const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params);
 
-	int fromXlsxDir     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params, const std::wstring &sXlsxFile);
-    int fromXlstBin     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-	int fromSpreadsheet (const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params);
+	_UINT32 fromXlsxDir     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params, const std::wstring &sXlsxFile);
+    _UINT32 fromXlstBin     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+	_UINT32 fromSpreadsheet (const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params);
 
-    int fromPptxDir     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-    int fromPpttBin     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-	int fromPresentation(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params);
+    _UINT32 fromPptxDir     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+    _UINT32 fromPpttBin     (const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+	_UINT32 fromPresentation(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params);
 
-    int fromT(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-    int fromCrossPlatform(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
-    int fromCanvasPdf(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+    _UINT32 fromT(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+    _UINT32 fromCrossPlatform(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
+    _UINT32 fromCanvasPdf(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params);
 
-	int fromInputParams(InputParams& oInputParams);
-	int detectMacroInFile(InputParams& oInputParams);
+	_UINT32 fromInputParams(InputParams& oInputParams);
+	_UINT32 detectMacroInFile(InputParams& oInputParams);
 	
-	X2T_DECL_EXPORT int FromFile(const std::wstring& file);
-	X2T_DECL_EXPORT int FromXml(const std::wstring& xml);
+	X2T_DECL_EXPORT _UINT32 FromFile(const std::wstring& file);
+	X2T_DECL_EXPORT _UINT32 FromXml(const std::wstring& xml);
 }
 #endif // ASCCONVERTERS_H

X2tConverter/src/cextracttools.cpp

@@ -403,7 +403,7 @@ namespace NExtractTools
             }
             std::sort (aChangesFiles.begin(), aChangesFiles.end(), compare_string_by_length);
 
-            for(int i = 0; i < aChangesFiles.size(); ++i)
+            for(size_t i = 0; i < aChangesFiles.size(); ++i)
             {
                 oBuilder.WriteString(_T("<Change>"));
                 oBuilder.WriteEncodeXmlString(aChangesFiles[i]);
@@ -419,7 +419,7 @@ namespace NExtractTools
         oBuilder.WriteString(_T("</Settings>"));
         return oBuilder.GetData();
     }
-    int apply_changes(const std::wstring &sBinFrom, const std::wstring &sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile eType, const std::wstring &sThemeDir, std::wstring &sBinTo, const InputParams& params)
+    _UINT32 apply_changes(const std::wstring &sBinFrom, const std::wstring &sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile eType, const std::wstring &sThemeDir, std::wstring &sBinTo, const InputParams& params)
 	{
         std::wstring sBinDir = NSDirectory::GetFolderPath(sBinFrom);
 		std::wstring sChangesDir = sBinDir + FILE_SEPARATOR_STR + _T("changes");
@@ -464,7 +464,7 @@ namespace NExtractTools
                     {
                         std::vector<std::wstring> aImages = oDoctRenderer.GetImagesInChanges();
                         //todo сделать interface у COfficeUtils, чтобы можно было делать архив из файлов в разных папках.
-                        for(int i = 0; i < aImages.size(); ++i)
+                        for(size_t i = 0; i < aImages.size(); ++i)
                         {
                             std::wstring sImageName = aImages[i];
                             std::wstring sImage = sImagesDirectory + FILE_SEPARATOR_STR + sImageName;

X2tConverter/src/cextracttools.h

@@ -677,7 +677,7 @@ namespace NExtractTools
 								oLimit.uncompressed = std::stoul(oZipNode.GetAttribute(L"uncompressed", L"0"));
 								oLimit.pattern = oZipNode.GetAttribute(L"template", L"");
 							}
-							for (int j = 0; j < aTypes.size(); ++j)
+							for (size_t j = 0; j < aTypes.size(); ++j)
 							{
 								m_mapInputLimits[COfficeFileFormatChecker::GetFormatByExtension(L"." + aTypes[j])] = oLimit;
 							}
@@ -999,7 +999,7 @@ namespace NExtractTools
         }
         return str;
     }
-	static int getReturnErrorCode(int nDefine)
+	static int getReturnErrorCode(_UINT32 nDefine)
 	{
         return 0 == nDefine ? 0 : nDefine - AVS_ERROR_FIRST - AVS_FILEUTILS_ERROR_FIRST;
 	}
@@ -1170,7 +1170,7 @@ namespace NExtractTools
     std::wstring getDoctXml(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, NSDoctRenderer::DoctRendererFormat::FormatFile eToType,
                             const std::wstring& sTFileDir, const std::wstring& sPdfBinFile, const std::wstring& sImagesDirectory,
                             const std::wstring& sThemeDir, int nTopIndex, const std::wstring& sMailMerge, const InputParams& params);
-    int apply_changes(const std::wstring &sBinFrom, const std::wstring &sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile eType, const std::wstring &sThemeDir, std::wstring &sBinTo, const InputParams& params);
+    _UINT32 apply_changes(const std::wstring &sBinFrom, const std::wstring &sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile eType, const std::wstring &sThemeDir, std::wstring &sBinTo, const InputParams& params);
 #endif
 }
 #endif // CEXTRACTTOOLS_H

X2tConverter/src/main.cpp

@@ -116,7 +116,7 @@ static std::wstring utf8_to_unicode(const char *src)
 	if (argc >= 3) sArg2 = std::wstring(argv [2]);
 #endif
 
-	int result = 0;
+	_UINT32 result = 0;
     std::wstring sXmlExt = _T(".xml");
     if((sArg1.length() > 3) && (sXmlExt == sArg1.substr(sArg1.length() - sXmlExt.length(), sXmlExt.length())))
 	{

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -4764,10 +4764,10 @@ namespace BinXlsxRW
 		{
 			RELEASEOBJECT(m_oBcw);
 		}
-        int Open(const std::wstring& sInputDir, const std::wstring& sFileDst, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager,
+        _UINT32 Open(const std::wstring& sInputDir, const std::wstring& sFileDst, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager,
             NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, const std::wstring& sXMLOptions, bool bIsNoBase64)
 		{
-			int result = 0;
+			_UINT32 result = 0;
 
 			OOX::CPath path(sFileDst);
 	//создаем папку для media

XlsxSerializerCom/Reader/CSVReader.cpp

@@ -225,7 +225,7 @@ namespace CSVReader
 		pCell->setRowCol(nRow, nCol);
 		oRow.m_arrItems.push_back(pCell);
 	}
-	int ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& sDelimiter)
+	_UINT32 ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& sDelimiter)
 	{
 		NSFile::CFileBinary oFile;
 		if (false == oFile.OpenFile(sFileName)) return AVS_FILEUTILS_ERROR_CONVERT;

XlsxSerializerCom/Reader/CSVReader.h

@@ -41,7 +41,7 @@
 namespace CSVReader
 {
     void AddCell(std::wstring &sText, INT nStartCell, std::stack<INT> &oDeleteChars, OOX::Spreadsheet::CRow &oRow, INT nRow, INT nCol, bool bIsWrap);
-	int ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& wcDelimiter);
+	_UINT32 ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& wcDelimiter);
 }
 
 #endif //CSV_READER