x2t - add template for decrypt

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp

@@ -119,17 +119,6 @@ namespace DocFileFormat
 		lineWeight	= reader->ReadInt16();
 		lineStyle	= reader->ReadInt16();
 	}
-	const static int shemeDefaultColor[] = 
-	{
-		0x00000000,	0x00FFFFFF,	0x00FF0000,	0x0000FF00,	0x000000FF,	0x00FFFF00,	0x00FF00FF,	0x0000FFFF,	
-		0x00000000,	0x00FFFFFF,	0x00FF0000,	0x0000FF00,	0x000000FF,	0x00FFFF00,	0x00FF00FF,	0x0000FFFF,	
-		0x00800000,	0x00008000,	0x00000080,	0x00808000,	0x00800080,	0x00008080,	0x00C0C0C0,	0x00808080,	
-		0x009999FF,	0x00993366,	0x00FFFFCC,	0x00CCFFFF,	0x00660066,	0x00FF8080,	0x000066CC,	0x00CCCCFF,	
-		0x00000080,	0x00FF00FF,	0x00FFFF00,	0x0000FFFF,	0x00800080,	0x00800000,	0x00008080,	0x000000FF,	
-		0x0000CCFF,	0x00CCFFFF,	0x00CCFFCC,	0x00FFFF99,	0x0099CCFF,	0x00FF99CC,	0x00CC99FF,	0x00FFCC99,	
-		0x003366FF,	0x0033CCCC,	0x0099CC00,	0x00FFCC00,	0x00FF9900,	0x00FF6600,	0x00666699,	0x00969696,	
-		0x00003366,	0x00339966,	0x00003300,	0x00333300,	0x00993300,	0x00993366,	0x00333399,	0x00333333
-	};
 
 	long DrawingPrimitive::read_color(VirtualStreamReader* reader)
 	{
@@ -223,6 +212,7 @@ namespace DocFileFormat
 		read_fill	(reader);
 		read_shadow	(reader);
 	}
+
 	DrawingPrimitiveTextBox::DrawingPrimitiveTextBox(VirtualStreamReader *reader, int length) : DrawingPrimitiveRect(reader, length)
 	{
 	}
@@ -253,6 +243,8 @@ namespace DocFileFormat
 
 	DrawingPrimitiveCTextBox::~DrawingPrimitiveCTextBox()
 	{
+		if (polyline)	delete polyline;
+		if (txbx)		delete txbx;
 	}
 
 	DrawingPrimitivePolyline::DrawingPrimitivePolyline(VirtualStreamReader *reader, int length) : DrawingPrimitiveLine(reader, length, false)

X2tConverter/src/ASCConverters.cpp

@@ -142,7 +142,7 @@ namespace NExtractTools
         return nRes;
     }
     // bin -> docx dir
-    int doct_bin2docx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sToDir, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params)
+    int doct_bin2docx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params)
     {
         int nRes = 0;
         std::wstring sTargetBin;
@@ -162,7 +162,7 @@ namespace NExtractTools
 		CString sMediaPath;             // will be filled by 'CreateDocxFolders' method
 		CString sEmbedPath;             // will be filled by 'CreateDocxFolders' method
 
-        CString sToDir2 = std_string2string(sToDir);
+        CString sToDir2 = std_string2string(sTo);
         m_oCDocxSerializer.CreateDocxFolders (sToDir2, sThemePath, sMediaPath, sEmbedPath);
 
         if (SUCCEEDED_X2T(nRes))
@@ -882,13 +882,13 @@ namespace NExtractTools
    }
 
    // doc -> docx
-   int doc2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp)
+   int doc2docx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const InputParams& params)
    {
        std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked");
 
        FileSystem::Directory::CreateDirectory(sResultDocxDir);
 
-       int nRes = doc2docx_dir(sFrom, sResultDocxDir, sTemp);
+       int nRes = doc2docx_dir(sFrom, sResultDocxDir, sTemp, params);
        if(SUCCEEDED_X2T(nRes))
        {
            COfficeUtils oCOfficeUtils(NULL);
@@ -897,16 +897,16 @@ namespace NExtractTools
        }
        return AVS_FILEUTILS_ERROR_CONVERT;
    }
