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 bugs with tables in html to ooxml conversion

Browse Source
This commit is contained in:
Kirill Polyakov
2024-04-04 16:48:52 +03:00
parent c44aed0e9a
commit 463ca006ee
3 changed files with 259 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,6 +528,8 @@ namespace NSCSS
oStyle.m_oPadding.Clear();
}
oStyle.m_oBorder.Clear();
CCompiledStyle oTempStyle;
oTempStyle.AddStyle(arSelectors[i].m_mAttributes, i + 1);

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

@ -396,7 +396,27 @@ namespace NSCSS
std::wstring wsColor = oBorder.GetColor().ToWString();
std::wstring wsStyle = oBorder.GetStyle().ToWString();
double dWidth = oBorder.GetWidth().ToDouble(Point) * 8; // Так как значение указано в восьмых долях точки
int nWidth = static_cast<int>(std::round(oBorder.GetWidth().ToDouble(Point) * 8.));
if (nWidth <= 3)
nWidth = 2;
else if (nWidth <= 5)
nWidth = 4;
else if (nWidth <= 7)
nWidth = 6;
else if (nWidth <= 9)
nWidth = 8;
else if (nWidth <= 15)
nWidth = 12;
else if (nWidth <= 21)
nWidth = 18;
else if (nWidth <= 29)
nWidth = 24;
else if (nWidth <= 41)
nWidth = 36;
else
nWidth = 48;
if (wsColor.empty())
wsColor = L"auto";
@ -404,7 +424,7 @@ namespace NSCSS
if (wsStyle.empty())
wsStyle = L"single";
return L"w:val=\"" + wsStyle + L"\" w:sz=\"" + std::to_wstring(static_cast<int>(dWidth)) + + L"\" w:space=\"0\" w:color=\"" + wsColor + L"\"";
return L"w:val=\"" + wsStyle + L"\" w:sz=\"" + std::to_wstring(nWidth) + + L"\" w:space=\"0\" w:color=\"" + wsColor + L"\"";
}
void CDocumentStyle::SetRStyle(const NSCSS::CCompiledStyle& oStyle, CXmlElement& oXmlElement)