From 5aa6386249b4638d976f679176c0af345c832d32 Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Thu, 8 Dec 2022 17:39:56 +0300 Subject: [PATCH] Fix bug 60054 --- OOXML/DocxFormat/Media/ActiveX.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OOXML/DocxFormat/Media/ActiveX.h b/OOXML/DocxFormat/Media/ActiveX.h index bcbbce7570..433cd71262 100644 --- a/OOXML/DocxFormat/Media/ActiveX.h +++ b/OOXML/DocxFormat/Media/ActiveX.h @@ -53,6 +53,7 @@ namespace OOX { public: ActiveXObject() {} + virtual ~ActiveXObject() {} static ActiveXObject* Create(const std::wstring &class_id); static ActiveXObject* Create(_UINT16 type); virtual void Parse(unsigned char* pData, DWORD size) = 0; @@ -116,6 +117,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectScroll); } + virtual ~ActiveXObjectScroll() {} virtual void Parse(unsigned char* pData, DWORD size); }; class ActiveXObjectButton : public ActiveXObject @@ -126,6 +128,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectButton); } + virtual ~ActiveXObjectButton() {} virtual void Parse(unsigned char* pData, DWORD size); }; class ActiveXObjectImage : public ActiveXObject @@ -136,6 +139,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectImage); } + virtual ~ActiveXObjectImage() {} virtual void Parse(unsigned char* pData, DWORD size); virtual std::wstring toXml(); @@ -153,6 +157,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectLabel); } + virtual ~ActiveXObjectLabel() {} virtual void Parse(unsigned char* pData, DWORD size); }; class ActiveXObjectSpin : public ActiveXObject @@ -163,6 +168,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectSpin); } + virtual ~ActiveXObjectSpin() {} virtual void Parse(unsigned char* pData, DWORD size); }; @@ -174,6 +180,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectDialog); } + virtual ~ActiveXObjectFormControl() {} virtual void Parse(unsigned char* pData, DWORD size); // FormDataBlock @@ -210,6 +217,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectGBox); } + virtual ~ActiveXObjectFrame() {} }; class ActiveXObjectMorphData : public ActiveXObject { @@ -222,6 +230,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(type); } + virtual ~ActiveXObjectMorphData() {} virtual void Parse(unsigned char* pData, DWORD size); }; class ActiveXObjectTabStrip : public ActiveXObject @@ -232,6 +241,7 @@ namespace OOX m_oObjectType.Init(); m_oObjectType->SetValue(SimpleTypes::Spreadsheet::objectTabStrip); } + virtual ~ActiveXObjectTabStrip() {} virtual void Parse(unsigned char* pData, DWORD size); virtual std::wstring toXml();