-   int doc2docx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp)
+   int doc2docx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const InputParams& params)
    {
         COfficeDocFile docFile;
 		docFile.m_sTempFolder = sTemp;
        
-        return S_OK == docFile.LoadFromFile( sFrom, sTo, L"", NULL) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
+		return S_OK == docFile.LoadFromFile( sFrom, sTo, params.m_sPassword ? *params.m_sPassword : L"", NULL) ? 0 : AVS_FILEUTILS_ERROR_CONVERT;
    }
 
    // doc -> doct
-   int doc2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath)
+   int doc2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sPassword, const std::wstring &sTemp, const std::wstring &sFontPath)
    {
        // Extract docx to temp directory
        std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
@@ -914,7 +914,7 @@ namespace NExtractTools
 
        FileSystem::Directory::CreateDirectory(sResultDoctDir);
 
-       int nRes = doc2doct_bin(sFrom, sResultDoctFileEditor, sTemp, sFontPath);
+       int nRes = doc2doct_bin(sFrom, sResultDoctFileEditor, sPassword, sTemp, sFontPath);
 
        if (SUCCEEDED_X2T(nRes))
        {
@@ -926,7 +926,7 @@ namespace NExtractTools
    }
 
    // doc -> doct_bin
-   int doc2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath)
+   int doc2doct_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sPassword, const std::wstring &sTemp, const std::wstring &sFontPath)
    {
         std::wstring sResultDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked");
 
@@ -935,7 +935,7 @@ namespace NExtractTools
         COfficeDocFile docFile;
 		docFile.m_sTempFolder = sTemp;
 
-        if (docFile.LoadFromFile( sFrom, sResultDocxDir, L"", NULL)== S_OK)
+        if (docFile.LoadFromFile( sFrom, sResultDocxDir, sPassword, NULL)== S_OK)
         {
             BinDocxRW::CDocxSerializer m_oCDocxSerializer;
 
@@ -1216,6 +1216,7 @@ namespace NExtractTools
         }
         return AVS_FILEUTILS_ERROR_CONVERT;
    }
+
    int xlsx_dir2ods (const std::wstring &sXlsxDir, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath )
    {
        std::wstring sTempUnpackedODS = sTemp + FILE_SEPARATOR_STR + _T("ods_unpacked");
@@ -1237,6 +1238,40 @@ namespace NExtractTools
        }
        return AVS_FILEUTILS_ERROR_CONVERT;
 	}
+
+	int mscrypt2oot (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath, const InputParams& params)
+	{
+        std::wstring sResultOotDir			= sTemp			+ FILE_SEPARATOR_STR + _T("oot_unpacked");
+        std::wstring sResultOotFileEditor	= sResultOotDir	+ FILE_SEPARATOR_STR + _T("Editor.bin");
+
+        FileSystem::Directory::CreateDirectory(sResultOotDir);
+
+        int nRes = mscrypt2oot_bin(sFrom, sResultOotFileEditor, sTemp, sFontPath, params);
+        if (SUCCEEDED_X2T(nRes))
+        {
+            COfficeUtils oCOfficeUtils(NULL);
+            nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultOotDir, sTo, -1)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
+        }
+
+		return nRes;
+	}
+
+	int mscrypt2oot_bin	 (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath, const InputParams& params)
+	{
+		if (!params.m_sPassword)			return AVS_FILEUTILS_ERROR_CONVERT_DRM;
+		if ( params.m_sPassword->empty())	return AVS_FILEUTILS_ERROR_CONVERT_DRM;
+
+		//decrypt to temp
+        std::wstring sResultDecryptDir = sTemp	+ FILE_SEPARATOR_STR + _T("crypt_unpacked");
+        FileSystem::Directory::CreateDirectory(sResultDecryptDir);
+
+
+
+		//convert from format (detect before) to temp binary folder
+
+		return AVS_FILEUTILS_ERROR_CONVERT_PASSWORD;
+	}
+
    //html
    int html2doct_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const InputParams& params)
    {
@@ -1567,7 +1602,7 @@ namespace NExtractTools
            }
            else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC == nFormatFrom)
            {
-               nRes = doc2docx_dir(sFrom, sDocxDir, sTemp);
+               nRes = doc2docx_dir(sFrom, sDocxDir, sTemp, params);
            }
            else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT == nFormatFrom)
            {
@@ -1890,7 +1925,7 @@ namespace NExtractTools
 
        FileSystem::Directory::CreateDirectory(sResultDocxDir);
 
-       int nRes = xls2xlsx_dir(sFrom, sResultDocxDir, sFontPath, sTemp, params);
+       int nRes = xls2xlsx_dir(sFrom, sResultDocxDir, sTemp, sFontPath, params);
        if(SUCCEEDED_X2T(nRes))
        {
            COfficeUtils oCOfficeUtils(NULL);

X2tConverter/src/ASCConverters.h

@@ -45,11 +45,11 @@ namespace NExtractTools
     int docx_dir2doct_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sFontPath);
     int docx2doct			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
     int doct_bin2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
-    int doct_bin2docx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sToDir, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
+    int doct_bin2docx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
 	int doct2docx			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
 
     int xlsx2xlst_bin		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, const std::wstring &sXmlOptions);
