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

Fixed some inaccuracies in the conversion of html tables

Browse Source
This commit is contained in:
Kirill Polyakov
2024-02-08 18:55:17 +03:00
parent 7e5da0b22c
commit a7a80cb92e
5 changed files with 153 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Common/3dParty/html/css/src/StyleProperties.cpp
View File

@ -252,6 +252,16 @@ namespace NSCSS
return (std::abs(oDigit.m_oValue - m_oValue) <= DBL_EPSILON);
}
bool CDigit::operator!=(const double &oValue) const
{
return (std::abs(oValue - m_oValue) > DBL_EPSILON);
}
bool CDigit::operator!=(const CDigit &oDigit) const
{
return (std::abs(oDigit.m_oValue - m_oValue) > DBL_EPSILON);
}
CDigit CDigit::operator+(const CDigit &oDigit) const
{
CDigit oTemp;
@ -1343,7 +1353,12 @@ namespace NSCSS
wsNewValue.replace(unFoundPos, oAbsValue.first.length(), oAbsValue.second);
}
return m_oWidth.SetValue(wsNewValue, unLevel, bHardMode);
const bool bResult = m_oWidth.SetValue(wsNewValue, unLevel, bHardMode);
if (m_oWidth != 1.)
m_oWidth += 1.;
return bResult;
}
bool CBorderSide::SetStyle(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
@ -1434,34 +1449,50 @@ namespace NSCSS
bool CBorder::SetSides(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
{
return m_oLeft .SetValue(wsValue, unLevel, bHardMode) ||
m_oTop .SetValue(wsValue, unLevel, bHardMode) ||
m_oRight .SetValue(wsValue, unLevel, bHardMode) ||
m_oBottom.SetValue(wsValue, unLevel, bHardMode);
bool bResult = false;
if (m_oLeft .SetValue(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oTop .SetValue(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oRight .SetValue(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oBottom.SetValue(wsValue, unLevel, bHardMode)) bResult = true;
return bResult;
}
bool CBorder::SetWidth(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
{
return m_oLeft .SetWidth(wsValue, unLevel, bHardMode) ||
m_oTop .SetWidth(wsValue, unLevel, bHardMode) ||
m_oRight .SetWidth(wsValue, unLevel, bHardMode) ||
m_oBottom.SetWidth(wsValue, unLevel, bHardMode);
bool bResult = false;
if (m_oLeft .SetWidth(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oTop .SetWidth(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oRight .SetWidth(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oBottom.SetWidth(wsValue, unLevel, bHardMode)) bResult = true;
return bResult;
}
bool CBorder::SetStyle(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
{
return m_oLeft .SetStyle(wsValue, unLevel, bHardMode) ||
m_oTop .SetStyle(wsValue, unLevel, bHardMode) ||
m_oRight .SetStyle(wsValue, unLevel, bHardMode) ||
m_oBottom.SetStyle(wsValue, unLevel, bHardMode);
bool bResult = false;
if (m_oLeft .SetStyle(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oTop .SetStyle(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oRight .SetStyle(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oBottom.SetStyle(wsValue, unLevel, bHardMode)) bResult = true;
return bResult;
}
bool CBorder::SetColor(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)
{
return m_oLeft .SetColor(wsValue, unLevel, bHardMode) ||
m_oTop .SetColor(wsValue, unLevel, bHardMode) ||
m_oRight .SetColor(wsValue, unLevel, bHardMode) ||
m_oBottom.SetColor(wsValue, unLevel, bHardMode);
bool bResult = false;
if (m_oLeft .SetColor(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oTop .SetColor(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oRight .SetColor(wsValue, unLevel, bHardMode)) bResult = true;
if (m_oBottom.SetColor(wsValue, unLevel, bHardMode)) bResult = true;
return bResult;
}
bool CBorder::SetLeftSide(const std::wstring &wsValue, unsigned int unLevel, bool bHardMode)

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

@ -144,6 +144,9 @@ namespace NSCSS
bool operator==(const double& oValue) const;
bool operator==(const CDigit& oDigit) const;
bool operator!=(const double& oValue) const;
bool operator!=(const CDigit& oDigit) const;
CDigit operator+(const CDigit& oDigit) const;
CDigit operator-(const CDigit& oDigit) const;
CDigit operator*(const CDigit& oDigit) const;

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

@ -424,7 +424,7 @@ namespace NSCSS
{
std::wstring wsColor = oBorder.GetColor().ToWString();
std::wstring wsStyle = oBorder.GetStyle().ToWString();
std::wstring wsWidth = oBorder.GetWidth().ToWString();
double dWidth = oBorder.GetWidth().ToDouble(Point) * 8; // Так как значение указано в восьмых долях точки
if (wsColor.empty())
wsColor = L"auto";
@ -432,10 +432,10 @@ namespace NSCSS
if (wsStyle.empty())
wsStyle = L"single";
if (wsWidth.empty())
wsWidth = L"1";
if (1 > dWidth)
dWidth = 1;
return L"w:color=\"" + wsColor + L"\" w:space=\"0\" w:sz=\"" + wsWidth + L"\" w:val=\"" + wsStyle + L"\"";
return L"w:val=\"" + wsStyle + L"\" w:sz=\"" + std::to_wstring(static_cast<int>(dWidth)) + + L"\" w:space=\"0\" w:color=\"" + wsColor + L"\"";
}
void CDocumentStyle::SetRStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement)