XlsFormat - переобернут в неймспейсы

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68426 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h

@@ -28,14 +28,6 @@ public:
 	BIFF_BYTE colFirst;
 	BIFF_WORD row;
 	BiffStructurePtrVector crnOper;
-public:
-	//BO_ATTRIB_MARKUP_BEGIN
-		//BO_ATTRIB_MARKUP_ATTRIB(colLast)
-		//BO_ATTRIB_MARKUP_ATTRIB(colFirst)
-		//BO_ATTRIB_MARKUP_ATTRIB(row)
-		////BO_ATTRIB_MARKUP_VECTOR_COMPLEX(crnOper, SerAr) // Temporarily commented to avoid compilation errors
-
-	//BO_ATTRIB_MARKUP_END
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp

@@ -265,7 +265,7 @@ int Font::serialize_rPr(std::wostream & stream, bool rtl, bool defRPr, std::wstr
 }
 
 
-int Font::serialize_properties(std::wostream & stream, bool rPr)
+int Font::serialize_properties(std::wostream & stream, bool isRPr)
 {
     CP_XML_WRITER(stream)    
     {
@@ -347,7 +347,7 @@ int Font::serialize_properties(std::wostream & stream, bool rPr)
 
 		if (!fontName.value().empty())
 		{
-			if (rPr)
+			if (isRPr)
 			{
 				CP_XML_NODE(L"rFont")
 				{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp

@@ -113,6 +113,7 @@ int TxO::serialize (std::wostream & _stream)
 			CP_XML_NODE(namespace_ + L"r")
 			{
 				Fmt = run->formatRun.ifnt;
+				
 				serialize_rPr(CP_XML_STREAM(), Fmt, namespace_);
 
 				CP_XML_NODE(namespace_ + L"t")
@@ -145,7 +146,20 @@ int TxO::serialize_rPr	(std::wostream & _stream, int iFmt, std::wstring namespac
 
 	Font * font = dynamic_cast<Font*>(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get());
 
-	if (font) font->serialize_rPr(_stream, false, false, namespace_);
+	if (!font) return 0;
+
+	if (namespace_.empty())
+	{
+		CP_XML_WRITER(_stream)    
+		{	
+			CP_XML_NODE( L"rPr")
+			{
+				font->serialize_properties(CP_XML_STREAM(), true);
+			}
+		}
+	}
+	else
+		font->serialize_rPr(_stream, false, false, namespace_);
 	
 	return 0;
 }

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h

@@ -16,8 +16,6 @@ namespace XLS
 {
 
 typedef BiffAttributeSimple<_UINT32>		RwLongU;
-typedef BiffAttributeSimple<unsigned short> ColU;
-typedef BiffAttributeSimple<unsigned short> Col256U;
 typedef BiffAttributeSimple<unsigned short> IXFCell;
 typedef BiffAttributeSimple<unsigned short> Rw;
 typedef BiffAttributeSimple<unsigned short> Col;
@@ -28,6 +26,8 @@ typedef BiffAttributeSimple<_INT16>			Col_NegativeOne;
 typedef BiffAttributeSimple<unsigned short> R_RwU; // Special version for use as a record attribute
 typedef BiffAttributeSimple<unsigned short> IFmt;
 typedef BiffAttributeSimple<unsigned short> CrtLayout12Mode;
+typedef BiffAttributeSimple<unsigned short> ColU;
+typedef unsigned short Col256U;
 typedef unsigned short RwU;
 typedef unsigned short Ilel;
 typedef unsigned char DColunByteU;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.cpp

@@ -118,12 +118,9 @@ void OfficeArtClientAnchorSheet::loadFields(XLS::CFRecord& record)
 	}
 	else 
 		_dyB = dyB * kfRow * global_info->defaultRowHeight;	
-//----------------------------------------------------------------------------------------------------
-	column	= (std::min)(colL, colR);
-	row		= (std::min)(rwT, rwB);
 
-//----------------------------------------------------------------------------------------------------
-	for (int i = 1 ; i < colL; i++)
+	//----------------------------------------------------------------------------------------------------
+	for (int i = 0 ; i < colL; i++)
 	{
 		if (global_info->customColumnsWidth.find(i) != global_info->customColumnsWidth.end())
 			_x +=  256 * kfCol * global_info->customColumnsWidth[i];	
@@ -141,7 +138,7 @@ void OfficeArtClientAnchorSheet::loadFields(XLS::CFRecord& record)
 	}
 	_cx += _dxR;
 
-	for (int i = 1 ; i < rwT; i++)
+	for (int i = 0 ; i < rwT; i++)
 	{
 		if (global_info->customRowsHeight.find(i) != global_info->customRowsHeight.end())
 		{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h

@@ -38,9 +38,6 @@ public:
 	XLS::RwU		rwB;
 	short			dyB;
 
-	int column;
-	int row;
-
 	_UINT32		_dxL;
 	_UINT32		_dyT;
 	_UINT32		_dxR;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp

@@ -7,47 +7,47 @@
 
 namespace ODRAW
 {
-	static int GetCountPoints2(NSGuidesVML::RulesType eRuler, int lRepeatCount)
+	static int GetCountPoints2(NSCustomShapesConvert::RulesType eRuler, int lRepeatCount)
 	{
 		switch (eRuler)
 		{
-		case NSGuidesVML::rtMoveTo:				
-		case NSGuidesVML::rtRMoveTo:
+		case NSCustomShapesConvert::rtMoveTo:				
+		case NSCustomShapesConvert::rtRMoveTo:
 			{ return 1; }
 		
-		case NSGuidesVML::rtLineTo:		
-		case NSGuidesVML::rtRLineTo:
+		case NSCustomShapesConvert::rtLineTo:		
+		case NSCustomShapesConvert::rtRLineTo:
 			{ return lRepeatCount; }
 		
-		case NSGuidesVML::rtCurveTo:		
-		case NSGuidesVML::rtRCurveTo:
+		case NSCustomShapesConvert::rtCurveTo:		
+		case NSCustomShapesConvert::rtRCurveTo:
 			{ return 3 * lRepeatCount; }
 		
-		case NSGuidesVML::rtNoFill:
-		case NSGuidesVML::rtNoStroke:
-		case NSGuidesVML::rtClose:
-		case NSGuidesVML::rtEnd:	
+		case NSCustomShapesConvert::rtNoFill:
+		case NSCustomShapesConvert::rtNoStroke:
+		case NSCustomShapesConvert::rtClose:
+		case NSCustomShapesConvert::rtEnd:	
 			{ return 0; }
 		
-		case NSGuidesVML::rtAngleEllipseTo:
-		case NSGuidesVML::rtAngleEllipse:
+		case NSCustomShapesConvert::rtAngleEllipseTo:
+		case NSCustomShapesConvert::rtAngleEllipse:
 			{ return lRepeatCount; }
 		
-		case NSGuidesVML::rtArc:
-		case NSGuidesVML::rtArcTo:
+		case NSCustomShapesConvert::rtArc:
+		case NSCustomShapesConvert::rtArcTo:
 
-		case NSGuidesVML::rtClockwiseArcTo:
-		case NSGuidesVML::rtClockwiseArc:
+		case NSCustomShapesConvert::rtClockwiseArcTo:
+		case NSCustomShapesConvert::rtClockwiseArc:
 			{ return lRepeatCount; }
 
-		case NSGuidesVML::rtEllipticalQuadrX:
-		case NSGuidesVML::rtEllipticalQuadrY:
+		case NSCustomShapesConvert::rtEllipticalQuadrX:
+		case NSCustomShapesConvert::rtEllipticalQuadrY:
 			{ return 1 * lRepeatCount; }
 
-		case NSGuidesVML::rtQuadrBesier:			
+		case NSCustomShapesConvert::rtQuadrBesier:			
 			{ return /*2 * */lRepeatCount; }
-		case NSGuidesVML::rtFillColor:
-		case NSGuidesVML::rtLineColor:
+		case NSCustomShapesConvert::rtFillColor:
+		case NSCustomShapesConvert::rtLineColor:
 			{
 				return 1;
 			}
@@ -680,7 +680,7 @@ void MSOPATHINFO::load(XLS::CFRecord& record)
 	
 	if (type <= 4)
 	{
-		m_eRuler	= (NSGuidesVML::RulesType)type;
+		m_eRuler	= (NSCustomShapesConvert::RulesType)type;
 		m_nCount	= (mem & 0x1FFF);
 		m_nCount	= (_UINT16)GetCountPoints2(m_eRuler, m_nCount);
 		return;
@@ -693,68 +693,68 @@ void MSOPATHINFO::load(XLS::CFRecord& record)
 	{
 	case 0x00:
 		{
-			m_eRuler = NSGuidesVML::rtLineTo;
+			m_eRuler = NSCustomShapesConvert::rtLineTo;
 			break;
 		}
 	case 0x01:
 		{
-			m_eRuler = NSGuidesVML::rtAngleEllipseTo;
+			m_eRuler = NSCustomShapesConvert::rtAngleEllipseTo;
 			break;
 		}
 	case 0x02:
 		{
-			m_eRuler = NSGuidesVML::rtAngleEllipse;
+			m_eRuler = NSCustomShapesConvert::rtAngleEllipse;
 			break;
 		}
 	case 0x03:
 		{
-			m_eRuler = NSGuidesVML::rtArcTo;
+			m_eRuler = NSCustomShapesConvert::rtArcTo;
 			break;
 		}
 	case 0x04:
 		{
-			m_eRuler = NSGuidesVML::rtArc;
+			m_eRuler = NSCustomShapesConvert::rtArc;
 			break;
 		}
 	case 0x05:
 		{
-			m_eRuler = NSGuidesVML::rtClockwiseArcTo;
+			m_eRuler = NSCustomShapesConvert::rtClockwiseArcTo;
 			break;
 		}
 	case 0x06:
 		{
-			m_eRuler = NSGuidesVML::rtClockwiseArc;
+			m_eRuler = NSCustomShapesConvert::rtClockwiseArc;
 			break;
 		}
 	case 0x07:
 		{
-			m_eRuler = NSGuidesVML::rtEllipticalQuadrX;
+			m_eRuler = NSCustomShapesConvert::rtEllipticalQuadrX;
 			break;
 		}
 	case 0x08:
 		{
-			m_eRuler = NSGuidesVML::rtEllipticalQuadrY;
+			m_eRuler = NSCustomShapesConvert::rtEllipticalQuadrY;
 			break;
 		}
 	case 0x09:
 		{
-			m_eRuler = NSGuidesVML::rtQuadrBesier;
+			m_eRuler = NSCustomShapesConvert::rtQuadrBesier;
 			break;
 		}
 	case 0x0A:
 		{
-			m_eRuler = NSGuidesVML::rtNoFill;
+			m_eRuler = NSCustomShapesConvert::rtNoFill;
 			break;
 		}
 	case 0x0B:
 		{
-			m_eRuler = NSGuidesVML::rtNoStroke;
+			m_eRuler = NSCustomShapesConvert::rtNoStroke;
 			break;
 		}
 	case 0x0C:
 	case 0x10:
 		{
-			m_eRuler = NSGuidesVML::rtLineTo;
+			m_eRuler = NSCustomShapesConvert::rtLineTo;
 			break;
 		}
 	case 0x0D:
@@ -765,22 +765,22 @@ void MSOPATHINFO::load(XLS::CFRecord& record)
 	case 0x13:
 	case 0x14:
 		{
-			m_eRuler = NSGuidesVML::rtCurveTo;
+			m_eRuler = NSCustomShapesConvert::rtCurveTo;
 			break;
 		}
 	case 0x15:
 		{
-			m_eRuler = NSGuidesVML::rtFillColor;
+			m_eRuler = NSCustomShapesConvert::rtFillColor;
 			break;
 		}
 	case 0x16:
 		{
-			m_eRuler = NSGuidesVML::rtLineColor;
+			m_eRuler = NSCustomShapesConvert::rtLineColor;
 			break;
 		}
 	default:
 		{
-			m_eRuler = NSGuidesVML::rtCurveTo;
+			m_eRuler = NSCustomShapesConvert::rtCurveTo;
 		}
 	};
 
@@ -810,7 +810,7 @@ void MSOSG::load(XLS::CFRecord& record)
 	_UINT16 ftType;
 	record >> ftType;
 
-	m_eType = NSGuidesVML::FormulaType(ftType & 0x1FFF);
+	m_eType = NSCustomShapesConvert::FormulaType(ftType & 0x1FFF);
 
 	m_param_type1 = (unsigned char)(ftType & 0x04);
 	m_param_type2 = (unsigned char)(ftType & 0x02);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h

@@ -558,7 +558,7 @@ class MSOPATHINFO : public XLS::BiffStructure
 
 	static const XLS::ElementType	type = XLS::typeOfficeArtRecord;
 
-	NSGuidesVML::RulesType	m_eRuler;
+	NSCustomShapesConvert::RulesType	m_eRuler;
 	_UINT16					m_nCount;
 	
 	int cbElement;
@@ -577,7 +577,7 @@ class MSOSG : public XLS::BiffStructure
 
 	static const XLS::ElementType	type = XLS::typeOfficeArtRecord;
 
-	NSGuidesVML::FormulaType	m_eType;
+	NSCustomShapesConvert::FormulaType	m_eType;
 
 	unsigned char				m_param_type1;
 	unsigned char				m_param_type2;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp

@@ -77,10 +77,7 @@ int COLUMNS::serialize(std::wostream & stream)
 						CP_XML_ATTR(L"customWidth", true);
 					}
 
-					if (column_info->colFirst.value()) 
 					CP_XML_ATTR(L"min", column_info->colFirst + 1);/// from 0 
-
-					if (column_info->colLast.value())
 					CP_XML_ATTR(L"max", column_info->colLast + 1);
 
 					if ((column_info->ixfe.value()) && (column_info->ixfe > global_info_->cellStyleXfs_count))

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/BaseShape.h

@@ -2,6 +2,8 @@
 #include "PathShape.h"
 #include "../../../Common/DocxFormat/Source/Common/SimpleTypes_Base.h"
 
+namespace NSCustomShapesConvert
+{
 
 class CHandle_
 {
@@ -34,9 +36,7 @@ public:
 		return (*this);
 	}
 };
-//
-namespace NSGuidesVML
-{
+
 class CBaseShape
 {
 public:

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomGeomShape.h

@@ -7,10 +7,8 @@
 
 #include "../../../../Common/DocxFormat/Source/SystemUtility/File.h"
 
-namespace NSCustomVML
+namespace NSCustomShapesConvert
 {
-    using namespace NSGuidesVML;
-
 	class CSegment
 	{
 	public:
@@ -97,7 +95,7 @@ namespace NSCustomVML
 			return *this;
 		}
 
-		void SetToFormula(NSGuidesVML::CFormula& oFormula)
+		void SetToFormula(NSCustomShapesConvert::CFormula& oFormula)
 		{
 			oFormula.m_eFormulaType = m_eType;
 
@@ -255,7 +253,7 @@ namespace NSCustomVML
 			m_pAdjustValues = pList;
 		}
 
-		void ToCustomShape(CBaseShape* pShape, NSGuidesVML::CFormulasManager& oManager)
+		void ToCustomShape(CBaseShape* pShape, NSCustomShapesConvert::CFormulasManager& oManager)
 		{
 			if ((NULL == pShape) || (!IsCustom()))
 				return;
@@ -264,7 +262,7 @@ namespace NSCustomVML
 			//   
 			for (size_t nIndex = 0; nIndex < m_arGuides.size(); ++nIndex)
 			{
-				NSGuidesVML::CFormula oF;
+				NSCustomShapesConvert::CFormula oF;
 				m_arGuides[nIndex].SetToFormula(oF);
 				oManager.AddFormula(oF);
 			}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.cpp

@@ -12,6 +12,8 @@ const double EMU_MM = 36000;
 
 using namespace NSOfficeDrawing;
 
+namespace NSCustomShapesConvert
+{
 CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type)
 {
 	CCustomShape* pShape = NULL;
@@ -260,3 +262,4 @@ CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type)
 	return pShape;
 }
 
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h

@@ -5,13 +5,16 @@
 #include "../ShapeType.h"
 #include "../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Enums.h"
 
-class CCustomShape : public NSGuidesVML::CBaseShape
+namespace NSCustomShapesConvert
+{
+
+class CCustomShape : public NSCustomShapesConvert::CBaseShape
 {
 public:
 	oox::MSOSPT								m_eType;
-	NSGuidesVML::CFormulasManager	m_oManager;
+	NSCustomShapesConvert::CFormulasManager	m_oManager;
 
-	NSCustomVML::CCustomVML			m_oCustomVML;
+	NSCustomShapesConvert::CCustomVML		m_oCustomVML;
 	
 	std::wstring							m_strPathLimoX;
 	std::wstring							m_strPathLimoY;
@@ -37,32 +40,6 @@ public:
 		return true;
 	}
 
-	//void LoadAHList(XmlUtils::CXmlNode& oNode)
-	//{
-	//	m_arHandles.clear();
-
-	//	XmlUtils::CXmlNodes oNodes;
-	//	if (oNode.GetNodes(_T("v:h"), oNodes))
-	//	{
-	//		int nCount = oNodes.GetCount();
-	//		for (int i = 0; i < nCount; ++i)
-	//		{
-	//			XmlUtils::CXmlNode oNodeH;
-	//			oNodes.GetAt(i, oNodeH);
-
-	//			CHandle_ oH;
-	//			oH.polar		= oNodeH.GetAttribute(_T("polar"));
-	//			oH.position		= oNodeH.GetAttribute(_T("position"));
-	//			oH.radiusrange	= oNodeH.GetAttribute(_T("radiusrange"));
-	//			oH.switchHandle = oNodeH.GetAttribute(_T("switch"));
-	//			oH.xrange		= oNodeH.GetAttribute(_T("xrange"));
-	//			oH.yrange		= oNodeH.GetAttribute(_T("yrange"));
-
-	//			m_arHandles.push_back(oH);
-	//		}
-	//	}
-	//}
-
 	virtual bool LoadConnectorsList(const std::wstring& xml)
 	{
 		return true;
@@ -150,39 +127,5 @@ public:
 		m_eType = oox::msosptNotPrimitive;
 		return false;
 	}
-
-//protected:
-//
-//	bool GetPos(std::wstring str, LONG& lValue)
-//	{
-//		if (str.GetLength() == 0)
-//			return false;
-//
-//		TCHAR mem = str.GetAt(0);
-//
-//		bool bFormula = false;
-//		if ('@' == mem)
-//		{
-//			bFormula = true;
-//			str.Delete(0);
-//		}
-//		
-//		if (!NSStringUtils::IsNumber(str))
-//			return false;
-//
-//		lValue = 0;
-//		lValue = _ttoi(str);
-//
-//		if (bFormula)
-//		{
-//			if (lValue >= 0 || lValue < m_oManager.m_arResults.size())
-//			{
-//				lValue = m_oManager.m_arResults[lValue];
-//				return true;
-//			}
-//			return false;
-//		}
-//
-//		return true;
-//	}
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShapeConvert.h

@@ -5,7 +5,7 @@
 
 #include "XmlWriter.h"
 
-namespace NSGuidesVML
+namespace NSCustomShapesConvert
 {
     static int __wstrlen(const wchar_t* str)
 	{
@@ -201,7 +201,7 @@ namespace NSGuidesVML
 
 			m_lMaxAdjUse = -1;
 		}
-		void ConvertCoef(NSGuidesVML::CFormParam pCoef)
+		void ConvertCoef(NSCustomShapesConvert::CFormParam pCoef)
 		{
 			if (pCoef.m_eType == ptValue)
 				ConvertVal(pCoef.m_lParam, pCoef.m_eType, false, m_oCoef);
@@ -214,7 +214,7 @@ namespace NSGuidesVML
 			m_oParam.m_eType	= ptFormula;
 			m_oParam.m_lCoef	= pCoef.m_lCoef;
 		}
-		void ConvertCoef2(NSGuidesVML::CFormParam pCoef)
+		void ConvertCoef2(NSCustomShapesConvert::CFormParam pCoef)
 		{
 			if (pCoef.m_eType == ptValue)
 				ConvertVal(pCoef.m_lParam, pCoef.m_eType, false, m_oGuidsRes);
@@ -890,12 +890,12 @@ namespace NSGuidesVML
 
 			if ('#' == strParam2[0])
 			{					
-				LONG lRes = (LONG)NSGuidesVML::GetInteger(strParam2.substr(1));
+				LONG lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam2.substr(1));
 				GetValue(lRes, ptAdjust, false, oWriter);
 			}
 			else if ('@' == strParam2[0])
 			{
-				LONG lRes = (LONG)NSGuidesVML::GetInteger(strParam2.substr(1));
+				LONG lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam2.substr(1));
 				GetValue(lRes, ptFormula, false, oWriter);
 			}
 			else
@@ -925,7 +925,7 @@ namespace NSGuidesVML
 			for (int nIndex = 0; nIndex < oArray.size(); ++nIndex)
 			{
 				std::wstring str = oArray[nIndex];
-				lValue = NSGuidesVML::GetValue(oArray[nIndex], eParamType, bRes);
+				lValue = NSCustomShapesConvert::GetValue(oArray[nIndex], eParamType, bRes);
 				if (bRes)
 				{	
 					if (0 != m_arSlicesPath.size())
@@ -1053,17 +1053,17 @@ namespace NSGuidesVML
 
 			if ('#' == strParam[0])
 			{					
-				lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1));
+				lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1));
 				strFrmla = GetValue2(lRes, ptAdjust, false) + L" " + strSize;
 			}
 			else if ('&' == strParam[0])
 			{
-				lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1));
+				lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1));
 				strFrmla = GetValue2(lRes, ptFormula, true) + L" " + strSize;
 			}
 			else if ('@' == strParam[0])
 			{
-				lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1));
+				lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1));
 				strFrmla = GetValue2(lRes, ptFormula, false) + L" " + strSize;
 			}
 			else if (!NSStringUtils::IsNumber(strParam))
@@ -1077,7 +1077,7 @@ namespace NSGuidesVML
 			}	
 			else
 			{
-				lRes = (LONG)NSGuidesVML::GetInteger(strParam.c_str());
+				lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.c_str());
 				strFrmla = GetValue2(lRes, ptValue, false) + strSize;
 			}
 
@@ -1105,12 +1105,12 @@ namespace NSGuidesVML
 			if ('#' == strParam[0])
 			{
 				ptType = ptAdjust;
-				return (LONG)NSGuidesVML::GetInteger(strParam.substr(1).c_str());
+				return (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1).c_str());
 			}
 			else if ('@' == strParam[0])
 			{
 				ptType = ptFormula;
-				return (LONG)NSGuidesVML::GetInteger(strParam.substr(1).c_str());
+				return (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1).c_str());
 			}
 			else if (!NSStringUtils::IsNumber(strParam))
 			{
@@ -1125,7 +1125,7 @@ namespace NSGuidesVML
             else
             {
                 ptType = ptValue;
-				return (LONG)NSGuidesVML::GetInteger(strParam.c_str());
+				return (LONG)NSCustomShapesConvert::GetInteger(strParam.c_str());
             }
 		}
         void ConvertQuadrX(Aggplus::POINT pPoint, SPointType pPointType)

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp

@@ -2,7 +2,7 @@
 
 #include "FormulaShape.h"
 
-LONG NSGuidesVML::CFormula::CalculateFormula(NSGuidesVML::CFormulasManager* pManager)
+LONG NSCustomShapesConvert::CFormula::CalculateFormula(NSCustomShapesConvert::CFormulasManager* pManager)
 {
 	if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size()))
 		return 0;

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h

