fix 3135585.doc

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -232,7 +232,7 @@ namespace DocFileFormat
 
 				if (pShape->GetShapeType())
 				{
-					freeform					=	false;
+					freeform =	false;
 					m_pXmlWriter->WriteAttribute( _T("type"), (std::wstring(_T("#")) + VMLShapeTypeMapping::GenerateTypeId(pShape->GetShapeType())).c_str());
 				}
 
@@ -678,7 +678,7 @@ namespace DocFileFormat
 								break;
 							}
 						}break;	
-	// Word Art)
+	// Word Art
 					case gtextUNICODE:
 						{
 							std::wstring text = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op)/2);
@@ -1008,7 +1008,7 @@ namespace DocFileFormat
 
 				WriteEndShapeNode(pShape);
 		//ShapeType 
-				if (NULL != pShape->GetShapeType() && !m_isInlineShape) //bullete only???
+				if (NULL != pShape->GetShapeType()/* && !m_isInlineShape*/) //bullete only???
 				{
 					VMLShapeTypeMapping oXmlMapper(m_pXmlWriter);
 					pShape->GetShapeType()->Convert(&oXmlMapper);

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -3630,7 +3630,7 @@ void CDrawingConverter::CheckBrushShape(PPTX::Logic::SpTreeElem& oElem, XmlUtils
 				Gs_.pos = 100 * 1000;
 				pGradFill->GsLst.push_back( Gs_ );
 			}
-			if (pGradFill->GsLst.size() < 2)	//Sindicatum.docx
+			if (pGradFill->GsLst.size() == 1)	//Sindicatum.docx
 			{
 				PPTX::Logic::Gs Gs_; 
 				Gs_.pos = 0;

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h

@@ -223,37 +223,41 @@ public:
 				m_eType = (PPTShapes::ShapeType)id;	
 			}
 		}
-		//else
+		CString strAdj = oNodeShapeType.GetAttribute(_T("adj"));
+		if (strAdj != _T(""))
+			LoadAdjustValuesList(strAdj);
+
+		XmlUtils::CXmlNode oNodeGuides;
+		if (oNodeShapeType.GetNode(_T("v:formulas"), oNodeGuides))
 		{
-			CString strAdj = oNodeShapeType.GetAttribute(_T("adj"));
-			if (strAdj != _T(""))
-				LoadAdjustValuesList(strAdj);
+			LoadGuidesList(oNodeGuides.GetXml());
+		}
 
-			XmlUtils::CXmlNode oNodeGuides;
-			if (oNodeShapeType.GetNode(_T("v:formulas"), oNodeGuides))
-			{
-				LoadGuidesList(oNodeGuides.GetXml());
-			}
+		XmlUtils::CXmlNode oNodePath;
+		if (oNodeShapeType.GetNode(_T("v:path"), oNodePath))
+		{
+			CString strTextR = oNodePath.GetAttribute(_T("textboxrect"));
+			if (strTextR != _T(""))
+				LoadTextRect(strTextR);
+		}
 
-			XmlUtils::CXmlNode oNodePath;
-			if (oNodeShapeType.GetNode(_T("v:path"), oNodePath))
-			{
-				CString strTextR = oNodePath.GetAttribute(_T("textboxrect"));
-				if (strTextR != _T(""))
-					LoadTextRect(strTextR);
-			}
+		XmlUtils::CXmlNode oNodeAHs;
+		if (oNodeShapeType.GetNode(_T("v:handles"), oNodeAHs))
+		{
+			LoadAHList(oNodeAHs);
+		}
 
-			XmlUtils::CXmlNode oNodeAHs;
-			if (oNodeShapeType.GetNode(_T("v:handles"), oNodeAHs))
-			{
-				LoadAHList(oNodeAHs);
-			}
+		CString strPath = oNodeShapeType.GetAttribute(_T("path"));
+		if (strPath != _T(""))
+		{
+			LoadPathList(strPath);
+		}
 
-			CString strPath = oNodeShapeType.GetAttribute(_T("path"));
-			if (strPath != _T(""))
-			{
-				LoadPathList(strPath);
-			}
+		XmlUtils::CXmlNode oNodeTextPath;
+		if (oNodeShapeType.GetNode(_T("v:textpath"), oNodeTextPath))
+		{
+			if (m_eType < PPTShapes::ShapeType::sptCTextPlain || m_eType > PPTShapes::ShapeType::sptCTextCanDown)
+				m_eType = PPTShapes::ShapeType::sptCTextPlain;
 		}
 
 		CString strFilled = oNodeShapeType.GetAttribute(_T("filled"));