-    int xlsx_dir2xlst_bin (const std::wstring &sXlsxDir, const std::wstring &sTo, const std::wstring &sFontPath, const std::wstring &sXmlOptions);
+    int xlsx_dir2xlst_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sFontPath, const std::wstring &sXmlOptions);
     int xlsx2xlst			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, const std::wstring &sXmlOptions);
 	int xlst_bin2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
     int xlst_bin2xlsx_dir	(const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
@@ -67,7 +67,7 @@ namespace NExtractTools
     int csv2xlst_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & XmlOptions, const std::wstring &sFontPath);
     int xlst2csv		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp, const std::wstring &sFontPath);
     int xlsx2csv		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp, const std::wstring &sFontPath);
-    int xlst_bin2csv    (const std::wstring &sXlsxDir, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp, const std::wstring &sFontPath);
+    int xlst_bin2csv    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp, const std::wstring &sFontPath);
 
     int bin2pdf			(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, bool bPaid, const std::wstring &sThemeDir);
 
@@ -84,15 +84,15 @@ namespace NExtractTools
     int rtf2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
     int rtf2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
     int docx2rtf		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp);
-    int docx_dir2rtf    (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp);
+    int docx_dir2rtf    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp);
     int doct2rtf        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
     int doct_bin2rtf    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, bool bFromChanges, const std::wstring &sThemeDir, const InputParams& params);
 
-    int doc2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp);
-    int doc2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp);
-    int doc2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
-    int doc2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
-    int docx_dir2doc    (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
+    int doc2docx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const InputParams& params);
+    int doc2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const InputParams& params);
+    int doc2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sPassword, const std::wstring &sTemp, const std::wstring &sFontPath);
+    int doc2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sPassword, const std::wstring &sTemp, const std::wstring &sFontPath);
+    int docx_dir2doc    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
 
     int xls2xlsx		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, const InputParams& params);
     int xls2xlsx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath, const InputParams& params);
@@ -103,7 +103,7 @@ namespace NExtractTools
     int txt2docx_dir    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp);
     int txt2doct        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp, const std::wstring &sFontPath);
     int txt2doct_bin    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp, const std::wstring &sFontPath);
-    int docx_dir2txt    (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp);
+    int docx_dir2txt    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sXmlOptions, const std::wstring &sTemp);
 
     int odf2oox         (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
     int odf2oox_dir     (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
@@ -111,10 +111,14 @@ namespace NExtractTools
     int odf2oot_bin     (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
 
     int docx2odt        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
-    int docx_dir2odt    (const std::wstring &sDocxDir, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath);
+    int docx_dir2odt    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
     int xlsx2ods        (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
-    int xlsx_dir2ods    (const std::wstring &sXlsxDir, const std::wstring &sTo, const std::wstring &sTemp, const std::wstring &sFontPath );
+    int xlsx_dir2ods    (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath);
 
+	int mscrypt2oot		(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath, const InputParams& params);
+	int mscrypt2oot_bin	(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, const std::wstring &sFontPath, const InputParams& params);
+
+//-------------------------------------------------------------------------------------------------------------------------------------------------
     int dir2zip			(const std::wstring &sFrom, const std::wstring &sTo);
     int zip2dir			(const std::wstring &sFrom, const std::wstring &sTo);
 
@@ -135,6 +139,5 @@ namespace NExtractTools
     int fromT(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sFontPath, const std::wstring &sXmlOptions, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, const InputParams& params);
     int fromCrossPlatform(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sFontPath, const std::wstring &sXmlOptions, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, const InputParams& params);
     int fromCanvasPdf(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sFontPath, const std::wstring &sXmlOptions, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid);
-
 }
 #endif // ASCCONVERTERS_H

X2tConverter/src/cextracttools.cpp

@@ -215,6 +215,13 @@ namespace NExtractTools
                                  0 == sExt2.compare(_T(".xlsx")) ||
                                  0 == sExt2.compare(_T(".pptx")))		res = TCD_ODF2OOX;
                     }break;
+				case AVS_OFFICESTUDIO_FILE_OTHER_MS_OFFCRYPTO:
+					{
+							 if (0 == sExt2.compare(_T(".doct")))		res = TCD_MSCRYPT2DOCT;
+                        else if (0 == sExt2.compare(_T(".xlst")))		res = TCD_MSCRYPT2XLST;
+                        else if (0 == sExt2.compare(_T(".pptt")))		res = TCD_MSCRYPT2PPTT;
+ 						else if (0 == sExt2.compare(_T(".bin")))		res = TCD_MSCRYPT2BIN;
+					}break;
                 }
             }
 		}

X2tConverter/src/cextracttools.h

@@ -132,7 +132,12 @@ namespace NExtractTools
 
         TCD_XML2DOCX,
         TCD_DOCX2XML,
-
+//							 
+		TCD_MSCRYPT2DOCT,
+		TCD_MSCRYPT2XLST,
+		TCD_MSCRYPT2PPTT,
+		TCD_MSCRYPT2BIN,
+//
         TCD_MAILMERGE,
         TCD_T2,
         TCD_DOCT_BIN2,

X2tConverter/src/main.cpp

@@ -231,217 +231,230 @@ int main(int argc, char *argv[])
     }
 
     int result = 0;
-    if (TCD_DOCX2DOCT == conversion)
+	switch(conversion)
+	{
+		case TCD_DOCX2DOCT:
 		{
 			result = docx2doct (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_DOCT2DOCX == conversion)
+		}break;
+		case TCD_DOCT2DOCX:
 		{
 			result =  doct2docx (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_XLSX2XLST == conversion)
+		}break;
+		case TCD_XLSX2XLST:
 		{
 			result =  xlsx2xlst (sFileFrom, sFileTo, sTempDir, sFontPath, sXmlOptions);
-    }
-    else if (TCD_XLST2XLSX == conversion)
+		}break;
+		case TCD_XLST2XLSX:
 		{
 			result =  xlst2xlsx (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_PPTX2PPTT == conversion)
+		}break;
+		case TCD_PPTX2PPTT:
 		{
 			result =  pptx2pptt (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_PPTT2PPTX == conversion)
+		}break;
+		case TCD_PPTT2PPTX:
 		{
 			result =  pptt2pptx (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_ZIPDIR == conversion)
+		}break;
+		case TCD_ZIPDIR:
 		{
 			result =  dir2zip (sFileFrom, sFileTo);
-    }
-    else if (TCD_UNZIPDIR == conversion)
+		}break;
+		case TCD_UNZIPDIR:
 		{
 			result =  zip2dir (sFileFrom, sFileTo);
-    }
-    else if (TCD_CSV2XLSX == conversion)
+		}break;
+		case TCD_CSV2XLSX:
 		{
 			result =  csv2xlsx (sFileFrom, sFileTo, sXmlOptions, sTempDir, sFontPath);
-    }
-    else if (TCD_CSV2XLST == conversion)
+		}break;
+		case TCD_CSV2XLST:
 		{
 			result =  csv2xlst (sFileFrom, sFileTo, sXmlOptions, sTempDir, sFontPath);
-    }
-    else if (TCD_XLSX2CSV == conversion)
+		}break;
+		case TCD_XLSX2CSV:
 		{
 			result =  xlsx2csv (sFileFrom, sFileTo, sXmlOptions, sTempDir, sFontPath);
-    }
-    else if (TCD_XLST2CSV == conversion)
+		}break;
+		case TCD_XLST2CSV:
 		{
 			result =  xlst2csv (sFileFrom, sFileTo, sXmlOptions, sTempDir, sFontPath);
-    }
-    else if (TCD_DOCX2DOCT_BIN == conversion)
+		}break;
+		case TCD_DOCX2DOCT_BIN:
 		{
 			result = docx2doct_bin (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_DOCT_BIN2DOCX == conversion)
+		}break;
+		case TCD_DOCT_BIN2DOCX:
 		{
 			result =  doct_bin2docx (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_XLSX2XLST_BIN == conversion)
+		}break;
+		case TCD_XLSX2XLST_BIN:
 		{
 			result =  xlsx2xlst_bin (sFileFrom, sFileTo, sTempDir, sFontPath, sXmlOptions);
-    }
-    else if (TCD_XLST_BIN2XLSX == conversion)
+		}break;
+		case TCD_XLST_BIN2XLSX:
 		{
 			result =  xlst_bin2xlsx (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_PPTX2PPTT_BIN == conversion)
+		}break;
+		case TCD_PPTX2PPTT_BIN:
 		{
 			result =  pptx2pptt_bin (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_PPTT_BIN2PPTX == conversion)
+		}break;
+		case TCD_PPTT_BIN2PPTX:
 		{
 			result =  pptt_bin2pptx (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_BIN2PDF == conversion)
+		}break;
+		case TCD_BIN2PDF:
 		{
 			result =  bin2pdf (sFileFrom, sFileTo, sTempDir, sFontPath, bPaid, sThemeDir);
-    }
-    else if (TCD_BIN2T == conversion)
+		}break;
+		case TCD_BIN2T:
 		{
 			result =  dir2zip (FileSystem::Directory::GetFolderPath(sFileFrom), sFileTo);
-    }
-    else if (TCD_T2BIN == conversion)
+		}break;
+		case TCD_T2BIN:
 		{
 			result =  zip2dir (sFileFrom, FileSystem::Directory::GetFolderPath(sFileTo));
-    }
-    else if (TCD_PPSX2PPTX == conversion)
+		}break;
+		case TCD_PPSX2PPTX:
 		{
 			result =  ppsx2pptx (sFileFrom, sFileTo, sTempDir);
-    }
-    else if (TCD_PPT2PPTX == conversion)
+		}break;
+		case TCD_PPT2PPTX:
 		{
 			result =  ppt2pptx (sFileFrom, sFileTo, sTempDir);
 		}
-    else if (TCD_PPT2PPTT == conversion)
+		case TCD_PPT2PPTT:
 		{
 			result =  ppt2pptt (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_PPT2PPTT_BIN == conversion)
+		}break;
+		case TCD_PPT2PPTT_BIN:
 		{
 			result =  ppt2pptt_bin (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_RTF2DOCX == conversion)
+		}break;
+		case TCD_RTF2DOCX:
 		{
 			result =  rtf2docx (sFileFrom, sFileTo, sTempDir);
-    }
-    else if (TCD_RTF2DOCT == conversion)
+		}break;
+		case TCD_RTF2DOCT:
 		{
 			result = rtf2doct (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_RTF2DOCT_BIN == conversion)
+		}break;
+		case TCD_RTF2DOCT_BIN:
 		{
 			result = rtf2doct_bin (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_DOCX2RTF == conversion)
+		}break;
+		case TCD_DOCX2RTF:
 		{
 			result =  docx2rtf (sFileFrom, sFileTo, sTempDir);
-    }
-    else if (TCD_DOC2DOCX == conversion)
+		}break;
+		case TCD_DOC2DOCX:
 		{
-        result =  doc2docx (sFileFrom, sFileTo, sTempDir);
-    }
-    else if (TCD_DOCT2RTF == conversion)
+			result =  doc2docx (sFileFrom, sFileTo, sTempDir, oInputParams);
+		}break;
+		case TCD_DOCT2RTF:
 		{
 			result =  doct2rtf (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_DOCT_BIN2RTF == conversion)
+		}break;
+		case TCD_DOCT_BIN2RTF:
 		{
 			result =  doct_bin2rtf (sFileFrom, sFileTo, sTempDir, sFontPath, bFromChanges, sThemeDir, oInputParams);
-    }
-    else if (TCD_TXT2DOCX == conversion)
+		}break;
+		case TCD_TXT2DOCX:
 		{
 			result =  txt2docx (sFileFrom, sFileTo, sXmlOptions, sTempDir);
-    }
-    else if (TCD_TXT2DOCT == conversion)
+		}break;
+		case TCD_TXT2DOCT:
 		{
 			result = txt2doct (sFileFrom, sFileTo, sXmlOptions, sTempDir, sFontPath);
-    }
-    else if (TCD_TXT2DOCT_BIN == conversion)
+		}break;
+		case TCD_TXT2DOCT_BIN:
 		{
 			result = txt2doct_bin (sFileFrom, sFileTo, sXmlOptions, sTempDir, sFontPath);
-    }
-    else if (TCD_XLS2XLSX == conversion)
+		}break;
+		case TCD_XLS2XLSX:
 		{
 			result =  xls2xlsx (sFileFrom, sFileTo, sTempDir, sFontPath, oInputParams);
-    }
-    else if (TCD_XLS2XLST == conversion)
+		}break;
+		case TCD_XLS2XLST:
 		{
 			result = xls2xlst (sFileFrom, sFileTo, sPassword, sTempDir, sFontPath, sXmlOptions);
-    }
-    else if (TCD_XLS2XLST_BIN == conversion)
+		}break;
+		case TCD_XLS2XLST_BIN:
 		{
 			result = xls2xlst_bin (sFileFrom, sFileTo, sPassword, sTempDir, sFontPath, sXmlOptions);
-    }
-    else if (TCD_ODF2OOX == conversion)
+		}break;
+		case TCD_ODF2OOX:
 		{
 			result =  odf2oox (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_ODF2OOT == conversion)
+		}break;
+		case TCD_ODF2OOT:
 		{
 			result = odf2oot (sFileFrom, sFileTo,  sTempDir, sFontPath);
-    }
-    else if (TCD_ODF2OOT_BIN == conversion)
+		}break;
+		case TCD_ODF2OOT_BIN:
 		{
 			result = odf2oot_bin (sFileFrom, sFileTo, sTempDir, sFontPath);
 		}
