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 bug #73907

Browse Source
This commit is contained in:
Green
2025-05-12 17:42:12 +03:00
parent 05cef3635c
commit ea15b54837
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HtmlFile2/htmlfile2.cpp
View File

@ -1470,10 +1470,12 @@ private:
std::map<std::wstring, std::wstring> m_mFootnotes; // Сноски
std::map<std::wstring, UINT> m_mBookmarks; // Закладки
std::map<std::wstring, UINT> m_mDivs; // Div элементы
NSFonts::IApplicationFonts* m_pFonts; // Необходимо для оптимизации работы со шрифтами
public:
CHtmlFile2_Private()
: m_nFootnoteId(1), m_nHyperlinkId(1), m_nNumberingId(1), m_nId(1)
: m_nFootnoteId(1), m_nHyperlinkId(1), m_nNumberingId(1), m_nId(1), m_pFonts(NULL)
{
m_oPageData.SetSize (std::to_wstring(DEFAULT_PAGE_WIDTH) + L"tw " + std::to_wstring(DEFAULT_PAGE_HEIGHT) + L"tw", 0, true);
m_oPageData.SetMargin(L"1440tw 1440tw 1440tw 1440tw", 0, true);
@ -1493,6 +1495,9 @@ public:
m_oNoteXml .Clear();
m_oNumberXml .Clear();
m_oWebSettings .Clear();
if (NULL != m_pFonts)
RELEASEINTERFACE(m_pFonts);
}
// Проверяет наличие тэга html
@ -4565,14 +4570,13 @@ private:
if (wsSvg.empty())
return false;
NSFonts::IApplicationFonts* pFonts = NSFonts::NSApplication::Create();
pFonts->Initialize();
if (NULL == m_pFonts)
m_pFonts = NSFonts::NSApplication::Create();
MetaFile::IMetaFile* pSvgReader = MetaFile::Create(pFonts);
MetaFile::IMetaFile* pSvgReader = MetaFile::Create(m_pFonts);
if (!pSvgReader->LoadFromString(wsSvg))
{
RELEASEINTERFACE(pSvgReader);
RELEASEINTERFACE(pFonts);
return false;
}
@ -4652,7 +4656,6 @@ private:
free(pBgraData);
RELEASEINTERFACE(pSvgReader);
RELEASEINTERFACE(pFonts);
return true;
}