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

Add use fonts folder to builder

Browse Source
This commit is contained in:
Oleg Korshul
2025-07-24 14:50:08 +03:00
parent 3a555aa223
commit 8899966508
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DesktopEditor/doctrenderer/docbuilder_p.h
View File

@ -547,6 +547,7 @@ namespace NSDoctRenderer
CApplicationFontsWorker oWorker; CApplicationFontsWorker oWorker;
oWorker.m_bIsUseSystemFonts = m_oParams.m_bIsSystemFonts; oWorker.m_bIsUseSystemFonts = m_oParams.m_bIsSystemFonts;
oWorker.m_arAdditionalFolders = m_oParams.m_arFontDirs; oWorker.m_arAdditionalFolders = m_oParams.m_arFontDirs;
oWorker.m_arAdditionalFolders.push_back(NSFile::GetProcessDirectory() + L"/fonts");
oWorker.m_bIsNeedThumbnails = false; oWorker.m_bIsNeedThumbnails = false;
oWorker.m_sDirectory = sDirectory; oWorker.m_sDirectory = sDirectory;
// это не рабочая папка, где только шрифты // это не рабочая папка, где только шрифты

8
DesktopEditor/fontengine/ApplicationFontsWorker.cpp
View File

@ -1604,6 +1604,14 @@ NSFonts::IApplicationFonts* CApplicationFontsWorker::Check()
if (m_sDirectory.empty()) if (m_sDirectory.empty())
return NULL; return NULL;
for (std::vector<std::wstring>::iterator i = m_arAdditionalFolders.begin(); i != m_arAdditionalFolders.end(); i++)
{
if (0 == i->find(L"./"))
*i = NSFile::GetProcessDirectory() + L"/" + i->substr(2);
else if (0 == i->find(L"../"))
*i = NSFile::GetProcessDirectory() + L"/" + *i;
}
std::wstring strAllFontsJSPath = m_sDirectory + L"/AllFonts.js"; std::wstring strAllFontsJSPath = m_sDirectory + L"/AllFonts.js";
std::wstring strFontsSelectionBin = m_sDirectory + L"/font_selection.bin"; std::wstring strFontsSelectionBin = m_sDirectory + L"/font_selection.bin";