pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-15 21:49:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #75232

Browse Source
This commit is contained in:
ElenaSubbotina
2025-06-19 12:06:36 +03:00
parent 6d4ff364b3
commit cfdeca436b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RtfFile/Format/RtfProperty.cpp
View File

@ -463,13 +463,16 @@ std::wstring RtfColor::RenderToRtf(RenderParameter oRenderParameter )
std::wstring RtfColor::RenderToOOX(RenderParameter oRenderParameter)
{
std::wstring sResult;
oRenderParameter.sValue = ToHexColor();
if( RENDER_TO_OOX_PARAM_COLOR_VALUE == oRenderParameter.nType )
{
sResult += ToHexColor();
sResult += oRenderParameter.sValue;
}
else if( RENDER_TO_OOX_PARAM_COLOR_ATTRIBUTE == oRenderParameter.nType )
{
sResult += oRenderParameter.sValue;
sResult += L"w:color=\"" + oRenderParameter.sValue + L"\"";
}
else if( RENDER_TO_OOX_PARAM_COLOR_TAG == oRenderParameter.nType )
{
@ -481,7 +484,7 @@ std::wstring RtfColor::RenderToOOX(RenderParameter oRenderParameter)
}
else
{
sResult += L"<w:color w:val=\"" + ToHexColor() + L"\"/>";
sResult += L"<w:color w:val=\"" + oRenderParameter.sValue + L"\"/>";
}
return sResult;
}
@ -1755,7 +1758,7 @@ std::wstring RtfCharProperty::RenderToOOX(RenderParameter oRenderParameter)
if( PROP_DEF != m_nUnderlineColor )
{
RtfColor oCurColor;
if( true == poRtfDocument->m_oColorTable.GetColor( m_nUnderlineColor, oCurColor ) )
if ( true == poRtfDocument->m_oColorTable.GetColor( m_nUnderlineColor, oCurColor ) )
{
RenderParameter oNewParam = oRenderParameter;
oNewParam.nType = RENDER_TO_OOX_PARAM_COLOR_ATTRIBUTE;