.

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);

DesktopEditor/common/BigInteger.h

@@ -410,7 +410,7 @@ private:
             }
 
             if (carry > 0)
-                temp.insert(0, 1, (carry+'0'));
+                temp.insert(0, 1, (char)(carry+'0'));
 
             temp.append((n1.length() - i - 1), '0'); // as like mult by 10, 100, 1000, 10000 and so on