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 build

Browse Source
This commit is contained in:
Kirill Polyakov
2025-09-29 14:36:05 +03:00
parent 2cd69351c7
commit 4734d58ba6
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HwpFile/HwpDoc/Conversion/Transform.h
View File

@ -25,7 +25,7 @@ namespace Transform
inline std::wstring IntColorToHEX(int nColor)
{
wchar_t buffer[7];
std::swprintf(buffer, L"%02X%02X%02X", (nColor >> 16) & 0xFF, (nColor >> 8) & 0xFF, nColor & 0xFF);
std::swprintf(buffer, sizeof(buffer) / sizeof(wchar_t), L"%06X", nColor & 0xFFFFFF);
return std::wstring(buffer);
}

18
HwpFile/HwpDoc/Paragraph/CtrlShapePic.cpp
View File

@ -379,18 +379,16 @@ void CCtrlShapePic::ReadFromHWPML(CXMLReader &oReader)
{
if ("IMAGERECT" == sNodeName)
{
#define READ_POINT(point, index) (STR(##point##index) == sAttributeName) m_arBorderPoints[index].m_n##point = oReader.GetInt()
START_READ_ATTRIBUTES(oReader)
{
if READ_POINT(X, 0);
else if READ_POINT(Y, 0);
else if READ_POINT(X, 1);
else if READ_POINT(Y, 1);
else if READ_POINT(X, 2);
else if READ_POINT(Y, 2);
else if READ_POINT(X, 3);
else if READ_POINT(Y, 3);
if ("X0" == sAttributeName) m_arBorderPoints[0].m_nX = oReader.GetInt();
else if ("Y0" == sAttributeName) m_arBorderPoints[0].m_nY = oReader.GetInt();
else if ("X1" == sAttributeName) m_arBorderPoints[1].m_nX = oReader.GetInt();
else if ("Y1" == sAttributeName) m_arBorderPoints[1].m_nY = oReader.GetInt();
else if ("X2" == sAttributeName) m_arBorderPoints[2].m_nX = oReader.GetInt();
else if ("Y2" == sAttributeName) m_arBorderPoints[2].m_nY = oReader.GetInt();
else if ("X3" == sAttributeName) m_arBorderPoints[3].m_nX = oReader.GetInt();
else if ("Y3" == sAttributeName) m_arBorderPoints[3].m_nY = oReader.GetInt();
}
END_READ_ATTRIBUTES(oReader)
}