@@ -11,7 +11,7 @@
 
 #include "../../../../DesktopEditor/graphics/aggplustypes.h"
 
-namespace NSGuidesVML
+namespace NSCustomShapesConvert
 {
 	enum FormulaType
 	{
@@ -161,10 +161,7 @@ namespace NSGuidesVML
 
 		return ftVal;
 	}
-}
 
-namespace NSGuidesVML
-{
 	struct SPointType
 	{
 			ParamType x;

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/GraphicsPath.h

@@ -5,14 +5,11 @@
 
 #include "../../../../DesktopEditor/graphics/GraphicsPath.h"
 
-//#include "../../Metric.h"
-//#include "../../Attributes.h"
-
 #define _USE_MATH_DEFINES
 #include <math.h>//M_PI
 #include <vector>
 
-namespace NSGuidesVML
+namespace NSCustomShapesConvert
 {
 	const double c_dMasterUnitsToInchKoef		= 1.0 / 576;
 	const double c_dInchToMillimetreKoef		= 25.4;

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/PathShape.h

@@ -3,7 +3,7 @@
 #include "GraphicsPath.h"
 #include "FormulaShape.h"
 
-namespace NSGuidesVML
+namespace NSCustomShapesConvert
 {
 	static std::wstring GetRulerVML(RulesType eRuler)
 	{
@@ -504,7 +504,7 @@ namespace NSGuidesVML
 			width		= ShapeSizeVML;
 			height		= ShapeSizeVML; //43200?
 		}
-		void FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager)
+		void FromXML(std::wstring strPath, NSCustomShapesConvert::CFormulasManager& pManager)
 		{
 			NSStringUtils::CheckPathOn_Fill_Stroke(strPath, m_bFill, m_bStroke);
 			std::vector<std::wstring> oArray;
@@ -577,7 +577,7 @@ namespace NSGuidesVML
 	public:
 		std::vector<CPartPath> m_arParts;
 		
-		void FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager)
+		void FromXML(std::wstring strPath, NSCustomShapesConvert::CFormulasManager& pManager)
 		{
 			m_arParts.clear();
 			std::vector<std::wstring> oArray;

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/XmlWriter.h

@@ -3,7 +3,7 @@
 //#include "../../../Common/DocxFormat/Source/Base/Nullable.h"
 #include "../../../DesktopEditor/common/File.h"
 
-namespace NSGuidesVML
+namespace NSCustomShapesConvert
 {
 	static int GetInteger (const std::wstring& string)
 	{

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentBorderCallout2Type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 51
+namespace NSCustomShapesConvert
+{
+
 class CAccentBorderCallout2Type : public CCustomShape
 {
 public:
@@ -43,3 +46,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout1Type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 44
+namespace NSCustomShapesConvert
+{
+
 class CAccentCallout1Type : public CCustomShape
 {
 public:
@@ -34,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout2Type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 45
+namespace NSCustomShapesConvert
+{
+
 class CAccentCallout2Type : public CCustomShape
 {
 public:
@@ -42,3 +45,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout3Type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 46
+namespace NSCustomShapesConvert
+{
+
 class CAccentCallout3Type : public CCustomShape
 {
 public:
@@ -51,3 +54,4 @@ public:
         m_arHandles.push_back(oHandle4);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout90Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 179
+namespace NSCustomShapesConvert
+{
 class CAccentCallout90Type : public CCustomShape
 {
 public:
@@ -35,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBack.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 194
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonBackType : public CCustomShape
 {
 public:
@@ -46,3 +49,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBeginning.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 196
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonBeginType : public CCustomShape
 {
 public:
@@ -53,3 +56,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBlank.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 189
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonBlankType : public CCustomShape
 {
 public:
@@ -37,3 +40,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonDocument.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 198
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonDocType : public CCustomShape
 {
 public:
@@ -50,3 +53,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonEnd.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 195
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonEndType : public CCustomShape
 {
 public:
@@ -53,3 +56,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHelp.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 191
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonHelpType : public CCustomShape
 {
 public:
@@ -90,3 +93,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHome.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 190
+namespace NSCustomShapesConvert
+{
+
 class CActionButtonHomeType : public CCustomShape
 {
 public:
@@ -78,3 +81,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonInfo.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 192
+namespace NSCustomShapesConvert
+{
 class CActionButtonInfoType : public CCustomShape
 {
 public:
@@ -85,3 +87,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonMovie.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 200
+namespace NSCustomShapesConvert
+{
 class CActionButtonMovieType : public CCustomShape
 {
 public:
@@ -99,3 +101,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonNext.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 193
+namespace NSCustomShapesConvert
+{
 class CActionButtonNextType : public CCustomShape
 {
 public:
@@ -46,3 +48,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonReturn.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 197
+namespace NSCustomShapesConvert
+{
 class CActionButtonReturnType : public CCustomShape
 {
 public:
@@ -68,3 +70,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonSound.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 199
+namespace NSCustomShapesConvert
+{
 class CActionButtonSoundType : public CCustomShape
 {
 public:
@@ -67,3 +69,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 91
+namespace NSCustomShapesConvert
+{
 class CBentArrowType : public CCustomShape
 {
 public:
@@ -40,3 +42,4 @@ public:
 		m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentConnector.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 34
+namespace NSCustomShapesConvert
+{
 class CBentConnectorType : public CCustomShape
 {
 public:
@@ -21,3 +23,4 @@ public:
 		LoadConnectorsList(_T("0,0;21600,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentUpArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 90
+namespace NSCustomShapesConvert
+{
 class CBentUpArrowType : public CCustomShape
 {
 public:
@@ -57,3 +59,4 @@ public:
 		m_arHandles.push_back(oHandle2);
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BevelType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 84
+namespace NSCustomShapesConvert
+{
 class CBevelType : public CCustomShape
 {
 public:
@@ -42,3 +44,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BlockArcType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 95
+namespace NSCustomShapesConvert
+{
 class CBlockArcType : public CCustomShape
 {
 public:
@@ -72,3 +74,4 @@ public:
 		m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout1Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 47
+namespace NSCustomShapesConvert
+{
 class CBorderCallout1Type : public CCustomShape
 {
 public:
@@ -35,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout2Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 48
+namespace NSCustomShapesConvert
+{
 class CBorderCallout2Type : public CCustomShape
 {
 public:
@@ -43,3 +45,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout3Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 49
+namespace NSCustomShapesConvert
+{
 class CBorderCallout3Type : public CCustomShape
 {
 public:
@@ -51,3 +53,4 @@ public:
         m_arHandles.push_back(oHandle4);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout90Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 180
+namespace NSCustomShapesConvert
+{
 class CBorderCallout90Type : public CCustomShape
 {
 public:
@@ -35,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracePairType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 186
+namespace NSCustomShapesConvert
+{
 class CBracePairType : public CCustomShape
 {
 public:
@@ -45,3 +47,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracketPairType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 185
+namespace NSCustomShapesConvert
+{
 class CBracketPairType : public CCustomShape
 {
 public:
@@ -40,3 +42,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout1Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 41
+namespace NSCustomShapesConvert
+{
 class CCallout1Type : public CCustomShape
 {
 public:
@@ -35,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout2Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 42
+namespace NSCustomShapesConvert
+{
 class CCallout2Type : public CCustomShape
 {
 public:
@@ -43,3 +45,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout3Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 43
+namespace NSCustomShapesConvert
+{
 class CCallout3Type : public CCustomShape
 {
 public:
@@ -51,3 +53,4 @@ public:
         m_arHandles.push_back(oHandle4);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout90Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 178
+namespace NSCustomShapesConvert
+{
 class CCallout90Type : public CCustomShape
 {
 public:
@@ -35,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CanType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 22
+namespace NSCustomShapesConvert
+{
 class CCanType : public CCustomShape
 {
 public:
@@ -33,3 +35,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ChevronType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 55
+namespace NSCustomShapesConvert
+{
 class CChevronType : public CCustomShape
 {
 public:
@@ -33,3 +35,4 @@ public:
     }
 };
 
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CircularArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 99
+namespace NSCustomShapesConvert
+{
 class CCircularArrowType : public CCustomShape
 {
 public:
@@ -81,5 +83,4 @@ public:
 		m_arHandles.push_back(oHandle2);
 	}
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CloudCalloutType.h

 #pragma once
 #include "../CustomShape.h"
 
+
 // 106
+namespace NSCustomShapesConvert
+{
 class CCloudCalloutType : public CCustomShape
 {
 public:
@@ -65,3 +68,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CubeType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 16
+namespace NSCustomShapesConvert
+{
 class CCubeType : public CCustomShape
 {
 public:
@@ -44,3 +46,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedConnector.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 38
+namespace NSCustomShapesConvert
+{
 class CCurvedConnectorType : public CCustomShape
 {
 public:
@@ -25,3 +27,4 @@ public:
 		LoadConnectorsList(_T("0,0;21600,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedDownArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 105
+namespace NSCustomShapesConvert
+{
 class CCurvedDownArrowType : public CCustomShape
 {
 public:
@@ -92,3 +94,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedLeftArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 103
+namespace NSCustomShapesConvert
+{
 class CCurvedLeftArrowType : public CCustomShape
 {
 public:
@@ -88,3 +90,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedRightArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 102
+namespace NSCustomShapesConvert
+{
 class CCurvedRightArrowType : public CCustomShape
 {
 public:
@@ -92,3 +94,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedUpArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 //104
+namespace NSCustomShapesConvert
+{
 class CCurvedUpArrowType : public CCustomShape
 {
 public:
@@ -88,3 +90,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DiamondType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 4
+namespace NSCustomShapesConvert
+{
 class CDiamondType : public CCustomShape
 {
 public:
@@ -18,3 +20,4 @@ public:
 
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DonutType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 23
+namespace NSCustomShapesConvert
+{
 class CDonutType : public CCustomShape
 {
 public:
@@ -29,3 +31,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowCalloutType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 80
+namespace NSCustomShapesConvert
+{
 class CDownArrowCalloutType : public CCustomShape
 {
 public:
@@ -53,5 +55,5 @@ public:
 
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 67
+namespace NSCustomShapesConvert
+{
 class CDownArrowType : public CCustomShape
 {
 public:
@@ -40,3 +42,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbon2Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 108
+namespace NSCustomShapesConvert
+{
 class CEllipceRibbon2Type : public CCustomShape
 {
 public:
@@ -87,3 +89,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbonType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 107
+namespace NSCustomShapesConvert
+{
 class CEllipceRibbonType : public CCustomShape
 {
 public:
@@ -91,3 +93,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 3
+namespace NSCustomShapesConvert
+{
 class CEllipseType : public CCustomShape
 {
 public:
@@ -14,3 +16,4 @@ public:
 		LoadTextRect(_T("3233,3233,18367,18367"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartAlternateProcessType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 176
+namespace NSCustomShapesConvert
+{
 class CFlowChartAlternateProcessType : public CCustomShape
 {
 public:
@@ -33,3 +35,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartCollateType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 125
+namespace NSCustomShapesConvert
+{
 class CFlowChartCollateType : public CCustomShape
 {
 public:
@@ -16,4 +18,4 @@ public:
     }
 };
 
-
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartConnectorType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 120
+namespace NSCustomShapesConvert
+{
 class CFlowChartConnectorType : public CCustomShape
 {
 public:
@@ -18,3 +20,4 @@ public:
         LoadTextRect(_T("3163,3163,18437,18437"));
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDecisionType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 110
+namespace NSCustomShapesConvert
+{
 class CFlowChartDecisionType : public CCustomShape
 {
 public:
@@ -18,3 +20,4 @@ public:
         LoadTextRect(_T("5400,5400,16200,16200"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDelayType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 135
+namespace NSCustomShapesConvert
+{
 class CFlowChartDelayType : public CCustomShape
 {
 public:
@@ -15,5 +17,5 @@ public:
         LoadTextRect(_T("0,3163,18437,18437"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDisplayType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 134
+namespace NSCustomShapesConvert
+{
 class CFlowChartDisplayType : public CCustomShape
 {
 public:
@@ -15,5 +17,5 @@ public:
         LoadTextRect(_T("3567,0,17955,21600"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDocumentType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 //114
+namespace NSCustomShapesConvert
+{
 class CFlowChartDocumentType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("0,0,21600,17322"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartExtractType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 127
+namespace NSCustomShapesConvert
+{
 class CFlowChartExtractType : public CCustomShape
 {
 public:
@@ -15,5 +17,4 @@ public:
         LoadTextRect(_T("5400,10800,16200,21600"));
     }
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInputOutputType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 111
+namespace NSCustomShapesConvert
+{
 class CFlowChartInputOutputType : public CCustomShape
 {
 public:
@@ -18,3 +20,4 @@ public:
         LoadTextRect(_T("4321,0,17204,21600"));
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInternalStorageType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 113
+namespace NSCustomShapesConvert
+{
 class CFlowChartInternalStorageType : public CCustomShape
 {
 public:
@@ -18,3 +20,4 @@ public:
         LoadTextRect(_T("4236,4236,21600,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDiskType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 132
+namespace NSCustomShapesConvert
+{
 class CFlowChartMagneticDiskType : public CCustomShape
 {
 public:
@@ -22,5 +24,5 @@ public:
 		LoadTextRect(_T("0,6782,21600,18209"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDrumType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 133
+namespace NSCustomShapesConvert
+{
 class CFlowChartMagneticDrumType : public CCustomShape
 {
 public:
@@ -22,5 +24,6 @@ public:
         LoadTextRect(_T("3581,0,14438,21600"));
     }
 };
+}
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticTapeType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 131
+namespace NSCustomShapesConvert
+{
 class CFlowChartMagneticTapeType : public CCustomShape
 {
 public:
@@ -15,5 +17,6 @@ public:
         LoadTextRect(_T("3163,3163,18437,18437"));
     }
 };
+}
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualInputType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 118
+namespace NSCustomShapesConvert
+{
 class CFlowChartManualInputType : public CCustomShape
 {
 public:
@@ -18,3 +20,4 @@ public:
 
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualOperationType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 119
+namespace NSCustomShapesConvert
+{
 class CFlowChartManualOperationType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("4321,0,17204,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMergeType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 128
+namespace NSCustomShapesConvert
+{
 class CFlowChartMergeType : public CCustomShape
 {
 public:
@@ -15,5 +17,6 @@ public:
         LoadTextRect(_T("5400,0,16200,10800"));
     }
 };
+}
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMultidocumentType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 115
+namespace NSCustomShapesConvert
+{
 class CFlowChartMultidocumentType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("0,3675,18595,18022"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOffpageConnectorType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 177
+namespace NSCustomShapesConvert
+{
 class CFlowChartOffpageConnectorType : public CCustomShape
 {
 public:
@@ -16,3 +18,4 @@ public:
     }
 };
 
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOnlineStorageType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 130
+namespace NSCustomShapesConvert
+{
 class CFlowChartOnlineStorageType : public CCustomShape
 {
 public:
@@ -15,5 +17,5 @@ public:
         LoadTextRect(_T("3600,0,17997,21600"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOrType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 124
+namespace NSCustomShapesConvert
+{
 class CFlowChartOrType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
 };
 
 
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPredefinedProcessType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 112
+namespace NSCustomShapesConvert
+{
 class CFlowChartPredefinedProcessType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("2610,0,18990,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPreparationType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 117
+namespace NSCustomShapesConvert
+{
 class CFlowChartPreparationType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("4353,0,17214,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartProcessType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 109
+namespace NSCustomShapesConvert
+{
 class CFlowChartProcessType : public CCustomShape
 {
 public:
@@ -15,3 +17,4 @@ public:
         LoadConnectorsList(_T("Rectangle"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedCardType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 121
+namespace NSCustomShapesConvert
+{
 class CFlowChartPunchedCardType : public CCustomShape
 {
 public:
@@ -16,4 +18,4 @@ public:
     }
 };
 
-
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedTapeType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 122
+namespace NSCustomShapesConvert
+{
 class CFlowChartPunchedTapeType : public CCustomShape
 {
 public:
@@ -15,5 +17,5 @@ public:
         LoadTextRect(_T("0,4337,21600,17260"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSortType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 126
+namespace NSCustomShapesConvert
+{
 class CFlowChartSortType : public CCustomShape
 {
 public:
@@ -15,5 +17,5 @@ public:
         LoadTextRect(_T("5400,5400,16200,16200"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSummingJunctionType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 123
+namespace NSCustomShapesConvert
+{
 class CFlowChartSummingJunctionType : public CCustomShape
 {
 public:
@@ -15,5 +17,5 @@ public:
         LoadTextRect(_T("3163,3163,18437,18437"));
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartTerminatorType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 116
+namespace NSCustomShapesConvert
+{
 class CFlowChartTerminatorType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("1018,3163,20582,18437"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FoldedCornerType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 65
+namespace NSCustomShapesConvert
+{
 class CFoldedCornerType : public CCustomShape
 {
 public:
@@ -40,3 +42,4 @@ public:
         
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HeartType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 74
+namespace NSCustomShapesConvert
+{
 class CHeartType : public CCustomShape
 {
 public:
@@ -22,7 +24,7 @@ public:
         LoadTextRect(_T("5037,2277,16557,13677"));
     }
 };
-
+}
 
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HexagonType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 9
+namespace NSCustomShapesConvert
+{
 class CHexagonType : public CCustomShape
 {
 public:
@@ -32,3 +34,4 @@ public:
 
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HomePlateType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 15
+namespace NSCustomShapesConvert
+{
 class CHomePlateType : public CCustomShape
 {
 public:
@@ -32,5 +34,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HorisontalScrollType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 98
+namespace NSCustomShapesConvert
+{
 class CHorizontalScrollType : public CCustomShape
 {
 public:
@@ -49,3 +51,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealOneType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 71
+namespace NSCustomShapesConvert
+{
 class CIrregularSealOneType : public CCustomShape
 {
 public:
@@ -23,3 +25,4 @@ public:
         LoadTextRect(_T("4627,6320,16702,13937"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IrregularSealTwo.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 72
+namespace NSCustomShapesConvert
+{
 class CIrregularSealTwo : public CCustomShape
 {
 public:
@@ -24,3 +26,4 @@ public:
 
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/IsoscelesTriangleType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 5
+namespace NSCustomShapesConvert
+{
 class CIsoscelesTriangleType : public CCustomShape
 {
 public:
@@ -29,3 +31,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowCalloutType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 77
+namespace NSCustomShapesConvert
+{
 class CLeftArrowCalloutType : public CCustomShape
 {
 public:
@@ -52,5 +54,4 @@ public:
         m_arHandles.push_back(oHandle3); 
     }
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 66
+namespace NSCustomShapesConvert
+{
 class CLeftArrowType : public CCustomShape
 {
 public:
@@ -40,3 +42,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBraceType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 87
+namespace NSCustomShapesConvert
+{
 class CLeftBraceType : public CCustomShape
 {
 public:
@@ -45,3 +47,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftBracketType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 85
+namespace NSCustomShapesConvert
+{
 class CLeftBracketType : public CCustomShape
 {
 public:
@@ -30,3 +32,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowCalloutType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 81
+namespace NSCustomShapesConvert
+{
 class CLeftRightArrowCalloutType : public CCustomShape
 {
 public:
@@ -54,5 +56,5 @@ public:
         m_arHandles.push_back(oHandle3); 
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 69
+namespace NSCustomShapesConvert
+{
 class CLeftRightArrowType : public CCustomShape
 {
 public:
@@ -45,3 +47,4 @@ public:
 
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftRightUpArrow.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 182
+namespace NSCustomShapesConvert
+{
 class CLeftRightUpArrow : public CCustomShape
 {
 public:
@@ -56,3 +58,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LeftUpArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 89
+namespace NSCustomShapesConvert
+{
 class CLeftUpArrowType : public CCustomShape
 {
 public:
@@ -55,3 +57,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LightningBoltType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 73
+namespace NSCustomShapesConvert
+{
 class CLightningBoltType : public CCustomShape
 {
 public:
@@ -25,3 +27,4 @@ public:
         LoadTextRect(_T("8757,7437,13917,14277"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/LineType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 20
+namespace NSCustomShapesConvert
+{
 class CLineType : public CCustomShape
 {
 public:
@@ -15,3 +17,4 @@ public:
 		LoadConnectorsList(_T("0,0;21600,21600;10800,10800"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/MoonType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 184
+namespace NSCustomShapesConvert
+{
 class CMoonType : public CCustomShape
 {
 public:
@@ -47,3 +49,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NoSmokingType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 57
+namespace NSCustomShapesConvert
+{
 class CNoSmokingType : public CCustomShape
 {
 public:
@@ -43,3 +45,4 @@ public:
     }
 };
 
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/NotchedRightArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 94
+namespace NSCustomShapesConvert
+{
 class CNotchedRightArrowType : public CCustomShape
 {
 public:
@@ -39,3 +41,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/OctagonType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 10
+namespace NSCustomShapesConvert
+{
 class COctagonType : public CCustomShape
 {
 public:
@@ -39,3 +41,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ParallelogramType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 7
+namespace NSCustomShapesConvert
+{
 class CParallelogramType : public CCustomShape
 {
 public:
@@ -38,3 +40,4 @@ public:
         m_arHandles.push_back(oHandle1);
 	}
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PentagonType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 56
+namespace NSCustomShapesConvert
+{
 class CPentagonType : public CCustomShape
 {
 public:
@@ -24,3 +26,4 @@ public:
         LoadTextRect(_T("4200,5077,17400,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlaqueType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 21
+namespace NSCustomShapesConvert
+{
 class CPlaqueType : public CCustomShape
 {
 public:
@@ -38,3 +40,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/PlusType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 11
+namespace NSCustomShapesConvert
+{
 class CPlusType : public CCustomShape
 {
 public:
@@ -39,3 +41,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowCalloutType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 83
+namespace NSCustomShapesConvert
+{
 class CQuadArrowCalloutType : public CCustomShape
 {
 public:
@@ -49,5 +51,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/QuadArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 76
+namespace NSCustomShapesConvert
+{
 class CQuadArrowType : public CCustomShape
 {
 public:
@@ -43,3 +45,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RectangleType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 1
+namespace NSCustomShapesConvert
+{
 class CRectangleType : public CCustomShape
 {
 public:
@@ -13,3 +15,4 @@ public:
         m_strPath = _T("m,l,21600r21600,l21600,xe");
      }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonDownType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 53
+namespace NSCustomShapesConvert
+{
 class CRibbonDownType : public CCustomShape
 {
 public:
@@ -61,3 +63,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RibbonUpType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 54
+namespace NSCustomShapesConvert
+{
 class CRibbonUpType : public CCustomShape
 {
 public:
@@ -66,3 +68,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowCalloutType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 78
+namespace NSCustomShapesConvert
+{
 class CRightArrowCalloutType : public CCustomShape
 {
 public:
@@ -51,5 +53,6 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
+}
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightArrowType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 13
+namespace NSCustomShapesConvert
+{
 class CRightArrowType : public CCustomShape
 {
 public:
@@ -40,3 +42,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracetype.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 88
+namespace NSCustomShapesConvert
+{
 class CRightBracetype : public CCustomShape
 {
 public: 
@@ -42,3 +44,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightBracketType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 86
+namespace NSCustomShapesConvert
+{
 class CRightBracketType : public CCustomShape
 {
 public:
@@ -30,3 +32,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RightTriangleType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 6
+namespace NSCustomShapesConvert
+{
 class CRightTriangleType : public CCustomShape
 {
 public:
@@ -17,3 +19,4 @@ public:
         LoadTextRect(_T("1800,12600,12600,19800"));
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/RoundedRectangleType.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 2
+namespace NSCustomShapesConvert
+{
 class CRoundedRectangleType : public CCustomShape
 {
 public:
@@ -29,3 +31,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal16Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 59
+namespace NSCustomShapesConvert
+{
 class CSeal16Type : public CCustomShape
 {
 public:
@@ -40,5 +42,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
-
-
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal24Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 92
+namespace NSCustomShapesConvert
+{
 class CSeal24Type : public CCustomShape
 {
 public:
@@ -46,5 +48,5 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal32Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 60
+namespace NSCustomShapesConvert
+{
 class CSeal32Type : public CCustomShape
 {
 public:
@@ -52,5 +54,5 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
-
+}
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal4Type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 187
+namespace NSCustomShapesConvert
+{
 class CSeal4Type : public CCustomShape
 {
 public:
@@ -30,3 +32,4 @@ public:
 };
 
 
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Seal8Type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 58
+namespace NSCustomShapesConvert
+{
+
 class CSeal8Type : public CCustomShape
 {
 public:
@@ -34,5 +37,6 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
 
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SmileyFaceType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 96
+namespace NSCustomShapesConvert
+{
+
 class CSmileyFaceType : public CCustomShape
 {
 public:
@@ -29,3 +32,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Startype.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 12
+namespace NSCustomShapesConvert
+{
+
 class CStarType : public CCustomShape
 {
 public:
@@ -17,3 +20,4 @@ public:
         LoadTextRect(_T("6720,8259,14880,15628"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StraightConnectorType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 32
+namespace NSCustomShapesConvert
+{
+
 class CStraightConnectorType : public CCustomShape
 {
 public:
@@ -12,3 +15,4 @@ public:
         LoadConnectorsList(_T("0,0;21600,21600"));
     }
 };
+}

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/StripedRightArrowType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 93
+namespace NSCustomShapesConvert
+{
+
 class CStripedRightArrowType : public CCustomShape
 {
 public:
@@ -40,3 +43,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/SunType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 183
+namespace NSCustomShapesConvert
+{
+
 class CSunType : public CCustomShape
 {
 public:
@@ -44,3 +47,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TextboxType.h

@@ -3,6 +3,9 @@
 
 /////////   !!!!!!!!!!!!!!!!!!!!  /////////////
 // 202
+namespace NSCustomShapesConvert
+{
+
 class CTextboxType : public CCustomShape
 {
 public:
@@ -14,3 +17,4 @@ public:
         m_strPath = _T("m,l,21600r21600,l21600,xe");
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/TrapezoidType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 8
+namespace NSCustomShapesConvert
+{
+
 class CTrapezoidType : public CCustomShape
 {
 public:
@@ -37,3 +40,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowCalloutType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 79
+namespace NSCustomShapesConvert
+{
+
 class CUpArrowCalloutType : public CCustomShape
 {
 public:
@@ -52,5 +55,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpArrowType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 68
+namespace NSCustomShapesConvert
+{
+
 class CUpArrowType : public CCustomShape
 {
 public:
@@ -37,3 +40,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowCalloutType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 82
+namespace NSCustomShapesConvert
+{
+
 class CUpDownArrowCalloutType : public CCustomShape
 {
 public:
@@ -54,5 +57,4 @@ public:
         m_arHandles.push_back(oHandle3);
     }
 };
-
-
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UpDownArrowType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 70
+namespace NSCustomShapesConvert
+{
+
 class CUpDownArrowType : public CCustomShape
 {
 public:
@@ -43,3 +46,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/UturnArrowType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 101
+namespace NSCustomShapesConvert
+{
+
 class CUturnArrowType : public CCustomShape
 {
 public:
@@ -23,3 +26,4 @@ public:
         LoadTextRect(_T("0,8310,6110,21600"));
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/VerticalScrollType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 97
+namespace NSCustomShapesConvert
+{
+
 class CVerticalScrollType : public CCustomShape
 {
 public:
@@ -49,3 +52,4 @@ public:
 		m_lLimoY = 10800;
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveDoubleType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 188
+namespace NSCustomShapesConvert
+{
+
 class CWaveDoubleType : public CCustomShape
 {
 public:
@@ -89,3 +92,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WaveType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 64
+namespace NSCustomShapesConvert
+{
+
 class CWaveType : public CCustomShape
 {
 public:
@@ -76,3 +79,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeEllipseCalloutType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 63
+namespace NSCustomShapesConvert
+{
+
 class CWedgeEllipseCalloutType : public CCustomShape
 {
 public:
@@ -47,3 +50,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRectCalloutType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 61
+namespace NSCustomShapesConvert
+{
+
 class CWedgeRectCalloutType : public CCustomShape
 {
 public:
@@ -59,3 +62,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/WedgeRoundedRectCalloutType.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 62
+namespace NSCustomShapesConvert
+{
+
 class CWedgeRoundedRectCalloutType : public CCustomShape
 {
 public:
@@ -60,3 +63,4 @@ public:
         m_arHandles.push_back(oHandle1);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout1type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 50
+namespace NSCustomShapesConvert
+{
+
 class CAccentBorderCallout1Type : public CCustomShape
 {
 public:
@@ -35,3 +38,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout3type.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 52
+namespace NSCustomShapesConvert
+{
 class CAccentBorderCallout3Type : public CCustomShape
 {
 public:
@@ -50,3 +52,4 @@ public:
         m_arHandles.push_back(oHandle4);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/accentbordercallout90type.h

@@ -2,6 +2,9 @@
 #include "../CustomShape.h"
 
 // 181
+namespace NSCustomShapesConvert
+{
+
 class CAccentBorderCallout90Type : public CCustomShape
 {
 public:
@@ -34,3 +37,4 @@ public:
         m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/arctype.h

@@ -2,6 +2,8 @@
 #include "../CustomShape.h"
 
 // 19
+namespace NSCustomShapesConvert
+{
 class CArcType : public CCustomShape
 {
 public:
@@ -35,3 +37,4 @@ public:
 		m_arHandles.push_back(oHandle2);
     }
 };
+}
\ No newline at end of file

ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp

@@ -866,7 +866,6 @@ void XlsConverter::convert(ODRAW::OfficeArtRecord * art)
 			art->serialize(strm);
         
 			xlsx_context->get_drawing_context().set_sheet_anchor(strm.str());
-			xlsx_context->get_drawing_context().set_child_anchor(ch->_x, ch->_y, ch->_cx, ch->_cy);
 		}break;
 	}
 }

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_comments_context.cpp

@@ -127,7 +127,7 @@ void xlsx_comments_context::start_comment ()
 {
     impl_->current_.ref_		= L"";
 	impl_->current_.visibly_	= false;
-	impl_->current_.fill_		= L"ffff3f";
+	impl_->current_.fill_		= L"FFFFE1";
 	impl_->current_.line_		= L"3465af";
 }
 void xlsx_comments_context::set_size (double width_pt, double height_pt, double x_pt, double y_pt)

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_drawing_context.cpp

@@ -750,8 +750,7 @@ void xlsx_drawing_context::serialize_shape(_drawing_state_ptr & drawing_state)
 
 std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & drawing_state)
 {
-
-	CCustomShape * shape = CCustomShape::CreateByType(drawing_state->shape_id);
+	NSCustomShapesConvert::CCustomShape * shape = NSCustomShapesConvert::CCustomShape::CreateByType(drawing_state->shape_id);
 	if (shape == NULL) return L"";
 
 	std::wstring strResult;
@@ -773,7 +772,7 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra
 	
 	for (int i = 0 ; i < drawing_state->custom_guides.size(); i++)
 	{//todooo / !!
-		NSCustomVML::CGuide guid;
+		NSCustomShapesConvert::CGuide guid;
 		
 		guid.m_eType		= drawing_state->custom_guides[i].m_eType;
 		guid.m_param_type1	= drawing_state->custom_guides[i].m_param_type1;
@@ -790,10 +789,10 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra
 	{
 		if (0 == drawing_state->custom_segments[i].m_nCount)
 		{
-			if ((NSGuidesVML::rtEnd			!= drawing_state->custom_segments[i].m_eRuler) &&
-				(NSGuidesVML::rtNoFill		!= drawing_state->custom_segments[i].m_eRuler) &&
-				(NSGuidesVML::rtNoStroke	!= drawing_state->custom_segments[i].m_eRuler) &&
-				(NSGuidesVML::rtClose		!= drawing_state->custom_segments[i].m_eRuler))
+			if ((NSCustomShapesConvert::rtEnd			!= drawing_state->custom_segments[i].m_eRuler) &&
+				(NSCustomShapesConvert::rtNoFill		!= drawing_state->custom_segments[i].m_eRuler) &&
+				(NSCustomShapesConvert::rtNoStroke	!= drawing_state->custom_segments[i].m_eRuler) &&
+				(NSCustomShapesConvert::rtClose		!= drawing_state->custom_segments[i].m_eRuler))
 			{
 				continue;
 			}
@@ -809,7 +808,7 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra
 		}
 	}
 	if (drawing_state->custom_path >=0)
-		shape->m_oCustomVML.SetPath((NSGuidesVML::RulesType)drawing_state->custom_path);
+		shape->m_oCustomVML.SetPath((NSCustomShapesConvert::RulesType)drawing_state->custom_path);
 	
 	shape->m_oCustomVML.ToCustomShape(shape, shape->m_oManager);
 	shape->ReCalculate();
@@ -822,12 +821,12 @@ std::wstring xlsx_drawing_context::convert_custom_shape(_drawing_state_ptr & dra
 		shape->m_oPath.SetCoordsize(drawing_state->custom_rect.cx, drawing_state->custom_rect.cy);
 	}
 
-	NSGuidesVML::CFormParam pParamCoef;
-	pParamCoef.m_eType = NSGuidesVML::ptValue;
+	NSCustomShapesConvert::CFormParam pParamCoef;
+	pParamCoef.m_eType = NSCustomShapesConvert::ptValue;
 	pParamCoef.m_lParam = 65536;
 	pParamCoef.m_lCoef = 65536;
 	
-	NSGuidesVML::CFormulaConverter pFormulaConverter;
+	NSCustomShapesConvert::CFormulaConverter pFormulaConverter;
 
 	//coeff
 	pFormulaConverter.ConvertCoef(pParamCoef);