diff --git a/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.cpp b/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.cpp
index 070a0b4fbd..8325ceda05 100644
--- a/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.cpp
+++ b/MsBinaryFile/Common/Vml/PPTShape/Ppt2PptxShapeConverter.cpp
@@ -49,7 +49,7 @@ namespace NSGuidesVML
 			point.x = lParam;
 			if (m_eRuler !=  rtRMoveTo && m_eRuler !=  rtRLineTo && m_eRuler !=  rtRCurveTo)
 			{
-				point.x -= m_lX;
+				//point.x -= m_lX;
 			}
 			point.y = 0;
 			pointType.x = eParType;
@@ -62,7 +62,7 @@ namespace NSGuidesVML
 			m_arPoints.back().y = lParam;
 			if (m_eRuler !=  rtRMoveTo && m_eRuler !=  rtRLineTo && m_eRuler !=  rtRCurveTo)
 			{
-				m_arPoints.back().y -= m_lY;
+				//m_arPoints.back().y -= m_lY;
 			}
 
 			m_arPointsType.back().y = eParType;
@@ -75,8 +75,10 @@ namespace NSGuidesVML
 		m_lIndexDst = 0;
 		m_lIndexSrc = -1;
 
-		m_lWidth	= 0;
-		m_lHeight	= 0;
+		//m_lWidth	= 0;
+		//m_lHeight	= 0;
+		m_lWidth	= ShapeSizeVML;
+		m_lHeight	= ShapeSizeVML;
 
 		m_lX = 0;
 		m_lY = 0;
@@ -258,15 +260,21 @@ namespace NSGuidesVML
 
 		for (size_t nIndex = 0; nIndex < oArray.size(); ++nIndex)
 		{
-			if (oPath.m_arParts.size() <= nIndex)
-				break;
-			const CPartPath& oPart = oPath.m_arParts[nIndex];
+			//if (oPath.m_arParts.size() <= nIndex)
+			//	break;
 
-			m_lWidth = oPart.width;
-			m_lHeight = oPart.height;
+			if (oArray[nIndex].empty()) continue;
 
-			m_lX = oPart.x;
-			m_lY = oPart.y;
+			if (nIndex < (int)oPath.m_arParts.size() )
+			{
+				const CPartPath& oPart = oPath.m_arParts[nIndex];
+
+				m_lWidth = oPart.width;
+				m_lHeight = oPart.height;
+
+				//m_lX = oPart.x;
+				//m_lY = oPart.y;
+			}
 
 			bool bFill = false;
 			bool bStroke = false;
@@ -278,10 +286,15 @@ namespace NSGuidesVML
 			m_oPathRes.WriteAttribute(L"w",  m_lWidth);
 			m_oPathRes.WriteAttribute(L"h",  m_lHeight);
 
-			if (!bStroke)
+			/*if (!bStroke)
 				m_oPathRes.WriteAttribute(L"stroke",  (std::wstring)L"false");
 			if (!bFill)
-				m_oPathRes.WriteAttribute(L"fill",  (std::wstring)L"none");
+				m_oPathRes.WriteAttribute(L"fill",  (std::wstring)L"none");*/
+
+			m_oPathRes.WriteAttribute(L"fill"		, std::wstring(bFill ? L"norm" : L"none"));
+			m_oPathRes.WriteAttribute(L"stroke"		, bStroke ? 1	: 0);
+			m_oPathRes.WriteAttribute(L"extrusionOk", 0);
+
 			m_oPathRes.EndAttributes();
 
 			for (size_t i = 0; i < m_arSlicesPath.size(); ++i)
diff --git a/MsBinaryFile/Common/Vml/VmlPath.cpp b/MsBinaryFile/Common/Vml/VmlPath.cpp
index 9aa74eb573..8d717346d5 100644
--- a/MsBinaryFile/Common/Vml/VmlPath.cpp
+++ b/MsBinaryFile/Common/Vml/VmlPath.cpp
@@ -66,6 +66,257 @@ namespace ODRAW
 		}
 		++m_nCountElementsPoint;
 	}
+	CSlice& CSlice::operator =(const CSlice& oSrc)
+	{
+		m_eRuler = oSrc.m_eRuler;
+		m_arPoints.clear();
+		for (size_t nIndex = 0; nIndex < oSrc.m_arPoints.size(); ++nIndex)
+		{
+			m_arPoints.push_back(oSrc.m_arPoints[nIndex]);
+		}
+		return (*this);
+	}
+	double CSlice::GetAngle(double fCentreX, double fCentreY, double fX, double fY)
+	{
+		//  -   + (..  )
+		double dX = fX - fCentreX;
+		double dY = fY - fCentreY;
+
+		double modDX = abs(dX);
+		double modDY = abs(dY);
+
+		if ((modDX < 0.01) && (modDY < 0.01))
+		{
+			return 0;
+		}
+		if ((modDX < 0.01) && (dY < 0))
+		{
+			return -90;
+		}
+		else if (modDX < 0.01)
+		{
+			return 90;
+		}
+		if ((modDY < 0.01) && (dX < 0))
+		{
+			return 180;
+		}
+		else if (modDY < 0.01)
+		{
+			return 0;
+		}
+
+		double fAngle = atan(dY / dX);
+		fAngle *= (180 / M_PI);
+		if (dX > 0 && dY > 0)
+		{
+			return fAngle;
+		}
+		else if (dX > 0 && dY < 0)
+		{
+			return fAngle;
+		}
+		else if (dX < 0 && dY > 0)
+		{
+			//return fAngle + 180;
+			return 180 + fAngle;
+		}
+		else
+		{
+			//return fAngle + 180;
+			return fAngle - 180;
+		}
+	}
+	double CSlice::GetSweepAngle(const double& angleStart, const double& angleEnd)
+	{
+		if (angleStart >= angleEnd)
+			return angleEnd - angleStart;
+		else
+			return angleEnd - angleStart - 360;
+	}
+	void CSlice::ApplyElliptical(bool& bIsX, double& angleStart, double& angleSweet,
+						 double& Left, double& Top, double& Width, double& Height, const CGeomShapeInfo::CPointD& pointCur)
+	{
+		//   (x - y - x...)
+		if (bIsX)
+		{
+			angleStart = -90;
+			angleSweet = 90;
+
+			if ((Width < 0) && (Height < 0))
+			{
+				angleStart = 90;
+				Width *= -1;
+				Height *= -1;
+				Left = pointCur.dX - Width / 2;
+				Top = pointCur.dY - Height;
+			}
+			else if ((Width < 0) && (Height > 0))
+			{
+				angleStart = -90;
+				angleSweet = -90;
+				Width *= -1;
+				Left = pointCur.dX - Width / 2;
+				Top = pointCur.dY;
+			}
+			else if ((Width > 0) && (Height < 0))
+			{
+				angleStart = 90;
+				angleSweet = -90;
+				Height *= -1;
+				Left = pointCur.dX - Width / 2;
+				Top = pointCur.dY - Height;
+			}
+			else
+			{
+				Left = pointCur.dX - Width / 2;
+				Top = pointCur.dY;
+			}
+		}
+		else
+		{
+			angleStart = 180;
+			angleSweet = -90;
+
+			if ((Width < 0) && (Height < 0))
+			{
+				angleStart = 0;
+				Width *= -1;
+				Height *= -1;
+				Left = pointCur.dX - Width;
+				Top = pointCur.dY - Height / 2;
+			}
+			else if ((Width < 0) && (Height > 0))
+			{
+				angleStart = 0;
+				angleSweet = 90;
+				Width *= -1;
+				Left = pointCur.dX - Width;
+				Top = pointCur.dY - Height / 2;
+			}
+			else if ((Width > 0) && (Height < 0))
+			{
+				angleStart = 180;
+				angleSweet = 90;
+				Height *= -1;
+				Left = pointCur.dX;
+				Top = pointCur.dY - Height / 2;
+			}
+			else
+			{
+				Left = pointCur.dX;
+				Top = pointCur.dY - Height / 2;
+			}
+		}
+		bIsX = !bIsX;
+	}
+	void CSlice::ApplyLimo(CGeomShapeInfo& pGeomInfo, double& lX, double& lY)
+	{
+		if ((0 == pGeomInfo.m_dLimoX) || (0 == pGeomInfo.m_dLimoY))
+			return;
+
+		double dAspect = (double)pGeomInfo.m_dLimoX / pGeomInfo.m_dLimoY;
+		double lWidth  = (dAspect * pGeomInfo.m_dHeight);
+
+		if (lWidth < pGeomInfo.m_dWidth)
+		{
+			// LimoX
+			double lXc = pGeomInfo.m_dLeft + pGeomInfo.m_dWidth / 2;
+			if ((lX > lXc) || ((lX == lXc) && (pGeomInfo.m_oCurPoint.dX >= lXc)))
+			{
+				double lXNew = pGeomInfo.m_dLeft + ((lWidth / pGeomInfo.m_dWidth) * (lX - pGeomInfo.m_dLeft));
+				lXNew += (pGeomInfo.m_dWidth - lWidth);
+				lX = lXNew;
+			}
+			//if (lX >= lXc)
+			//{
+			//	LONG lXNew = pGeomInfo->m_lLeft + (LONG)(((double)lWidth / pGeomInfo->m_lWidth) * (lX - pGeomInfo->m_lLeft));
+			//	if (pGeomInfo->m_oCurPoint.x >= lXc)
+			//	{
+			//		lXNew += (pGeomInfo->m_lWidth - lWidth);
+			//	}
+			//	lX = lXNew;
+			//}
+		}
+		else if (lWidth != pGeomInfo.m_dWidth)
+		{
+			// LimoY
+			double lHeight = (pGeomInfo.m_dWidth / dAspect);
+			double lYc = pGeomInfo.m_dTop + pGeomInfo.m_dHeight / 2;
+			if ((lY > lYc) || ((lY == lYc) && (pGeomInfo.m_oCurPoint.dY >= lYc)))
+			{
+				double lYNew = pGeomInfo.m_dTop + ((lHeight / pGeomInfo.m_dHeight) * (lY - pGeomInfo.m_dTop));
+				lYNew += (pGeomInfo.m_dHeight - lHeight);
+				lY = lYNew;
+			}
+		}
+	}
+	void CSlice::Bez2_3(std::vector<CGeomShapeInfo::CPointD>& oArray, RulesType& eType)
+	{
+		if (rtQuadrBesier == eType)
+		{
+			eType = rtCurveTo;
+		}
+		else if (rtOOXMLQuadBezTo == eType)
+		{
+			eType = rtOOXMLCubicBezTo;
+		}
+		else
+		{
+			return;
+		}
+
+		std::vector<CGeomShapeInfo::CPointD> arOld;
+		arOld.insert(arOld.end(),oArray.begin(), oArray.end());
+
+		oArray.clear();
+
+		size_t nStart	= 0;
+		size_t nEnd	= 2;
+
+		size_t nCount = arOld.size();
+		while (nStart < (nCount - 1))
+		{
+			if (2 >= (nCount - nStart))
+			{
+				// по идее такого быть не может
+				for (size_t i = nStart; i < nCount; ++i)
+				{
+					oArray.push_back(arOld[i]);
+				}
+
+				nStart = nCount;
+				break;
+			}
+
+			if (4 == (nCount - nStart))
+			{
+				// ничего не поделаешь... делаем кривую третьего порядка
+				oArray.push_back(arOld[nStart]);
+				oArray.push_back(arOld[nStart + 1]);
+				oArray.push_back(arOld[nStart + 2]);
+				oArray.push_back(arOld[nStart + 3]);
+
+				nStart += 4;
+				break;
+			}
+
+			// значит есть еще
+			CGeomShapeInfo::CPointD mem1;
+			mem1.dX = (arOld[nStart].dX + 2 * arOld[nStart + 1].dX) / 3.0;
+			mem1.dY = (arOld[nStart].dY + 2 * arOld[nStart + 1].dY) / 3.0;
+
+			CGeomShapeInfo::CPointD mem2;
+			mem2.dX = (2 * arOld[nStart + 1].dX + arOld[nStart + 2].dX) / 3.0;
+			mem2.dY = (2 * arOld[nStart + 1].dY + arOld[nStart + 2].dY) / 3.0;
+
+			oArray.push_back(mem1);
+			oArray.push_back(mem2);
+			oArray.push_back(arOld[nStart + 2]);
+
+			nStart += 2;
+		}
+	}
 	void CSlice::FromXML(XmlUtils::CXmlNode& Node, NSGuidesOOXML::CFormulaManager& pManager, double WidthKoef, double HeightKoef)
 	{
 		m_arPoints.clear();
@@ -421,297 +672,20 @@ namespace ODRAW
 		};
 
 	}
-	CSlice& CSlice::operator =(const CSlice& oSrc)
-	{
-		m_eRuler = oSrc.m_eRuler;
-		m_arPoints.clear();
-		for (size_t nIndex = 0; nIndex < oSrc.m_arPoints.size(); ++nIndex)
-		{
-			m_arPoints.push_back(oSrc.m_arPoints[nIndex]);
-		}
-		return (*this);
-	}
-	double CSlice::GetAngle(double fCentreX, double fCentreY, double fX, double fY)
-	{
-		//  -   + (..  )
-		double dX = fX - fCentreX;
-		double dY = fY - fCentreY;
-
-		double modDX = abs(dX);
-		double modDY = abs(dY);
-
-		if ((modDX < 0.01) && (modDY < 0.01))
-		{
-			return 0;
-		}
-		if ((modDX < 0.01) && (dY < 0))
-		{
-			return -90;
-		}
-		else if (modDX < 0.01)
-		{
-			return 90;
-		}
-		if ((modDY < 0.01) && (dX < 0))
-		{
-			return 180;
-		}
-		else if (modDY < 0.01)
-		{
-			return 0;
-		}
-
-		double fAngle = atan(dY / dX);
-		fAngle *= (180 / M_PI);
-		if (dX > 0 && dY > 0)
-		{
-			return fAngle;
-		}
-		else if (dX > 0 && dY < 0)
-		{
-			return fAngle;
-		}
-		else if (dX < 0 && dY > 0)
-		{
-			//return fAngle + 180;
-			return 180 + fAngle;
-		}
-		else
-		{
-			//return fAngle + 180;
-			return fAngle - 180;
-		}
-	}
-	double CSlice::GetSweepAngle(const double& angleStart, const double& angleEnd)
-	{
-		if (angleStart >= angleEnd)
-			return angleEnd - angleStart;
-		else
-			return angleEnd - angleStart - 360;
-	}
-	void CSlice::ApplyElliptical(bool& bIsX, double& angleStart, double& angleSweet,
-						 double& Left, double& Top, double& Width, double& Height, const CGeomShapeInfo::CPointD& pointCur)
-	{
-		//   (x - y - x...)
-		if (bIsX)
-		{
-			angleStart = -90;
-			angleSweet = 90;
-
-			if ((Width < 0) && (Height < 0))
-			{
-				angleStart = 90;
-				Width *= -1;
-				Height *= -1;
-				Left = pointCur.dX - Width / 2;
-				Top = pointCur.dY - Height;
-			}
-			else if ((Width < 0) && (Height > 0))
-			{
-				angleStart = -90;
-				angleSweet = -90;
-				Width *= -1;
-				Left = pointCur.dX - Width / 2;
-				Top = pointCur.dY;
-			}
-			else if ((Width > 0) && (Height < 0))
-			{
-				angleStart = 90;
-				angleSweet = -90;
-				Height *= -1;
-				Left = pointCur.dX - Width / 2;
-				Top = pointCur.dY - Height;
-			}
-			else
-			{
-				Left = pointCur.dX - Width / 2;
-				Top = pointCur.dY;
-			}
-		}
-		else
-		{
-			angleStart = 180;
-			angleSweet = -90;
-
-			if ((Width < 0) && (Height < 0))
-			{
-				angleStart = 0;
-				Width *= -1;
-				Height *= -1;
-				Left = pointCur.dX - Width;
-				Top = pointCur.dY - Height / 2;
-			}
-			else if ((Width < 0) && (Height > 0))
-			{
-				angleStart = 0;
-				angleSweet = 90;
-				Width *= -1;
-				Left = pointCur.dX - Width;
-				Top = pointCur.dY - Height / 2;
-			}
-			else if ((Width > 0) && (Height < 0))
-			{
-				angleStart = 180;
-				angleSweet = 90;
-				Height *= -1;
-				Left = pointCur.dX;
-				Top = pointCur.dY - Height / 2;
-			}
-			else
-			{
-				Left = pointCur.dX;
-				Top = pointCur.dY - Height / 2;
-			}
-		}
-		bIsX = !bIsX;
-	}
-	void CSlice::ApplyLimo(CGeomShapeInfo& pGeomInfo, double& lX, double& lY)
-	{
-		if ((0 == pGeomInfo.m_dLimoX) || (0 == pGeomInfo.m_dLimoY))
-			return;
-
-		double dAspect = (double)pGeomInfo.m_dLimoX / pGeomInfo.m_dLimoY;
-		double lWidth  = (dAspect * pGeomInfo.m_dHeight);
-
-		if (lWidth < pGeomInfo.m_dWidth)
-		{
-			// LimoX
-			double lXc = pGeomInfo.m_dLeft + pGeomInfo.m_dWidth / 2;
-			if ((lX > lXc) || ((lX == lXc) && (pGeomInfo.m_oCurPoint.dX >= lXc)))
-			{
-				double lXNew = pGeomInfo.m_dLeft + ((lWidth / pGeomInfo.m_dWidth) * (lX - pGeomInfo.m_dLeft));
-				lXNew += (pGeomInfo.m_dWidth - lWidth);
-				lX = lXNew;
-			}
-			//if (lX >= lXc)
-			//{
-			//	LONG lXNew = pGeomInfo->m_lLeft + (LONG)(((double)lWidth / pGeomInfo->m_lWidth) * (lX - pGeomInfo->m_lLeft));
-			//	if (pGeomInfo->m_oCurPoint.x >= lXc)
-			//	{
-			//		lXNew += (pGeomInfo->m_lWidth - lWidth);
-			//	}
-			//	lX = lXNew;
-			//}
-		}
-		else if (lWidth != pGeomInfo.m_dWidth)
-		{
-			// LimoY
-			double lHeight = (pGeomInfo.m_dWidth / dAspect);
-			double lYc = pGeomInfo.m_dTop + pGeomInfo.m_dHeight / 2;
-			if ((lY > lYc) || ((lY == lYc) && (pGeomInfo.m_oCurPoint.dY >= lYc)))
-			{
-				double lYNew = pGeomInfo.m_dTop + ((lHeight / pGeomInfo.m_dHeight) * (lY - pGeomInfo.m_dTop));
-				lYNew += (pGeomInfo.m_dHeight - lHeight);
-				lY = lYNew;
-			}
-		}
-	}
-	void CSlice::Bez2_3(std::vector<CGeomShapeInfo::CPointD>& oArray, RulesType& eType)
-	{
-		if (rtQuadrBesier == eType)
-		{
-			eType = rtCurveTo;
-		}
-		else if (rtOOXMLQuadBezTo == eType)
-		{
-			eType = rtOOXMLCubicBezTo;
-		}
-		else
-		{
-			return;
-		}
-
-		std::vector<CGeomShapeInfo::CPointD> arOld;
-		arOld.insert(arOld.end(),oArray.begin(), oArray.end());
-
-		oArray.clear();
-
-		size_t nStart	= 0;
-		size_t nEnd	= 2;
-
-		size_t nCount = arOld.size();
-		while (nStart < (nCount - 1))
-		{
-			if (2 >= (nCount - nStart))
-			{
-				// по идее такого быть не может
-				for (size_t i = nStart; i < nCount; ++i)
-				{
-					oArray.push_back(arOld[i]);
-				}
-
-				nStart = nCount;
-				break;
-			}
-
-			if (4 == (nCount - nStart))
-			{
-				// ничего не поделаешь... делаем кривую третьего порядка
-				oArray.push_back(arOld[nStart]);
-				oArray.push_back(arOld[nStart + 1]);
-				oArray.push_back(arOld[nStart + 2]);
-				oArray.push_back(arOld[nStart + 3]);
-
-				nStart += 4;
-				break;
-			}
-
-			// значит есть еще
-			CGeomShapeInfo::CPointD mem1;
-			mem1.dX = (arOld[nStart].dX + 2 * arOld[nStart + 1].dX) / 3.0;
-			mem1.dY = (arOld[nStart].dY + 2 * arOld[nStart + 1].dY) / 3.0;
-
-			CGeomShapeInfo::CPointD mem2;
-			mem2.dX = (2 * arOld[nStart + 1].dX + arOld[nStart + 2].dX) / 3.0;
-			mem2.dY = (2 * arOld[nStart + 1].dY + arOld[nStart + 2].dY) / 3.0;
-
-			oArray.push_back(mem1);
-			oArray.push_back(mem2);
-			oArray.push_back(arOld[nStart + 2]);
-
-			nStart += 2;
-		}
-	}
 
 	CPartPath::CPartPath() : m_arSlices()
 	{
 		m_bFill = true;
 		m_bStroke = true;
   
-		width = height = 43200;
+		//width = height = 43200;
+
+		width		= ShapeSizeVML;
+		height		= ShapeSizeVML; //43200?
+
 		x = y = 0;
 
 	}
-	void CPartPath::FromXML(XmlUtils::CXmlNode& PathNode, NSGuidesOOXML::CFormulaManager& pManager)// oox
-	{
-		m_bFill = PathNode.GetAttribute(_T("fill"), _T("norm")) != _T("none");
-		std::wstring stroke = PathNode.GetAttribute(_T("stroke"), _T("true"));
-		m_bStroke = (stroke == _T("true")) || (stroke == _T("1"));
-
-		width = (long)XmlUtils::GetInteger(PathNode.GetAttribute(_T("w"), _T("0")));
-		height = (long)XmlUtils::GetInteger(PathNode.GetAttribute(_T("h"), _T("0")));
-
-		if(width == 0) width = (long)pManager.GetWidth();
-		if(height == 0) height = (long)pManager.GetHeight();
-
-		XmlUtils::CXmlNodes list;
-		PathNode.GetNodes(_T("*"), list);
-
-		for(int i = 0; i < list.GetCount(); i++)
-		{
-			CSlice slice;
-			XmlUtils::CXmlNode node;
-			list.GetAt(i, node);
-
-			slice.FromXML(node, pManager, pManager.GetWidth()/width, pManager.GetHeight()/height);
-
-			m_arSlices.push_back(slice);
-		}
-
-		//CSlice EndSlice;
-		//EndSlice.m_eRuler = rtEnd;
-		//m_arSlices.push_back(EndSlice);
-	}
 	void CPartPath::FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager) //vml
 	{
 		NSStringUtils::CheckPathOn_Fill_Stroke(strPath, m_bFill, m_bStroke);
@@ -784,6 +758,54 @@ namespace ODRAW
 			}
 		}
 	}
