From 511f043d63d3763c29dc3fbfec0780f1d8d04178 Mon Sep 17 00:00:00 2001
From: ElenaSubbotina <Elena.Subbotina@onlyoffice.com>
Date: Thu, 23 Nov 2017 14:26:49 +0300
Subject: [PATCH] .

---
 ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
index 439ebf8aed..f3d8f231b9 100644
--- a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
+++ b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
@@ -1687,6 +1687,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 
 	NSPresentationEditor::CShapeElement oShapeElem;
 	CPPTShape* pPPTShape = NULL;
+	bool bSetShape = false;
 
     if (L"v:background" == strNameNode)
     {
@@ -1885,6 +1886,7 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 			}			
 		}
 		oShapeElem.m_pShape->setBaseShape(CBaseShapePtr(pPPTShape));
+		bSetShape = true;
 		
 		if (bIsNeedCoordSizes)
 		{
@@ -1895,7 +1897,8 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 
 	if (pPPTShape != NULL)
 	{	
-		oShapeElem.m_pShape->setBaseShape(CBaseShapePtr(pPPTShape));
+		if (!bSetShape)
+			oShapeElem.m_pShape->setBaseShape(CBaseShapePtr(pPPTShape));
 		if (bIsNeedCoordSizes)
 		{
 			LoadCoordSize(oNodeShape, oShapeElem.m_pShape);