pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 09:55:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Kirill Polyakov
2026-02-10 03:36:23 +03:00
parent 098d40d44f
commit b850450c25
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HtmlFile2/Common.h
View File

@ -2,7 +2,7 @@
#define COMMON_H
#include <string>
#include "../../DesktopEditor/common/StringBuilder.h"
#include "../DesktopEditor/common/StringBuilder.h"
namespace HTML
{

4
HtmlFile2/HTMLReader.cpp
View File

@ -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 <boost/tuple/tuple.hpp>

2
HtmlFile2/HTMLReader.h
View File

@ -1,6 +1,8 @@
#ifndef HTMLREADER_H
#define HTMLREADER_H
#include <unordered_map>
#include "../Common/3dParty/html/css/src/CCssCalculator.h"
#include "../DesktopEditor/xml/include/xmlutils.h"

10
OOXML/Binary/Document/BinWriter/BinaryWriterD.cpp
View File

@ -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, &paramsHtml));
result = (S_OK == htmlConvert.ConvertHTML2OOXML(file_name_inp, sResultDocxDir, &paramsHtml));
}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:

1
X2tConverter/src/ASCConverters.h
View File

@ -202,6 +202,7 @@ namespace NExtractTools
// mht
DECLARE_CONVERT_FUNC(mht2docx_dir);
DECLARE_CONVERT_FUNC(mht2md);
// epub
DECLARE_CONVERT_FUNC(epub2docx_dir);

10
X2tConverter/src/lib/html.h
View File

@ -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)