diff --git a/Common/OfficeFileFormatChecker2.cpp b/Common/OfficeFileFormatChecker2.cpp index 0e08c82096..2213b775eb 100644 --- a/Common/OfficeFileFormatChecker2.cpp +++ b/Common/OfficeFileFormatChecker2.cpp @@ -871,7 +871,8 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type) { switch (type) { - case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: return L".docx"; + case AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM: return L".oform"; + case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: return L".docx"; case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCM: return L".docm"; case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOTX: return L".dotx"; case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOTM: return L".dotm"; @@ -950,7 +951,9 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring& ext) { if (L".docx" == ext) return AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX; - if (L".docm" == ext) + if (L".oform" == ext) + return AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX; //AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM + if (L".docm" == ext) return AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCM; if (L".dotx" == ext) return AVS_OFFICESTUDIO_FILE_DOCUMENT_DOTX; diff --git a/Common/OfficeFileFormats.h b/Common/OfficeFileFormats.h index ce7581c839..5855661387 100644 --- a/Common/OfficeFileFormats.h +++ b/Common/OfficeFileFormats.h @@ -53,6 +53,7 @@ #define AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_FLAT AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0011 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0012 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_PACKAGE AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0014 +#define AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0015 #define AVS_OFFICESTUDIO_FILE_PRESENTATION 0x0080 #define AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x0001 diff --git a/X2tConverter/src/cextracttools.cpp b/X2tConverter/src/cextracttools.cpp index d3083eb81b..e9562abb03 100644 --- a/X2tConverter/src/cextracttools.cpp +++ b/X2tConverter/src/cextracttools.cpp @@ -128,7 +128,7 @@ namespace NExtractTools res = TCD_DOTM2DOCX; } else if (0 == sExt2.compare(_T(".docm"))) res = TCD_DOTM2DOCM; - else if (0 == sExt2.compare(_T(".txt"))) res = TCD_DOCX2TXT; + else if (0 == sExt2.compare(_T(".txt"))) res = TCD_DOCX2TXT; }break; case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX_PACKAGE: case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX_PACKAGE: @@ -206,6 +206,7 @@ namespace NExtractTools case AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY: { if (0 == sExt2.compare(_T(".docx"))) res = TCD_DOCT2DOCX; + else if (0 == sExt2.compare(_T(".oform"))) res = TCD_DOCT2DOCX; else if (0 == sExt2.compare(_T(".docm"))) res = TCD_DOCT2DOCM; else if (0 == sExt2.compare(_T(".dotx"))) res = TCD_DOCT2DOTX; else if (0 == sExt2.compare(_T(".bin"))) res = TCD_T2BIN; @@ -229,7 +230,7 @@ namespace NExtractTools case AVS_OFFICESTUDIO_FILE_CANVAS_WORD: { if (0 == sExt2.compare(_T(".docx"))) res = TCD_DOCT_BIN2DOCX; - else if (0 == sExt2.compare(_T(".docm"))) res = TCD_DOCT_BIN2DOCX; + else if (0 == sExt2.compare(_T(".oform"))) res = TCD_DOCT_BIN2DOCX; else if (0 == sExt2.compare(_T(".dotx"))) res = TCD_DOCT_BIN2DOCX; else if (0 == sExt2.compare(_T(".doct"))) res = TCD_BIN2T; else if (0 == sExt2.compare(_T(".rtf"))) res = TCD_DOCT_BIN2RTF;