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

Browse Source 
Fixed a problem with the order of applying styles
This commit is contained in:
Kirill Poljakov
2022-07-26 14:57:43 +03:00
parent d53184868d
commit 2cf3c85d67
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,7 +498,7 @@ namespace NSCSS
std::sort(arFindElements.rbegin(), arFindElements.rend(),
[](CElement* oFirstElement, CElement* oSecondElement)
{
return oFirstElement->GetWeight() < oSecondElement->GetWeight();
return oFirstElement->GetWeight() > oSecondElement->GetWeight();
});
}

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

@ -1515,7 +1515,7 @@ namespace NSCSS
void SetAlign(const std::wstring& sAlign, const unsigned int& unLevel, const bool& bHardMode = false)
{
if (sAlign.empty() || (bImportants[1] && !bHardMode) || unLevel <= arLevels[1])
if (sAlign.empty() || (bImportants[1] && !bHardMode) || unLevel < arLevels[1])
return;
if (sAlign == L"center")

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

@ -121,7 +121,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_UiPriority, L"9");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"h1");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_B, L"bold");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Sz, L"44");
}
@ -135,7 +135,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"h2");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_B, L"bold");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Sz, L"33");
}
@ -149,7 +149,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"h3");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_B, L"bold");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Sz, L"26");
}
@ -163,7 +163,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"h4");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_B, L"bold");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Sz, L"22");
}
@ -177,7 +177,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"h5");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_B, L"bold");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Sz, L"18");
}
@ -191,7 +191,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_UnhideWhenUsed, L"true");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"h6");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_B, L"bold");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Sz, L"15");
}
@ -203,7 +203,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Name, L"Paragraph character");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"p");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
}
else if (sNameDefaultElement == L"p")
{
@ -222,7 +222,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Name, L"Div character");
AddBasicProperties(NSCSS::NSConstValues::NSProperties::BasicProperties::B_Link, L"div");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
}
else if (sNameDefaultElement == L"div")
{
@ -243,7 +243,7 @@ void CXmlElement::CreateDefaultElement(const std::wstring& sNameDefaultElement)
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_Color, L"0000FF");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_U, L"single");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Arial\"");
AddPropertiesInR(NSCSS::NSConstValues::NSProperties::RunnerProperties::R_RFonts, L"\"Times New Roman\"");
}
else if (sNameDefaultElement == L"a")
{