From b850450c255697aa612372bd40f477dc0eff47bd Mon Sep 17 00:00:00 2001 From: Kirill Polyakov Date: Tue, 10 Feb 2026 03:36:23 +0300 Subject: [PATCH] Fix build --- HtmlFile2/Common.h | 2 +- HtmlFile2/HTMLReader.cpp | 4 ++-- HtmlFile2/HTMLReader.h | 2 ++ OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp | 10 +++++----- X2tConverter/src/ASCConverters.h | 1 + X2tConverter/src/lib/html.h | 10 ++++++++-- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/HtmlFile2/Common.h b/HtmlFile2/Common.h index 47870ff45f..ff2b27353c 100644 --- a/HtmlFile2/Common.h +++ b/HtmlFile2/Common.h @@ -2,7 +2,7 @@ #define COMMON_H #include -#include "../../DesktopEditor/common/StringBuilder.h" +#include "../DesktopEditor/common/StringBuilder.h" namespace HTML { diff --git a/HtmlFile2/HTMLReader.cpp b/HtmlFile2/HTMLReader.cpp index 0a5d97128e..f8b7d59893 100644 --- a/HtmlFile2/HTMLReader.cpp +++ b/HtmlFile2/HTMLReader.cpp @@ -14,8 +14,8 @@ #include "Writers/MDWriter.h" #include "Tags/MDTags.h" -#include "../../Common/3dParty/html/gumbo-parser/src/gumbo.h" -#include "../src/StringFinder.h" +#include "../Common/3dParty/html/gumbo-parser/src/gumbo.h" +#include "src/StringFinder.h" #include diff --git a/HtmlFile2/HTMLReader.h b/HtmlFile2/HTMLReader.h index 5a84819cc5..6ed976714a 100644 --- a/HtmlFile2/HTMLReader.h +++ b/HtmlFile2/HTMLReader.h @@ -1,6 +1,8 @@ #ifndef HTMLREADER_H #define HTMLREADER_H +#include + #include "../Common/3dParty/html/css/src/CCssCalculator.h" #include "../DesktopEditor/xml/include/xmlutils.h" diff --git a/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp b/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp index 571e0b6549..25b9d4e460 100644 --- a/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp +++ b/OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp @@ -3790,9 +3790,9 @@ void BinaryDocumentTableWriter::WriteAltChunk(OOX::Media& oAltChunkFile, OOX::CS case AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML: { CHtmlFile2 htmlConvert; - CHtmlParams paramsHtml; + HTML::THTMLParameters paramsHtml; - htmlConvert.SetTmpDirectory(sTempDir); + htmlConvert.SetTempDirectory(sTempDir); if (styles) { @@ -3814,14 +3814,14 @@ void BinaryDocumentTableWriter::WriteAltChunk(OOX::Media& oAltChunkFile, OOX::CS } } - result = (S_OK == htmlConvert.OpenHtml(file_name_inp, sResultDocxDir, ¶msHtml)); + result = (S_OK == htmlConvert.ConvertHTML2OOXML(file_name_inp, sResultDocxDir, ¶msHtml)); }break; case AVS_OFFICESTUDIO_FILE_DOCUMENT_MHT: { CHtmlFile2 htmlConvert; - htmlConvert.SetTmpDirectory(sTempDir); + htmlConvert.SetTempDirectory(sTempDir); - result = (S_OK == htmlConvert.OpenMht(file_name_inp, sResultDocxDir)); + result = (S_OK == htmlConvert.ConvertMHT2OOXML(file_name_inp, sResultDocxDir)); }break; #endif case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX: diff --git a/X2tConverter/src/ASCConverters.h b/X2tConverter/src/ASCConverters.h index 086fa0a67e..732e60e9c5 100644 --- a/X2tConverter/src/ASCConverters.h +++ b/X2tConverter/src/ASCConverters.h @@ -202,6 +202,7 @@ namespace NExtractTools // mht DECLARE_CONVERT_FUNC(mht2docx_dir); + DECLARE_CONVERT_FUNC(mht2md); // epub DECLARE_CONVERT_FUNC(epub2docx_dir); diff --git a/X2tConverter/src/lib/html.h b/X2tConverter/src/lib/html.h index f1c1ab4aa9..a1b82beddb 100644 --- a/X2tConverter/src/lib/html.h +++ b/X2tConverter/src/lib/html.h @@ -84,7 +84,7 @@ namespace NExtractTools CHtmlFile2 oFile; oFile.SetTempDirectory(convertParams.m_sTempDir); - return (S_OK == oFile.OpenBatchHtml(arFiles, sTo)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; + return (S_OK == oFile.ConvertHTML2OOXML(arFiles, sTo)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; } _UINT32 html2docx_dir(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams) { @@ -130,7 +130,13 @@ namespace NExtractTools { CHtmlFile2 oFile; oFile.SetTempDirectory(convertParams.m_sTempDir); - return (S_OK == oFile.OpenMht(sFrom, sTo)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; + return (S_OK == oFile.ConvertMHT2OOXML(sFrom, sTo)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; + } + _UINT32 mht2md(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams) + { + CHtmlFile2 oFile; + oFile.SetTempDirectory(convertParams.m_sTempDir); + return (S_OK == oFile.ConvertMHT2Markdown(sFrom, sTo)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; } // epub _UINT32 epub2docx_dir(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams)