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

ooxml strict ole

Browse Source
This commit is contained in:
ElenaSubbotina
2020-11-05 15:12:58 +03:00
parent 3be538f3d2
commit ececaee42b
6 changed files with 520 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View File

@ -1122,69 +1122,7 @@ PPTX::Logic::SpTreeElem CDrawingConverter::ObjectFromXml(const std::wstring& sXm
{
if (strName == L"drawing")
{
XmlUtils::CXmlNode oNodeAnchorInline = oParseNode.ReadNodeNoNS(L"anchor");
if (!oNodeAnchorInline.IsValid())
{
oNodeAnchorInline = oParseNode.ReadNodeNoNS(L"inline");
}
if (oNodeAnchorInline.IsValid())
{
XmlUtils::CXmlNode oNodeExt;
m_pBinaryWriter->m_lXCurShape = 0;
m_pBinaryWriter->m_lYCurShape = 0;
if (oNodeAnchorInline.GetNode(L"wp:extent", oNodeExt))
{
m_pBinaryWriter->m_lCxCurShape = oNodeExt.ReadAttributeInt(L"cx");
m_pBinaryWriter->m_lCyCurShape = oNodeExt.ReadAttributeInt(L"cy");
}
XmlUtils::CXmlNode oNodeDocPr;
if (oNodeAnchorInline.GetNode(L"wp:docPr", oNodeDocPr))
{//vml shapes without id .. reset all id
oNodeDocPr.SetAttributeInt(L"id", m_lNextId++);
}
SendMainProps(oNodeAnchorInline.GetXml(), ppMainProps);
XmlUtils::CXmlNode oNodeGraphic = oNodeAnchorInline.ReadNodeNoNS(L"graphic");
XmlUtils::CXmlNode oNodeGraphicData = oNodeGraphic.ReadNodeNoNS(L"graphicData");
if (oNodeGraphicData.IsValid())
{
XmlUtils::CXmlNodes oChilds;
oNodeGraphicData.GetNodes(L"*", oChilds);
if (1 == oChilds.GetCount())
{
XmlUtils::CXmlNode oNodeContent;
oChilds.GetAt(0, oNodeContent);
if (L"dgm:relIds" == oNodeContent.GetName() && m_pBinaryWriter->m_pCurrentContainer->is_init())
{
doc_LoadDiagram(&oElem, oNodeContent, ppMainProps, true);
}
else if (L"wpc:wpc" == oNodeContent.GetName())
{
PPTX::Logic::SpTree* pTree = new PPTX::Logic::SpTree();
pTree->grpSpPr.xfrm = new PPTX::Logic::Xfrm();
pTree->grpSpPr.xfrm->offX = m_pBinaryWriter->m_lXCurShape;
pTree->grpSpPr.xfrm->offY = m_pBinaryWriter->m_lYCurShape;
pTree->grpSpPr.xfrm->extX = m_pBinaryWriter->m_lCxCurShape;
pTree->grpSpPr.xfrm->extY = m_pBinaryWriter->m_lCyCurShape;
pTree->fromXML(oNodeContent);
oElem.InitElem(pTree);
}
else
{
oElem = oNodeContent;
}
}
}
}
doc_LoadDrawing(&oElem, oParseNode, ppMainProps, true);
break;
}
else if (strName == L"background")
@ -1244,7 +1182,7 @@ PPTX::Logic::SpTreeElem CDrawingConverter::ObjectFromXml(const std::wstring& sXm
#endif
}
}
else if (L"OLEObject" == strNameP)
else if (L"OLEObject" == strNameP || L"objectEmbed" == strNameP)
{
pOle = new PPTX::Logic::COLEObject();
pOle->fromXML(oNodeP);
@ -1263,6 +1201,10 @@ PPTX::Logic::SpTreeElem CDrawingConverter::ObjectFromXml(const std::wstring& sXm
#endif
}
}
else if (L"drawing" == strNameP)
{
doc_LoadDrawing(pElem, oNodeP, ppMainProps, true);
}
else
{
continue;
@ -1287,8 +1229,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::ObjectFromXml(const std::wstring& sXm
if (!bImageOle)
oBlipFillNew.blip = new PPTX::Logic::Blip();
const PPTX::Logic::BlipFill& oBlipFill = bImageOle ? pShape->spPr.Fill.Fill.as<PPTX::Logic::BlipFill>() :
oBlipFillNew;
const PPTX::Logic::BlipFill& oBlipFill = bImageOle ? pShape->spPr.Fill.Fill.as<PPTX::Logic::BlipFill>() : oBlipFillNew;
if(oBlipFill.blip.IsInit())
{
if (pOle->m_OleObjectFile.IsInit())
@ -1598,7 +1540,7 @@ bool CDrawingConverter::ParceObject(const std::wstring& strXml, std::wstring** p
doc_LoadShape(pElem, oNodeP, pMainProps, true);
}
}
else if (L"OLEObject" == strNameP)
else if (L"OLEObject" == strNameP || L"objectEmbed" == strNameP)
{
pOle = new PPTX::Logic::COLEObject();
pOle->fromXML(oNodeP);
@ -1611,6 +1553,14 @@ bool CDrawingConverter::ParceObject(const std::wstring& strXml, std::wstring** p
doc_LoadGroup(pElem, oNodeP, pMainProps, true);
}
}
else if (L"drawing" == strNameP)
{
if (NULL == pElem)
{
pElem = new PPTX::Logic::SpTreeElem;
doc_LoadDrawing(pElem, oNodeP, pMainProps, true);
}
}
else
{
continue;
@ -1785,7 +1735,74 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
}
}
void CDrawingConverter::doc_LoadDrawing(PPTX::Logic::SpTreeElem *elem, XmlUtils::CXmlNode& oNodeShape, std::wstring**& pMainProps, bool bIsTop)
{
if (!elem) return;
XmlUtils::CXmlNode oNodeAnchorInline = oNodeShape.ReadNodeNoNS(L"anchor");
if (!oNodeAnchorInline.IsValid())
{
oNodeAnchorInline = oNodeShape.ReadNodeNoNS(L"inline");
}
if (oNodeAnchorInline.IsValid())
{
XmlUtils::CXmlNode oNodeExt;
m_pBinaryWriter->m_lXCurShape = 0;
m_pBinaryWriter->m_lYCurShape = 0;
if (oNodeAnchorInline.GetNode(L"wp:extent", oNodeExt))
{
m_pBinaryWriter->m_lCxCurShape = oNodeExt.ReadAttributeInt(L"cx");
m_pBinaryWriter->m_lCyCurShape = oNodeExt.ReadAttributeInt(L"cy");
}
XmlUtils::CXmlNode oNodeDocPr;
if (oNodeAnchorInline.GetNode(L"wp:docPr", oNodeDocPr))
{//vml shapes without id .. reset all id
oNodeDocPr.SetAttributeInt(L"id", m_lNextId++);
}
SendMainProps(oNodeAnchorInline.GetXml(), pMainProps);
XmlUtils::CXmlNode oNodeGraphic = oNodeAnchorInline.ReadNodeNoNS(L"graphic");
XmlUtils::CXmlNode oNodeGraphicData = oNodeGraphic.ReadNodeNoNS(L"graphicData");
if (oNodeGraphicData.IsValid())
{
XmlUtils::CXmlNodes oChilds;
oNodeGraphicData.GetNodes(L"*", oChilds);
if (1 == oChilds.GetCount())
{
XmlUtils::CXmlNode oNodeContent;
oChilds.GetAt(0, oNodeContent);
if (L"dgm:relIds" == oNodeContent.GetName() && m_pBinaryWriter->m_pCurrentContainer->is_init())
{
doc_LoadDiagram(elem, oNodeContent, pMainProps, true);
}
else if (L"wpc:wpc" == oNodeContent.GetName())
{
PPTX::Logic::SpTree* pTree = new PPTX::Logic::SpTree();
pTree->grpSpPr.xfrm = new PPTX::Logic::Xfrm();
pTree->grpSpPr.xfrm->offX = m_pBinaryWriter->m_lXCurShape;
pTree->grpSpPr.xfrm->offY = m_pBinaryWriter->m_lYCurShape;
pTree->grpSpPr.xfrm->extX = m_pBinaryWriter->m_lCxCurShape;
pTree->grpSpPr.xfrm->extY = m_pBinaryWriter->m_lCyCurShape;
pTree->fromXML(oNodeContent);
elem->InitElem(pTree);
}
else
{
elem->fromXML(oNodeContent);
}
}
}
}
}
void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::CXmlNode& oNodeShape, std::wstring**& pMainProps,bool bIsTop)
{
if (!elem) return;

1
ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
View File

@ -278,6 +278,7 @@ namespace NSBinPptxRW
void doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtils::CXmlNode& oNode, std::wstring**& pMainProps, bool bIsTop = true);
void doc_LoadShape (PPTX::Logic::SpTreeElem *result, XmlUtils::CXmlNode& oNode, std::wstring**& pMainProps, bool bIsTop = true);
void doc_LoadGroup (PPTX::Logic::SpTreeElem *result, XmlUtils::CXmlNode& oNode, std::wstring**& pMainProps, bool bIsTop = true);
void doc_LoadDrawing(PPTX::Logic::SpTreeElem *result, XmlUtils::CXmlNode& oNode, std::wstring**& pMainProps, bool bIsTop = true);
std::wstring GetVMLShapeXml (CPPTShape* pPPTShape);
std::wstring GetVMLShapeXml (PPTX::Logic::SpTreeElem& oElem);

4
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
View File

@ -77,6 +77,10 @@ namespace PPTX
XmlMacroReadAttributeBase(node, L"Type", m_oType);
XmlMacroReadAttributeBase(node, L"UpdateMode", m_oUpdateMode);
XmlMacroReadAttributeBase(node, L"w:drawAspect", m_oDrawAspect);
XmlMacroReadAttributeBase(node, L"w:progId", m_sProgId);
XmlMacroReadAttributeBase(node, L"w:shapeId", m_sShapeId);
if (false == m_oId.IsInit())
{
XmlMacroReadAttributeBase( node, L"relationships:id", m_oId );

2
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXShapeReader.cpp
View File

@ -1516,7 +1516,7 @@ bool OOXShapeReader::ParseVmlObject ( ReaderParameter oParam , RtfShapePtr& pOut
pOutput->m_pOleObject = RtfOlePtr(new RtfOle());
if( vmlOLE->m_sProgId.IsInit() )
pOutput->m_pOleObject->m_sOleClass = vmlOLE->m_sProgId.get2();
pOutput->m_pOleObject->m_sOleClass = vmlOLE->m_sProgId.get();
if(vmlOLE->m_oType.IsInit())
{

14
Common/DocxFormat/Source/DocxFormat/Logic/Pict.h
View File

@ -31,13 +31,9 @@
*/
#pragma once
#include "../../Base/Nullable.h"
#include "../Drawing/Drawing.h"
#include "../../Common/SimpleTypes_Word.h"
#include "../WritingElement.h"
#include "../RId.h"
#include "VmlOfficeDrawing.h"
#include "Vml.h"
@ -717,8 +713,13 @@ namespace OOX
break;
}
case 'w':
if ( _T("w:control") == sName )
if (L"w:control" == sName )
m_oControl = oSubReader;
else if (L"w:objectEmbed" == sName)
m_oOleObject = oSubReader;
else if (L"w:drawing" == sName)
m_oDrawing = oSubReader;
break;
}
@ -744,6 +745,7 @@ namespace OOX
nullable_int m_oDyaOrig;
nullable<OOX::Logic::CControl> m_oControl;
nullable<OOX::Logic::CDrawing> m_oDrawing;
nullable<OOX::Vml::CShapeType> m_oShapeType;
nullable<OOX::VmlOffice::COLEObject> m_oOleObject;

928
Common/DocxFormat/Source/DocxFormat/Logic/VmlOfficeDrawing.h
View File

File diff suppressed because it is too large Load Diff