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

Added hwpx format to ASCConverter

Browse Source
This commit is contained in:
Green
2025-01-21 02:49:51 +03:00
parent 84042360ab
commit 9faa7fb69d
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
X2tConverter/src/ASCConverters.cpp
View File

@ -679,6 +679,10 @@ namespace NExtractTools
{
nRes = hwp2docx_dir(sFrom, sDocxDir, params, convertParams);
}
else if (AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX == nFormatFrom)
{
nRes = hwpx2docx_dir(sFrom, sDocxDir, params, convertParams);
}
else
nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;

4
X2tConverter/src/ASCConverters.h
View File

@ -278,6 +278,10 @@ namespace NExtractTools
DECLARE_CONVERT_FUNC(hwp2docx);
DECLARE_CONVERT_FUNC(hwp2docx_dir);
//HWPX
DECLARE_CONVERT_FUNC(hwpx2docx);
DECLARE_CONVERT_FUNC(hwpx2docx_dir);
//-------------------------------------------------------------------------------------------------------------------------------------------------
_UINT32 convertmailmerge(const InputParamsMailMerge& oMailMergeSend, const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams);

33
X2tConverter/src/lib/hwp.h
View File

@ -6,32 +6,39 @@
namespace NExtractTools
{
_UINT32 hwp2docx(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams)
_UINT32 hwp_file2docx(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams, bool bIsXmlFormat, bool bConvertToDir)
{
CHWPFile oFile(sFrom);
CHWPFile oFile;
oFile.SetTempDirectory(convertParams.m_sTempDir);
if (!oFile.Open() || !oFile.ConvertToOOXML(sTo))
{
oFile.Close();
if (((bIsXmlFormat && !oFile.OpenHWPX(sFrom)) ||
(!bIsXmlFormat && !oFile.OpenHWP(sFrom))) ||
((bConvertToDir && !oFile.ConvertToOOXML_Dir(sTo)) ||
(!bConvertToDir && !oFile.ConvertToOOXML(sTo))))
return AVS_FILEUTILS_ERROR_CONVERT;
}
return 0;
}
_UINT32 hwp2docx(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams)
{
return hwp_file2docx(sFrom, sTo, params, convertParams, false, false);
}
_UINT32 hwp2docx_dir(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams)
{
CHWPFile oFile(sFrom);
return hwp_file2docx(sFrom, sTo, params, convertParams, false, true);
}
if (!oFile.Open() || !oFile.ConvertToOOXML_Dir(sTo))
{
oFile.Close();
return AVS_FILEUTILS_ERROR_CONVERT;
}
_UINT32 hwpx2docx(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams)
{
return hwp_file2docx(sFrom, sTo, params, convertParams, true, false);
}
return 0;
_UINT32 hwpx2docx_dir(const std::wstring& sFrom, const std::wstring& sTo, InputParams& params, ConvertParams& convertParams)
{
return hwp_file2docx(sFrom, sTo, params, convertParams, true, true);
}
}