Merge branch 'hotfix/v4.1.2'

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -101,7 +101,6 @@ namespace PPTX
 								{
 									xfrm.Merge(pic->spPr.xfrm);
 								}
-								return;
 							}
 							XmlUtils::CXmlNode oNode3 = oNodeData.ReadNodeNoNS(_T("AlternateContent"));
 							if (oNode3.IsValid())

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -128,13 +128,21 @@ namespace PPTX
 		void COLEObject::toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
 		{
 			std::wstring sData;
-			if(m_oId.IsInit() && m_sProgId.IsInit() && 0 == m_sProgId.get().Find(L"asc."))
+			if((m_oId.IsInit() || m_sFilepathBin.IsInit()) && m_sProgId.IsInit() && 0 == m_sProgId.get().Find(L"asc."))
 			{
-				FileContainer* pRels = NULL;
-				if (pWriter->m_pCommonRels->is_init())
-					pRels = pWriter->m_pCommonRels->operator ->();
+				CString sFilePath;
+				if (m_sFilepathBin.IsInit())
+				{
+					sFilePath = m_sFilepathBin.get();
+				}
+				else if (m_oId.IsInit())
+				{
+					FileContainer* pRels = NULL;
+					if (pWriter->m_pCommonRels->is_init())
+						pRels = pWriter->m_pCommonRels->operator ->();
 
-				CString sFilePath = this->GetFullOleName(PPTX::RId(m_oId.get()), pRels);
+					sFilePath = this->GetFullOleName(PPTX::RId(m_oId.get()), pRels);
+				}
 				if(!sFilePath.IsEmpty())
 				{
 					sData = GetOleData(string2std_string(sFilePath));
@@ -338,6 +346,8 @@ namespace PPTX
 			spPr.SetParentPointer(this);
 			if (style.IsInit())
 				style->SetParentPointer(this);
+			if (oleObject.IsInit())
+				oleObject->SetParentPointer(this);
 		}
 
 		void Pic::GetRect(Aggplus::RECT& pRect)const

Common/DocxFormat/Source/XlsxFormat/Ole/OleObjects.h

@@ -297,7 +297,6 @@ namespace OOX
 										{
 											delete pOleObject;
 										}
-										m_mapOleObjects[pOleObject->m_oShapeId->GetValue()] = pOleObject;
 									}
 								}
 							}

Readme.md

 
-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)    ![Release](https://img.shields.io/badge/Release-v4.1.1-blue.svg?style=flat)  ![x2tconverter](https://img.shields.io/badge/x2tconverter-v2.0.2.376-blue.svg?style=flat) ![Platforms Windows | OS X | Linux](https://img.shields.io/badge/Platforms-Windows%20%7C%20OS%20X%20%7C%20Linux%20-lightgray.svg?style=flat)
+[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)    ![Release](https://img.shields.io/badge/Release-v4.1.2-blue.svg?style=flat)  ![x2tconverter](https://img.shields.io/badge/x2tconverter-v2.0.2.376-blue.svg?style=flat) ![Platforms Windows | OS X | Linux](https://img.shields.io/badge/Platforms-Windows%20%7C%20OS%20X%20%7C%20Linux%20-lightgray.svg?style=flat)
 
 ## Core
 Server core components which are a part of [ONLYOFFICE Document Server][2]. Enable the conversion between the most popular office document formats: DOC, DOCX, ODT, RTF, TXT, PDF, HTML, EPUB, XPS, DjVu, XLS, XLSX, ODS, CSV, PPT, PPTX, ODP.