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

Fix bugs in HWPX/HWPML conversion and refactoring

Browse Source
This commit is contained in:
Green
2025-09-26 00:25:26 +03:00
parent b52dff617b
commit 49fc001aa3
30 changed files with 81 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HwpFile/HwpDoc/HWPXFile.cpp
View File

@ -34,15 +34,10 @@ bool CHWPXFile::Detect()
bool CHWPXFile::Open()
{
if (!NSFile::CFileBinary::Exists(m_sFileName))
if (!NSFile::CFileBinary::Exists(m_sFileName) || !Detect() || !ReadDocInfo())
return false;
if (m_oFileHeader.VersionEmpty() && !Detect())
return false;
std::vector<std::wstring> arPathToSections{GetPathsToSections()};
for (const std::wstring& wsPath : arPathToSections)
for (const std::wstring& wsPath : GetPathsToSections())
ReadSection(wsPath);
return true;
@ -143,21 +138,21 @@ bool CHWPXFile::GetChildStream(const HWP_STRING& sFileName, CHWPStream& oBuffer)
return true;
}
bool CHWPXFile::GetDocInfo(int nVersion)
bool CHWPXFile::ReadDocInfo()
{
CXMLReader oContentReader;
if (!GetDocument(L"Contents/content.hpf", oContentReader))
return false;
if (m_oDocInfo.ReadContentHpf(oContentReader, nVersion))
if (m_oDocInfo.ReadContentHpf(oContentReader))
{
CXMLReader oHeaderReader;
if (!GetDocument(L"Contents/header.xml", oHeaderReader))
return false;
return m_oDocInfo.Parse(oHeaderReader, nVersion);
return m_oDocInfo.ParseHWPX(oHeaderReader);
}
return false;