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 bugs' (#517) from fix/bug-77446 into release/v9.2.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/517
This commit is contained in:
Oleg Korshul
2025-11-10 12:46:20 +00:00
parent 27746f5c2b 5de19652f2
commit 52bf1a6988
6 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Common/3dParty/html/css/src/ConstValues.h
View File

@ -69,7 +69,8 @@ namespace NSCSS
R_Highlight,
R_Shd,
R_SmallCaps,
R_Kern
R_Kern,
R_Vanish
} RunnerProperties;
typedef enum

3
Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp
View File

@ -509,6 +509,9 @@ namespace NSCSS
else if (L"serif" == wsFontFamily)
wsFontFamily = L"Times New Roman";
if (oStyle.m_oDisplay.GetDisplay() == L"none")
oXmlElement.AddPropertiesInR(RProperties::R_Vanish, L"true");
oXmlElement.AddPropertiesInR(RProperties::R_RFonts, oStyle.m_oFont.GetFamily().ToWString());
oXmlElement.AddPropertiesInR(RProperties::R_I, oStyle.m_oFont.GetStyle().ToWString());
oXmlElement.AddPropertiesInR(RProperties::R_B, oStyle.m_oFont.GetWeight().ToWString());

6
Common/3dParty/html/css/src/xhtml/CXmlElement.cpp
View File

@ -473,6 +473,12 @@ std::wstring CXmlElement::ConvertRStyle(bool bIsLite) const
sRStyle += L"<w:kern w:val=\"" + oItem.second + L"\"/>";
break;
}
case CSSProperties::RunnerProperties::R_Vanish:
{
if (oItem.second == L"true")
sRStyle += L"<w:vanish/>";
break;
}
default:
break;
}