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 61632

Browse Source 
(cherry picked from commit b14b1a3f3e)
This commit is contained in:
Daria
2025-09-08 11:03:40 +03:00
parent 144399868b
commit dee37793f5
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
RtfFile/Format/RtfShape.cpp
View File

@ -1454,7 +1454,24 @@ std::wstring RtfShape::RenderToOOXBegin(RenderParameter oRenderParameter)
sShapeNodes += L" inset=\"" + std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpLeft)) + L"pt," sShapeNodes += L" inset=\"" + std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpLeft)) + L"pt,"
+ std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpTop)) + L"pt," + std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpTop)) + L"pt,"
+ std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpRight)) + L"pt," + std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpRight)) + L"pt,"
+ std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpBottom)) + L"pt\">"; + std::to_wstring((int)RtfUtility::Emu2Pt(m_nTexpBottom)) + L"pt\"";
if (m_nTxflTextFlow != PROP_DEF)
{
switch (m_nTxflTextFlow)
{
case 0:
break;
case 1:
sShapeNodes += L" style=\"mso-layout-flow-alt:vertical-ideographic\"";
break;
case 2:
sShapeNodes += L" style=\"mso-layout-flow-alt:vertical\"";
break;
default:
break;
}
}
sShapeNodes += L">";
} }
else else
sShapeNodes += L">"; sShapeNodes += L">";

10
RtfFile/OOXml/Reader/OOXParagraphElementReaders.cpp
View File

@ -971,15 +971,15 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
{ {
bool res = false; bool res = false;
OOX::Logic::CAlternateContent *ooxAlt = dynamic_cast<OOX::Logic::CAlternateContent* >(ooxItem); OOX::Logic::CAlternateContent *ooxAlt = dynamic_cast<OOX::Logic::CAlternateContent* >(ooxItem);
for (size_t i = 0; res == false && i < ooxAlt->m_arrChoiceItems.size(); i++)
{
res = Parse(oParam, oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrChoiceItems[i]);
}
for (size_t i = 0; res == false && i < ooxAlt->m_arrFallbackItems.size(); i++) for (size_t i = 0; res == false && i < ooxAlt->m_arrFallbackItems.size(); i++)
{ {
res = Parse(oParam, oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrFallbackItems[i]); res = Parse(oParam, oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrFallbackItems[i]);
} }
for (size_t i = 0; res == false && i < ooxAlt->m_arrChoiceItems.size(); i++)
{
res = Parse(oParam, oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrChoiceItems[i]);
}
}break; }break;
case OOX::et_w_sym: case OOX::et_w_sym: