pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 03:08:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 80220

Browse Source
This commit is contained in:
Oleg.Korshul
2026-02-23 02:50:05 +03:00
parent e389b4d799
commit 5428c28874
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
HtmlFile2/HTMLReader.cpp
View File

@ -2,6 +2,7 @@
#include "../Common/Network/FileTransporter/include/FileTransporter.h"
#include "../DesktopEditor/common/File.h"
#include "../DesktopEditor/common/Directory.h"
#include "../DesktopEditor/common/Path.h"
#include "../Common/3dParty/html/htmltoxhtml.h"
@ -261,18 +262,22 @@ inline bool UnreadableNode(const std::wstring& wsNodeName);
inline bool TagIsUnprocessed(const std::wstring& wsTagName);
CHTMLReader::CHTMLReader()
: m_pWriter(nullptr)
: m_bIsTempDirOwner(true), m_pWriter(nullptr)
{}
CHTMLReader::~CHTMLReader()
{
if (nullptr != m_pWriter)
delete m_pWriter;
if (m_bIsTempDirOwner && !m_wsTempDirectory.empty())
NSDirectory::DeleteDirectory(m_wsTempDirectory);
}
void CHTMLReader::SetTempDirectory(const std::wstring& wsPath)
{
m_wsTempDirectory = wsPath;
m_bIsTempDirOwner = m_wsTempDirectory.empty();
}
void CHTMLReader::SetCoreDirectory(const std::wstring& wsPath)
@ -327,7 +332,6 @@ void CHTMLReader::Clear()
m_mTags.clear();
m_wsTempDirectory.clear();
m_wsSrcDirectory .clear();
m_wsDstDirectory .clear();
m_wsBaseDirectory.clear();
@ -503,6 +507,11 @@ bool CHTMLReader::Convert(const std::wstring& wsPath, Convert_Func Convertation)
if (nullptr == m_pWriter || !Convertation(wsPath, m_oLightReader) || !m_oLightReader.IsValid() || !IsHTML())
return false;
if (m_wsTempDirectory.empty())
{
m_wsTempDirectory = NSDirectory::CreateDirectoryWithUniqueName(NSDirectory::GetTempPath());
}
m_wsSrcDirectory = NSSystemPath::GetDirectoryName(wsPath);
m_oLightReader.MoveToStart();