+	CPartPath& CPartPath::operator=(const CPartPath& oSrc)
+	{
+		m_bFill = oSrc.m_bFill;
+		m_bStroke = oSrc.m_bStroke;
+
+		width = oSrc.width;
+		height = oSrc.height;
+
+		x = oSrc.x;
+		y = oSrc.y;
+
+		m_arSlices.clear();
+		for (size_t nIndex = 0; nIndex < oSrc.m_arSlices.size(); ++nIndex)
+		{
+			m_arSlices.push_back(oSrc.m_arSlices[nIndex]);
+		}
+		return (*this);
+	}
+	void CPartPath::FromXML(XmlUtils::CXmlNode& PathNode, NSGuidesOOXML::CFormulaManager& pManager)// oox
+	{
+		m_bFill = PathNode.GetAttribute(_T("fill"), _T("norm")) != _T("none");
+		std::wstring stroke = PathNode.GetAttribute(_T("stroke"), _T("true"));
+		m_bStroke = (stroke == _T("true")) || (stroke == _T("1"));
+
+		width = (long)XmlUtils::GetInteger(PathNode.GetAttribute(_T("w"), _T("0")));
+		height = (long)XmlUtils::GetInteger(PathNode.GetAttribute(_T("h"), _T("0")));
+
+		if(width == 0) width = (long)pManager.GetWidth();
+		if(height == 0) height = (long)pManager.GetHeight();
+
+		XmlUtils::CXmlNodes list;
+		PathNode.GetNodes(_T("*"), list);
+
+		for(int i = 0; i < list.GetCount(); i++)
+		{
+			CSlice slice;
+			XmlUtils::CXmlNode node;
+			list.GetAt(i, node);
+
+			slice.FromXML(node, pManager, pManager.GetWidth()/width, pManager.GetHeight()/height);
+
+			m_arSlices.push_back(slice);
+		}
+
+		//CSlice EndSlice;
+		//EndSlice.m_eRuler = rtEnd;
+		//m_arSlices.push_back(EndSlice);
+	}
 	std::wstring CPartPath::ToXml(CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, NSBaseShape::ClassType ClassType)
 	{
 		return _T("");
@@ -820,43 +842,8 @@ namespace ODRAW
 			m_arSlices[nIndex].ToRenderer(pRenderer, pGeomInfo, width, height, ClassType);
 		}
 	}
-	CPartPath& CPartPath::operator=(const CPartPath& oSrc)
-	{
-		m_bFill = oSrc.m_bFill;
-		m_bStroke = oSrc.m_bStroke;
-
-		width = oSrc.width;
-		height = oSrc.height;
-
-		x = oSrc.x;
-		y = oSrc.y;
-
-		m_arSlices.clear();
-		for (size_t nIndex = 0; nIndex < oSrc.m_arSlices.size(); ++nIndex)
-		{
-			m_arSlices.push_back(oSrc.m_arSlices[nIndex]);
-		}
-		return (*this);
-	}
 
 	CPath::CPath() : m_lX(0), m_lY(0) {}
-	void CPath::FromXML(XmlUtils::CXmlNodes& list, NSGuidesOOXML::CFormulaManager& pManager)
-	{
-		m_arParts.clear();
-		for(long i = 0; i < list.GetCount(); i++)
-		{
-			XmlUtils::CXmlNode path;
-			list.GetAt(i, path);
-
-			CPartPath part;
-
-			part.x = m_lX;
-			part.y = m_lY;
-
-			m_arParts.push_back(part);
-			m_arParts.back().FromXML(path, pManager);
-	   }
-	}
 	void CPath::FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager)
 	{
 		m_arParts.clear();
@@ -874,6 +861,35 @@ namespace ODRAW
 			m_arParts.back().FromXML(oArray[nIndex], pManager);
 		}
 	}