-    else if (TCD_DOCX2ODT == conversion)
+		case TCD_DOCX2ODT:
 		{
 			result =  docx2odt (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_XLSX2ODS == conversion)
+		}break;
+		case TCD_XLSX2ODS:
 		{
 			result =  xlsx2ods (sFileFrom, sFileTo, sTempDir, sFontPath);
-    }
-    else if (TCD_MAILMERGE == conversion)
+		}break;
+		case TCD_MAILMERGE:
 		{
 			result = convertmailmerge(*oMailMerge, sFileFrom, sFileTo, sTempDir, sFontPath, bPaid, sThemeDir, oInputParams);
-    }
-    else if (TCD_DOCUMENT2 == conversion)
+		}break;
+		case TCD_DOCUMENT2:
 		{
 			result = fromDocument(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_SPREADSHEET2 == conversion)
+		}break;
+		case TCD_SPREADSHEET2:
 		{
 			result = fromSpreadsheet(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_PRESENTATION2 == conversion)
+		}break;
+		case TCD_PRESENTATION2:
 		{
 			result = fromPresentation(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_T2 == conversion)
+		}break;
+		case TCD_T2:
 		{
 			result = fromT(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_DOCT_BIN2 == conversion)
+		}break;
+		case TCD_DOCT_BIN2:
 		{
 			result = fromDoctBin(sFileFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_XLST_BIN2 == conversion)
+		}break;
+		case TCD_XLST_BIN2:
 		{
 			result = fromXlstBin(sFileFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_PPTT_BIN2 == conversion)
+		}break;
+		case TCD_PPTT_BIN2:
 		{
 			result = fromPpttBin(sFileFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_CROSSPLATFORM2 == conversion)
+		}break;
+		case TCD_CROSSPLATFORM2:
 		{
 			result = fromCrossPlatform(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid, oInputParams);
-    }
-    else if (TCD_CANVAS_PDF2 == conversion)
+		}break;
+		case TCD_CANVAS_PDF2:
 		{
 			result = fromCanvasPdf(sFileFrom, nFormatFrom, sFileTo, nFormatTo, sTempDir, sFontPath, sXmlOptions, sThemeDir, bFromChanges, bPaid);
+		}break;
+		case TCD_MSCRYPT2DOCT:
+		case TCD_MSCRYPT2XLST:
+		case TCD_MSCRYPT2PPTT:
+		{
+			result = mscrypt2oot (sFileFrom, sFileTo, sTempDir, sFontPath, oInputParams);
+		}break;
+		case TCD_MSCRYPT2BIN:
+			result =  mscrypt2oot_bin (sFileFrom, sFileTo, sTempDir, sFontPath, oInputParams);
+		{
+		}break;
 	}
 
 	// delete temp dir