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 #77446

Browse Source
This commit is contained in:
Kirill Polyakov
2025-11-07 13:22:07 +03:00
parent 61b55c9230
commit 76b5bd594d
4 changed files with 11 additions and 7 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_Highlight,
R_Shd, R_Shd,
R_SmallCaps, R_SmallCaps,
R_Kern R_Kern,
R_Vanish
} RunnerProperties; } RunnerProperties;
typedef enum typedef enum

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

@ -509,6 +509,9 @@ namespace NSCSS
else if (L"serif" == wsFontFamily) else if (L"serif" == wsFontFamily)
wsFontFamily = L"Times New Roman"; 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_RFonts, oStyle.m_oFont.GetFamily().ToWString());
oXmlElement.AddPropertiesInR(RProperties::R_I, oStyle.m_oFont.GetStyle().ToWString()); oXmlElement.AddPropertiesInR(RProperties::R_I, oStyle.m_oFont.GetStyle().ToWString());
oXmlElement.AddPropertiesInR(RProperties::R_B, oStyle.m_oFont.GetWeight().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"\"/>"; sRStyle += L"<w:kern w:val=\"" + oItem.second + L"\"/>";
break; break;
} }
case CSSProperties::RunnerProperties::R_Vanish:
{
if (oItem.second == L"true")
sRStyle += L"<w:vanish/>";
break;
}
default: default:
break; break;
} }

6
HtmlFile2/htmlfile2.cpp
View File

@ -3059,12 +3059,6 @@ private:
std::wstring sNote = GetSubClass(oXml, sSelectors); std::wstring sNote = GetSubClass(oXml, sSelectors);
if (NULL != sSelectors.back().m_pCompiledStyle && L"none" == sSelectors.back().m_pCompiledStyle->m_oDisplay.GetDisplay().ToWString())
{
sSelectors.pop_back();
return false;
}
bool bResult = true; bool bResult = true;
const HtmlTag eHtmlTag{GetHtmlTag(sName)}; const HtmlTag eHtmlTag{GetHtmlTag(sName)};