+	CPath& CPath::operator=(const CPath& oSrc)
+	{
+		m_arParts.clear();
+		for (size_t nIndex = 0; nIndex < oSrc.m_arParts.size(); ++nIndex)
+		{
+			m_arParts.push_back(oSrc.m_arParts[nIndex]);
+		}
+		m_lX = oSrc.m_lX;
+		m_lY = oSrc.m_lY;
+
+		return (*this);
+	}
+	void CPath::FromXML(XmlUtils::CXmlNodes& list, NSGuidesOOXML::CFormulaManager& pManager)
+	{
+		m_arParts.clear();
+		for(long i = 0; i < list.GetCount(); i++)
+		{
+			XmlUtils::CXmlNode path;
+			list.GetAt(i, path);
+
+			CPartPath part;
+
+			part.x = m_lX;
+			part.y = m_lY;
+
+			m_arParts.push_back(part);
+			m_arParts.back().FromXML(path, pManager);
+	   }
+	}
 	std::wstring CPath::ToXml(CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, NSBaseShape::ClassType ClassType)
 	{
 		std::wstring strResult = _T("");
@@ -898,18 +914,6 @@ namespace ODRAW
 			oPath.Draw(pRenderer);
 		}
 	}
-	CPath& CPath::operator=(const CPath& oSrc)
-	{
-		m_arParts.clear();
-		for (size_t nIndex = 0; nIndex < oSrc.m_arParts.size(); ++nIndex)
-		{
-			m_arParts.push_back(oSrc.m_arParts[nIndex]);
-		}
-		m_lX = oSrc.m_lX;
-		m_lY = oSrc.m_lY;
-
-		return (*this);
-	}
 	void CPath::SetCoordpos(LONG lX, LONG lY)
 	{
 		m_lX = lX;
diff --git a/MsBinaryFile/DocFile/OfficeDrawing/Shapetypes/ArrowType.h b/MsBinaryFile/DocFile/OfficeDrawing/Shapetypes/ArrowType.h
index f8cf2d3d1a..00876e5be2 100644
--- a/MsBinaryFile/DocFile/OfficeDrawing/Shapetypes/ArrowType.h
+++ b/MsBinaryFile/DocFile/OfficeDrawing/Shapetypes/ArrowType.h
@@ -549,10 +549,17 @@ namespace DocFileFormat
             Formulas.push_back(L"prod height 4390 32768");
             Formulas.push_back(L"prod height 28378 32768");
 
-            AdjustmentValues	=	L"12960,19440,14400";
-            ConnectorLocations	=	L"0,@17;@2,@14;@22,@8;@2,@12;@22,@16";
-            ConnectorAngles		=	L"180,90,0,0,0";
-            TextBoxRectangle	=	L"@47,@45,@48,@46";
+			//AdjustmentValues	=	L"12960,19440,14400";
+			AdjustmentValues	=	L"12960,19440,7200";
+
+			//ConnectorLocations	=	L"0,@17;@2,@14;@22,@8;@2,@12;@22,@16";
+			ConnectorLocations	=	L"0,@15;@2,@11;0,@8;@2,@13;@21,@16";
+
+			//ConnectorAngles		=	L"180,90,0,0,0";
+			ConnectorAngles		=	L"180,180,180,90,0";
+
+			//TextBoxRectangle	=	L"@47,@45,@48,@46";
+			TextBoxRectangle	=	L"@43,@41,@44,@42";
 
 			Handle one;
             one.position		=	L"topLeft,#0";