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

Merge pull request 'Fix bug 59750' (#645) from fix/bug67390 into release/v9.3.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/645
This commit is contained in:
Elena Subbotina
2026-02-07 19:13:22 +00:00
parent 655bc0698f 3e09e5ad48
commit 8f5bfef6b2
1 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
MsBinaryFile/DocFile/CharacterPropertiesMapping.cpp
View File

@ -113,10 +113,46 @@ namespace DocFileFormat
{
//Todo сделать определение симольного шрифта через fontManager
//Заглушка под Google Docs, они пишут bullet в Arial
if (-1 != m_sAsciiFont.find (L"Arial") && -1 != m_sEastAsiaFont.find (L"Arial") && -1 != m_shAnsiFont.find (L"Arial"))
return false;
const std::wstring* fonts[] = {&m_sAsciiFont, &m_sEastAsiaFont, &m_shAnsiFont};
for (const auto& pFont : fonts)
{
if (!pFont->empty())
{
std::wstring fontLower = *pFont;
return true;
for (size_t i = 0; i < fontLower.length(); ++i)
fontLower[i] = towlower(fontLower[i]);
if (fontLower == L"symbol" ||
fontLower.find(L"wingdings") != std::wstring::npos ||
fontLower == L"webdings" ||
fontLower == L"marlett" ||
fontLower == L"mt extra" ||
fontLower.find(L"dingbats") != std::wstring::npos ||
fontLower.find(L"zapf") != std::wstring::npos)
{
return true;
}
if (fontLower.find(L"times") != std::wstring::npos ||
fontLower.find(L"arial") != std::wstring::npos ||
fontLower.find(L"courier") != std::wstring::npos ||
fontLower.find(L"calibri") != std::wstring::npos ||
fontLower.find(L"cambria") != std::wstring::npos ||
fontLower.find(L"georgia") != std::wstring::npos ||
fontLower.find(L"verdana") != std::wstring::npos ||
fontLower.find(L"tahoma") != std::wstring::npos ||
fontLower.find(L"helvetica") != std::wstring::npos ||
fontLower.find(L"segoe") != std::wstring::npos)
{
return false;
}
}
}
return true;
}
/*========================================================================================================*/