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

fix bug #69775

Browse Source
This commit is contained in:
Elena Subbotina
2024-08-21 12:14:48 +03:00
parent f8e19a7f0b
commit 43f49b7a9d
2 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
MsBinaryFile/DocFile/OleObjectMapping.cpp
View File

@ -45,49 +45,47 @@ namespace DocFileFormat
void OleObjectMapping::Apply(IVisitable* visited)
{
OleObject* ole = static_cast<OleObject*>(visited);
OleObject* ole = dynamic_cast<OleObject*>(visited);
if (!ole) return;
if (ole->isEmbedded || ole->isPackage)
{
if (ole->isEquation) ole->ClipboardFormat = L"Equation";
else if (ole->ClipboardFormat.empty()) ole->ClipboardFormat = L"MSWordDocx";
if ( ole != NULL )
ole->Program = L"Word.Document";
}
m_pXmlWriter->WriteNodeBegin(L"o:OLEObject", TRUE);
int relID = -1;
if (ole->isLinked)
{
relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
m_pXmlWriter->WriteAttribute(L"Type", L"Link");
m_pXmlWriter->WriteAttribute(L"UpdateMode", ole->UpdateMode);
}
else
{
if (ole->isEmbedded || ole->isPackage)
{
if (ole->isEquation) ole->ClipboardFormat = L"Equation";
else if (ole->ClipboardFormat.empty()) ole->ClipboardFormat = L"MSWordDocx";
ole->Program = L"Word.Document";
}
m_pXmlWriter->WriteNodeBegin( L"o:OLEObject", TRUE );
int relID = -1;
if ( ole->isLinked)
{
relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
m_pXmlWriter->WriteAttribute( L"Type", L"Link" );
m_pXmlWriter->WriteAttribute( L"UpdateMode", ole->UpdateMode);
}
relID = m_context->_docx->RegisterPackage(_caller, ole->ClipboardFormat);
else
{
if (ole->isEmbedded || ole->isPackage)
relID = m_context->_docx->RegisterPackage(_caller, ole->ClipboardFormat);
else
relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat);
relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat);
m_pXmlWriter->WriteAttribute( L"Type", L"Embed" );
m_pXmlWriter->WriteAttribute(L"Type", L"Embed");
copyEmbeddedObject( ole );
}
m_pXmlWriter->WriteAttribute( L"ProgID", ole->Program);
m_pXmlWriter->WriteAttribute( L"ShapeID", _shapeId);
m_pXmlWriter->WriteAttribute( L"DrawAspect", L"Content" );
m_pXmlWriter->WriteAttribute( L"ObjectID", ole->ObjectId);
m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( L"o:OLEObject" );
copyEmbeddedObject(ole);
}
m_pXmlWriter->WriteAttribute(L"ProgID", ole->Program);
m_pXmlWriter->WriteAttribute(L"ShapeID", _shapeId);
m_pXmlWriter->WriteAttribute(L"DrawAspect", L"Content");
m_pXmlWriter->WriteAttribute(L"ObjectID", ole->ObjectId);
m_pXmlWriter->WriteAttribute(L"r:id", L"rId" + FormatUtils::IntToWideString(relID));
m_pXmlWriter->WriteNodeEnd(L"", TRUE, FALSE);
m_pXmlWriter->WriteNodeEnd(L"o:OLEObject");
}
std::wstring OleObjectMapping::GetTargetExt(const std::wstring& objectType)