pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #68252

Browse Source
This commit is contained in:
Kirill Polyakov
2024-06-17 17:50:50 +03:00
parent 23ef8fd8af
commit ff52afecc9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Common/3dParty/html/css/src/CCssCalculator_Private.cpp
View File

@ -516,14 +516,8 @@ namespace NSCSS
{
oStyle.AddParent(arSelectors[i].m_wsName);
// Скидываем некоторые внешние стили, которые внутри таблицы переопределяются
if (L"table" == arSelectors[i].m_wsName)
{
oStyle.m_oFont.GetLineHeight().Clear();
oStyle.m_oPadding.Clear();
oStyle.m_oMargin.Clear();
bInTable = true;
}
if (!bInTable)
bInTable = IsTableElement(arSelectors[i].m_wsName);
if (bInTable)
{
@ -531,8 +525,6 @@ namespace NSCSS
oStyle.m_oBorder.Clear();
}
bInTable = IsTableElement(arSelectors[i].m_wsName);
CCompiledStyle oTempStyle;
oTempStyle.AddStyle(arSelectors[i].m_mAttributes, i + 1);
@ -559,6 +551,14 @@ namespace NSCSS
oTempStyle.AddStyle(arSelectors[i].m_wsStyle, i + 1, true);
oStyle += oTempStyle;
// Скидываем некоторые внешние стили, которые внутри таблицы переопределяются
if (bInTable && i < arSelectors.size() - 1)
{
oStyle.m_oFont.GetLineHeight().Clear();
oStyle.m_oPadding.Clear();
oStyle.m_oMargin.Clear();
}
}
oStyle.SetID(arSelectors.back().m_wsName + ((!arSelectors.back().m_wsClass.empty()) ? L'.' + arSelectors.back().m_wsClass : L"") + ((arSelectors.back().m_wsId.empty()) ? L"" : L'#' + arSelectors.back().m_wsId) + L'-' + std::to_wstring(++m_nCountNodes));