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

Browse Source
This commit is contained in:
Elena.Subbotina
2023-01-19 10:37:08 +03:00
parent 457e4dadce
commit 6214f187e0
9 changed files with 206 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OdfFile/Writer/Converter/ConvertDrawing.cpp
View File

@ -1409,7 +1409,7 @@ void OoxConverter::convert(PPTX::Logic::UniColor * color, std::wstring & hexStri
if (nARGB != 0)
{
hexString = XmlUtils::ToString(nARGB & 0x00FFFFFF, L"#%06X");
hexString = XmlUtils::ToString((unsigned int)(nARGB & 0x00FFFFFF), L"#%06X");
if ((nARGB >> 24) != 0xff)
{
@ -2577,7 +2577,7 @@ void OoxConverter::convert(PPTX::Logic::StyleRef *style_ref, int type)
if (style_ref->idx.IsInit() == false)
{
std::wstring hexColor = XmlUtils::ToString(nARGB & 0x00FFFFFF, L"#%06X");
std::wstring hexColor = XmlUtils::ToString((unsigned int)(nARGB & 0x00FFFFFF), L"#%06X");
_CP_OPT(double) opacity;
if ((nARGB >> 24) != 0xff)

2
OdfFile/Writer/Converter/DocxConverter.cpp
View File

@ -3427,7 +3427,7 @@ void DocxConverter::convert(SimpleTypes::CHexColor *color,
argb = HSL2RGB(dH, dS, dL);
}
std::wstring strColor = XmlUtils::ToString(argb & 0x00FFFFFF, L"#%06X");
std::wstring strColor = XmlUtils::ToString((unsigned int)(argb & 0x00FFFFFF), L"#%06X");
odf_color = odf_types::color(strColor);
}
}