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

fix bug #54460

Browse Source
This commit is contained in:
Elena.Subbotina
2021-12-09 12:39:05 +03:00
parent 8293a06d40
commit 2e83d4e9c8
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
View File

@ -104,9 +104,20 @@ namespace PPTX
txXfrm = oReader;
else if (L"txbx" == strName || L"textbox" == strName)
{
WritingElement_ReadAttributes_Start(oReader)
WritingElement_ReadAttributes_Read_if(oReader, L"id", oTextBoxId)
WritingElement_ReadAttributes_End(oReader)
if (oReader.GetAttributesCount() > 0)
{
if (oReader.MoveToFirstAttribute())
{
std::wstring wsNameA = oReader.GetName();
while (wsNameA.empty())
{
if (L"id" == wsNameA) oTextBoxId = oReader.GetText();
if (!oReader.MoveToNextAttribute())
break;
wsNameA = oReader.GetName();
}
}
}
if ( oReader.IsEmptyNode() )
continue;
@ -281,7 +292,11 @@ namespace PPTX
bool bIsWritedBodyPr = false;
if (strTextBoxShape.is_init())
{
pWriter->WriteString(L"<wps:txbx>");
if (oTextBoxId.IsInit())
pWriter->WriteString(L"<wps:txbx id=\"" + std::to_wstring(*oTextBoxId) + L"\">");
else
pWriter->WriteString(L"<wps:txbx>");
//pWriter->WriteString(oTextBoxShape->toXML());
pWriter->WriteString(*strTextBoxShape);
pWriter->WriteString(L"</wps:txbx>");