fix users files

XlsFormat olap hierarchy
...

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -49,6 +49,8 @@
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
+#pragma comment(lib, "Rpcrt4.lib")
+
 HRESULT convert_single(std::wstring sSrcDoc)
 {
 	HRESULT hr = S_OK;

ASCOfficeDocxFile2/BinWriter/BinEquationWriter.h

@@ -144,9 +144,13 @@ namespace MathEquation
 			void AddAccent (MEMBELTYPE eType)
 			{
 				LONG lPos = GetSize() - 1;
+
+				if (lPos < 0) return;
+				
 				EquationRun oRun;
 				oRun = arrRun[lPos];
 				RemoveElem(lPos);
+				
 				oRun.bAccent = true;
 				oRun.eType = eType;
 				Add(oRun);
@@ -1675,7 +1679,7 @@ namespace MathEquation
 
 			void WriteEndNode(BinaryEquationWriter* pWriter)
 			{
-				int nCurPos;
+				int nCurPos = -1;
 				if (!m_aBaseStack.empty())
 				{
 					nCurPos = m_aBaseStack.top();
@@ -1687,13 +1691,19 @@ namespace MathEquation
 				}
 
 				if (bPile && bEqArrayStart)
+				{
 					pWriter->WriteItemEnd(nCurPos);
+				}
 				else if (!bPile && !bEqArrayStart)
+				{
 					pWriter->WriteItemEnd(nCurPos);
+				}
 				else if (!bPile && bEqArrayStart)
 				{					
 					pWriter->m_aRowsCounter.push(nRows);
 					bEqArrayStart = false;
+					
+					if (nCurPos > 0)
 						pWriter->WriteItemEnd(nCurPos);//eqArr
 
 					if (!m_aBaseStack.empty())

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp

@@ -794,7 +794,7 @@ void NSPresentationEditor::CPPTXWriter::WriteBackground(CStringWriter& oWriter,
 	oWriter.WriteString(std::wstring(L"</p:bgPr></p:bg>"));
 }
 
-void NSPresentationEditor::CPPTXWriter::WriteElement(CStringWriter& oWriter, CRelsGenerator& oRels, IElement* pElement, CLayout* pLayout)
+void NSPresentationEditor::CPPTXWriter::WriteElement(CStringWriter& oWriter, CRelsGenerator& oRels, CElementPtr pElement, CLayout* pLayout)
 {
 	if (!pElement) return;
 
@@ -817,7 +817,7 @@ void NSPresentationEditor::CPPTXWriter::WriteElement(CStringWriter& oWriter, CRe
 					if ((pElement->m_lPlaceholderType == pLayout->m_arElements[nIndex]->m_lPlaceholderType) &&
 						(pElement->m_lPlaceholderID == pLayout->m_arElements[nIndex]->m_lPlaceholderID))
 					{
-						IElement* pElLayout = pLayout->m_arElements[nIndex];
+						CElementPtr pElLayout = pLayout->m_arElements[nIndex];
 						
 						bool bIsEqualTransform = ((pElement->m_dRotate == pElLayout->m_dRotate) 
 							&& (pElement->m_bFlipH == pElLayout->m_bFlipH) && (pElement->m_bFlipV == pElLayout->m_bFlipV));

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.h

@@ -82,7 +82,7 @@ namespace NSPresentationEditor
 		void WriteTransition	(CStringWriter& oWriter, CTransition& transition);		
 		void WriteColorScheme	(CStringWriter& oWriter, const std::wstring & name, const std::vector<CColor> & colors, bool extra = false);
 		void WriteBackground	(CStringWriter& oWriter, CRelsGenerator& oRels, CBrush& oBackground);
-		void WriteElement		(CStringWriter& oWriter, CRelsGenerator& oRels, IElement* pElement, CLayout* pLayout = NULL);
+		void WriteElement		(CStringWriter& oWriter, CRelsGenerator& oRels, CElementPtr pElement, CLayout* pLayout = NULL);
 		
 
 	};

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp

@@ -293,10 +293,10 @@ NSPresentationEditor::CShapeWriter::CShapeWriter()
 	m_pImageElement = NULL;
 	m_pShapeElement = NULL;
 }
-bool NSPresentationEditor::CShapeWriter::SetElement(IElement* pElem)
+bool NSPresentationEditor::CShapeWriter::SetElement(CElementPtr pElem)
 {
-    m_pShapeElement = dynamic_cast<CShapeElement*>(pElem);
-    m_pImageElement = dynamic_cast<CImageElement*>(pElem);
+    m_pShapeElement = dynamic_cast<CShapeElement*>(pElem.get());
+    m_pImageElement = dynamic_cast<CImageElement*>(pElem.get());
 	
 	m_pSimpleGraphicsConverter->PathCommandEnd();
 
@@ -309,7 +309,7 @@ bool NSPresentationEditor::CShapeWriter::SetElement(IElement* pElem)
 
 	if (m_pShapeElement)
 	{
-		m_pShapeElement->m_oShape.GetTextRect(m_oTextRect);
+		m_pShapeElement->m_pShape->GetTextRect(m_oTextRect);
 	}
 
 	m_oWriter.ClearNoAttack();
@@ -809,7 +809,7 @@ void NSPresentationEditor::CShapeWriter::WriteShapeInfo()
 }
 void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 {
-	size_t nCount = m_pShapeElement->m_oShape.m_oText.m_arParagraphs.size();
+	size_t nCount = m_pShapeElement->m_pShape->m_oText.m_arParagraphs.size();
 
 	m_oWriter.WriteString(std::wstring(L"<p:txBody>"));
 
@@ -826,21 +826,21 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 	
 //	m_oWriter.WriteString(std::wstring(L" lIns=\"0\" tIns=\"0\" rIns=\"0\" bIns=\"0\""));
 
-	if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 0 )			
+	if (m_pShapeElement->m_pShape->m_oText.m_oAttributes.m_nTextAlignVertical == 0 )			
 		m_oWriter.WriteString(L" anchor=\"t\"");
-	else if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 2 )	
+	else if (m_pShapeElement->m_pShape->m_oText.m_oAttributes.m_nTextAlignVertical == 2 )	
 		m_oWriter.WriteString(L" anchor=\"b\"");
-	else if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_nTextAlignVertical == 1 )	
+	else if (m_pShapeElement->m_pShape->m_oText.m_oAttributes.m_nTextAlignVertical == 1 )	
 	{
 		m_oWriter.WriteString(L" anchor=\"ctr\"");
 		m_oWriter.WriteString(L" anchorCtr=\"0\"");
 	}
-	if (m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_dTextRotate > 0)
+	if (m_pShapeElement->m_pShape->m_oText.m_oAttributes.m_dTextRotate > 0)
 	{
-		std::wstring strProp = std::to_wstring((int)(m_pShapeElement->m_oShape.m_oText.m_oAttributes.m_dTextRotate * 60000));
+		std::wstring strProp = std::to_wstring((int)(m_pShapeElement->m_pShape->m_oText.m_oAttributes.m_dTextRotate * 60000));
 		m_oWriter.WriteString(L" rot=\"" + strProp + L"\"");
 	}
-	if (m_pShapeElement->m_oShape.m_oText.m_bVertical)
+	if (m_pShapeElement->m_pShape->m_oText.m_bVertical)
 	{
 		m_oWriter.WriteString(L" vert=\"eaVert\"");
 	}
@@ -853,7 +853,7 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 			m_oWriter.WriteString(std::wstring(L" prst=\"") + prstTxWarp + _T("\">"));
 			m_oWriter.WriteString(std::wstring(L"<a:avLst>"));//модификаторы
 
-			CPPTShape *pPPTShape = dynamic_cast<CPPTShape *>(m_pShapeElement->m_oShape.getBaseShape());
+			CPPTShape *pPPTShape = dynamic_cast<CPPTShape *>(m_pShapeElement->m_pShape->getBaseShape().get());
             std::wstring strVal;
 
 			for (int i = 0 ; (pPPTShape) && (i < pPPTShape->m_arAdjustments.size()); i++)
@@ -875,7 +875,7 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 			m_oWriter.WriteString(L"</a:avLst>");
 		m_oWriter.WriteString(L"</a:prstTxWarp>");
 	}
-	if (m_pShapeElement->m_oShape.m_oText.m_bAutoFit)
+	if (m_pShapeElement->m_pShape->m_oText.m_bAutoFit)
 	{
 		m_oWriter.WriteString(L"<a:spAutoFit/>");
 	}
@@ -890,14 +890,14 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 
 	if (!m_bWordArt)
 	{
-		CStylesWriter::ConvertStyles(m_pShapeElement->m_oShape.m_oText.m_oStyles, m_oMetricInfo, m_oWriter);
+		CStylesWriter::ConvertStyles(m_pShapeElement->m_pShape->m_oText.m_oStyles, m_oMetricInfo, m_oWriter);
 	}
 
 	m_oWriter.WriteString(std::wstring(L"</a:lstStyle>"));
 
 	for (size_t nIndexPar = 0; nIndexPar < nCount; ++nIndexPar)
 	{
-		NSPresentationEditor::CParagraph* pParagraph = &m_pShapeElement->m_oShape.m_oText.m_arParagraphs[nIndexPar];
+		NSPresentationEditor::CParagraph* pParagraph = &m_pShapeElement->m_pShape->m_oText.m_arParagraphs[nIndexPar];
 
 		//if (m_bWordArt && nIndexPar == nCount-1)
 		//{
@@ -1308,11 +1308,11 @@ std::wstring NSPresentationEditor::CShapeWriter::ConvertShape()
 		m_oWriter.WriteString(std::wstring(L"</a:xfrm>"));
 	}
 
-	CBaseShape *shape = m_pShapeElement->m_oShape.getBaseShape();
+	CBaseShapePtr & shape = m_pShapeElement->m_pShape->getBaseShape();
 
-	if (m_pShapeElement->m_oShape.m_lDrawType & c_ShapeDrawType_Graphic || shape->m_bCustomShape)
+	if (m_pShapeElement->m_pShape->m_lDrawType & c_ShapeDrawType_Graphic || shape->m_bCustomShape)
 	{
-		m_pShapeElement->m_oShape.ToRenderer(dynamic_cast<IRenderer*>(this), oInfo, m_oMetricInfo, 0.0, 1.0);
+		m_pShapeElement->m_pShape->ToRenderer(dynamic_cast<IRenderer*>(this), oInfo, m_oMetricInfo, 0.0, 1.0);
 	}
 
 	if ((prstGeom.empty() == false || m_pShapeElement->m_bShapePreset) && prstTxWarp.empty() && !shape->m_bCustomShape)

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.h

@@ -170,7 +170,7 @@ namespace NSPresentationEditor
 			m_lNextShapeID = 1000;
 		}
 
-		bool SetElement(IElement* pElem);
+		bool SetElement(CElementPtr pElem);
 //--------------------------------------------------------------------
             std::wstring	ConvertShape	();
             std::wstring	ConvertImage	();

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h

@@ -93,6 +93,7 @@ public:
            
 			bool bResult = pInfo->ReadFromStream(&oUserAtom, pStream);
 
+			m_bMacros					= pInfo->m_bMacros;
 			offsetToEdit				= pInfo->m_oUser.m_nOffsetLastEdit;
 			m_oCurrentUser.m_bIsEncrypt = pInfo->m_bEncrypt;
 			

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.h

@@ -310,15 +310,15 @@ public:
 		return _T("blank");
 	}
 	
-	void AddAnimation		(DWORD dwSlideID, double Width, double Height, IElement* pElement);
+	void AddAnimation		(DWORD dwSlideID, double Width, double Height, CElementPtr pElement);
 	void AddAudioTransition (DWORD dwSlideID, CTransition* pTransition, const std::wstring& strFilePath);
 
 	int			AddNewLayout(NSPresentationEditor::CTheme* pTheme, CRecordSlide* pRecordSlide, bool addShapes, bool bMasterObjects);
 	
-	IElement*	AddNewLayoutPlaceholder		(CLayout *pLayout,	int placeholderType, int placeholderSizePreset = -1);
+	CElementPtr	AddNewLayoutPlaceholder		(CLayout *pLayout,	int placeholderType, int placeholderSizePreset = -1);
 
-	IElement*	AddNewThemePlaceholder		(CTheme* pTheme,	int placeholderType, int placeholderSizePreset = -1);
+	CElementPtr	AddNewThemePlaceholder		(CTheme* pTheme,	int placeholderType, int placeholderSizePreset = -1);
 	
-	IElement*	AddThemeLayoutPlaceholder	(CLayout *pLayout,	int placeholderType, CTheme* pTheme, bool idx_only = false);
-	IElement*	AddLayoutSlidePlaceholder	(CSlide *pSlide,	int placeholderType, CLayout *pLayout, bool idx_only = false);
+	CElementPtr	AddThemeLayoutPlaceholder	(CLayout *pLayout,	int placeholderType, CTheme* pTheme, bool idx_only = false);
+	CElementPtr	AddLayoutSlidePlaceholder	(CSlide *pSlide,	int placeholderType, CLayout *pLayout, bool idx_only = false);
 };

ASCOfficePPTFile/PptFormatTest/PptFormatTest.cpp

@@ -38,6 +38,8 @@
 
 #include <tchar.h>
 
+#pragma comment(lib, "Rpcrt4.lib")
+
 #if defined(_WIN64)
 	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
 #elif defined (_WIN32)
@@ -46,6 +48,10 @@
 
 int _tmain(int argc, _TCHAR* argv[])
 {
+//#ifdef _DEBUG
+//		_CrtDumpMemoryLeaks();
+//#endif
+		
 	if (argc < 2) return 1;
 
 	std::wstring sSrcPpt	= argv[1];

ASCOfficePPTFile/PptFormatTest/PptFormatTest.vcproj

@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../DesktopEditor/xml/build/vs2005;../../DesktopEditor/xml/libxml2/include"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;USE_ATL_CSTRINGS;_USE_MATH_DEFINES;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;PPT_FORMAT;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;_PRESENTATION_WRITER_;_SVG_CONVERT_TO_IMAGE_;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;_PRESENTATION_WRITER_;_SVG_CONVERT_TO_IMAGE_;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -982,12 +982,12 @@ HRESULT CDrawingConverter::AddShapeType(const std::wstring& bsXml)
         std::wstring strId = oNodeST.GetAttribute(L"id");
 		pShape->LoadFromXMLShapeType(oNodeST);
 
-		CShape* pS = new CShape(NSBaseShape::unknown, 0);
-		pS->setBaseShape(pShape);
+		CShapePtr pS = CShapePtr(new CShape(NSBaseShape::unknown, 0));
+		pS->setBaseShape(CBaseShapePtr(pShape));
 		
 		LoadCoordSize(oNodeST, pS);
 
-		m_mapShapeTypes.insert(std::pair<std::wstring, CShape*>(strId, pS));			
+		m_mapShapeTypes.insert(std::pair<std::wstring, CShapePtr>(strId, pS));			
     }
 
 	return S_OK;
@@ -1845,12 +1845,16 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 		{
 			strType = strType.substr(1);
 
-			std::map<std::wstring, CShape*>::iterator pPair = m_mapShapeTypes.find(strType);
+			std::map<std::wstring, CShapePtr>::iterator pPair = m_mapShapeTypes.find(strType);
 			if (m_mapShapeTypes.end() != pPair)
 			{
+				CBaseShapePtr & base_shape_type = pPair->second->getBaseShape();
+				CPPTShape* ppt_shape_type = dynamic_cast<CPPTShape*>(base_shape_type.get());
+				
 				pPPTShape = new CPPTShape();
-				pPair->second->getBaseShape()->SetToDublicate(pPPTShape);
-				pPPTShape->m_eType = ((CPPTShape*)(pPair->second->getBaseShape()))->m_eType;
+				base_shape_type->SetToDublicate(pPPTShape);
+
+				pPPTShape->m_eType = ppt_shape_type->m_eType;
 			}
 		}
 		
@@ -1880,28 +1884,28 @@ void CDrawingConverter::doc_LoadShape(PPTX::Logic::SpTreeElem *elem, XmlUtils::C
 				pPPTShape->m_eType = PPTShapes::sptCustom;
 			}			
 		}
-		oShapeElem.m_oShape.setBaseShape(pPPTShape);
+		oShapeElem.m_pShape->setBaseShape(CBaseShapePtr(pPPTShape));
 		
 		if (bIsNeedCoordSizes)
 		{
-			LoadCoordPos(oNodeShape, &oShapeElem.m_oShape); //for path calculate
+			LoadCoordPos(oNodeShape, oShapeElem.m_pShape); //for path calculate
 		}
 		pPPTShape->LoadFromXMLShapeType(oNodeShape);
 	}
 
 	if (pPPTShape != NULL)
 	{	
-		oShapeElem.m_oShape.setBaseShape(pPPTShape);
+		oShapeElem.m_pShape->setBaseShape(CBaseShapePtr(pPPTShape));
 		if (bIsNeedCoordSizes)
 		{
-			LoadCoordSize(oNodeShape, &oShapeElem.m_oShape);
+			LoadCoordSize(oNodeShape, oShapeElem.m_pShape);
 		}
 		else
 		{
-			oShapeElem.m_oShape.m_dWidthLogic  = 21600;
-			oShapeElem.m_oShape.m_dHeightLogic = 21600;
+			oShapeElem.m_pShape->m_dWidthLogic  = 21600;
+			oShapeElem.m_pShape->m_dHeightLogic = 21600;
 
-			oShapeElem.m_oShape.getBaseShape()->m_oPath.SetCoordsize(21600, 21600);			
+			oShapeElem.m_pShape->getBaseShape()->m_oPath.SetCoordsize(21600, 21600);			
 		}
 
         std::wstring strXmlPPTX;
@@ -2812,12 +2816,12 @@ void CDrawingConverter::doc_LoadGroup(PPTX::Logic::SpTreeElem *result, XmlUtils:
 
 						pShape->LoadFromXMLShapeType(oNodeT);
 
-						CShape* pS = new CShape(NSBaseShape::unknown, 0);
-						pS->setBaseShape(pShape);
+						CShapePtr pS = CShapePtr(new CShape(NSBaseShape::unknown, 0));
+						pS->setBaseShape(CBaseShapePtr(pShape));
 						
 						LoadCoordSize(oNodeT, pS);
 
-						m_mapShapeTypes.insert(std::pair<std::wstring, CShape*>(strId, pS));	
+						m_mapShapeTypes.insert(std::pair<std::wstring, CShapePtr>(strId, pS));	
 					}
 				}
 			}
@@ -2989,8 +2993,10 @@ void CDrawingConverter::doc_LoadGroup(PPTX::Logic::SpTreeElem *result, XmlUtils:
 	
 	result->InitElem(pTree);
 }
-void CDrawingConverter::LoadCoordPos(XmlUtils::CXmlNode& oNode, CShape* pShape)
+void CDrawingConverter::LoadCoordPos(XmlUtils::CXmlNode& oNode, CShapePtr pShape)
 {
+	if (!pShape) return;
+
 	pShape->m_dXLogic	= 0;
 	pShape->m_dYLogic	= 0;
 
@@ -3030,8 +3036,10 @@ void CDrawingConverter::LoadCoordPos(XmlUtils::CXmlNode& oNode, CShape* pShape)
 }
 
 
-void CDrawingConverter::LoadCoordSize(XmlUtils::CXmlNode& oNode, CShape* pShape)
+void CDrawingConverter::LoadCoordSize(XmlUtils::CXmlNode& oNode, CShapePtr pShape)
 {
+	if (!pShape) return;
+	
 	pShape->m_dWidthLogic	= ShapeSizeVML;
 	pShape->m_dHeightLogic	= ShapeSizeVML;
 
@@ -5327,16 +5335,10 @@ int CDrawingConverter::GetDocumentChartsCount ()
 OOX::CContentTypes* CDrawingConverter::GetContentTypes()
 {
 	return m_pImageManager->m_pContentTypes;
-    //return m_pReader->mm_strContentTypes;
 }
 
 void CDrawingConverter::Clear()
 {
-	for (std::map<std::wstring, CShape*>::iterator pPair = m_mapShapeTypes.begin(); pPair != m_mapShapeTypes.end(); ++pPair)
-	{
-		CShape* pMem = pPair->second;
-		RELEASEOBJECT(pMem);
-	}
 	m_mapShapeTypes.clear();
 }
 void CDrawingConverter::SetRels(smart_ptr<OOX::IFileContainer> container)

ASCOfficePPTXFile/ASCOfficeDrawingConverter.h

@@ -43,11 +43,14 @@
 #include <map>
 
 class IRenderer;
-class CShape;
-class CPPTShape;
 class CFontManager;
 class COfficeFontPicker;
 
+class CShape;
+typedef boost::shared_ptr<CShape> CShapePtr;
+
+class CPPTShape;
+
 namespace XmlUtils
 {
 	class CXmlNode;
@@ -187,7 +190,7 @@ namespace NSBinPptxRW
 		};
 
 
-        std::map<std::wstring, CShape*>						m_mapShapeTypes;
+        std::map<std::wstring, CShapePtr>					m_mapShapeTypes;
 
         NSBinPptxRW::CBinaryFileWriter*                     m_pBinaryWriter;
         int                                                 m_lNextId;
@@ -276,8 +279,8 @@ namespace NSBinPptxRW
         void CheckBrushShape        (PPTX::Logic::SpTreeElem* oElem, XmlUtils::CXmlNode& oNode, PPTShapes::ShapeType eType, CPPTShape* pPPTShape);
         void CheckPenShape          (PPTX::Logic::SpTreeElem* oElem, XmlUtils::CXmlNode& oNode, PPTShapes::ShapeType eType, CPPTShape* pPPTShape);
 
-        void LoadCoordSize			(XmlUtils::CXmlNode& oNode, ::CShape* pShape);
-		void LoadCoordPos			(XmlUtils::CXmlNode& oNode, ::CShape* pShape);
+        void LoadCoordSize			(XmlUtils::CXmlNode& oNode, ::CShapePtr pShape);
+		void LoadCoordPos			(XmlUtils::CXmlNode& oNode, ::CShapePtr pShape);
        
 		std::wstring GetDrawingMainProps (XmlUtils::CXmlNode& oNode, PPTX::CCSS& oCssStyles, CSpTreeElemProps& oProps);
 

ASCOfficePPTXFile/Editor/Drawing/Document.h

@@ -103,13 +103,13 @@ namespace NSPresentationEditor
 			size_t nCountElems = pSlide->m_arElements.size();
 			for (size_t i = 0; i < nCountElems; ++i)
 			{
-				IElement* pElement = pSlide->m_arElements[i];
+				CElementPtr pElement = pSlide->m_arElements[i];
 
 				switch (pElement->m_etType)
 				{
 				case etAudio:
 					{
-						CAudioElement* pAudioElem = dynamic_cast<CAudioElement*>(pElement);
+						CAudioElement* pAudioElem = dynamic_cast<CAudioElement*>(pElement.get());
 
 						if (NULL != pAudioElem)
 						{
@@ -147,9 +147,9 @@ namespace NSPresentationEditor
 			}
 		}
 
-		void ResetAutoText(IElement *pElement, vector_string const (&placeholdersReplaceString)[3])
+		void ResetAutoText(CElementPtr pElement, vector_string const (&placeholdersReplaceString)[3])
 		{
-			CShapeElement* pShape = dynamic_cast<CShapeElement*>(pElement);
+			CShapeElement* pShape = dynamic_cast<CShapeElement*>(pElement.get());
 			
 			if (NULL == pShape) return;
 			
@@ -193,7 +193,7 @@ namespace NSPresentationEditor
 				size_t nCountElems = pTheme->m_arElements.size();
 				for (size_t nIndexEl = 0; nIndexEl < nCountElems; ++nIndexEl)
 				{
-					IElement* pElement = pTheme->m_arElements[nIndexEl];
+					CElementPtr pElement = pTheme->m_arElements[nIndexEl];
 
 					if (pElement->m_lPlaceholderType > 0)
 					{
@@ -219,7 +219,7 @@ namespace NSPresentationEditor
 					size_t nCountLayoutElements = pLayout->m_arElements.size();
 					for (size_t nIndexLayoutEl = 0; nIndexLayoutEl < nCountLayoutElements; ++nIndexLayoutEl)
 					{
-						IElement* pElement = pLayout->m_arElements[nIndexLayoutEl];
+						CElementPtr pElement = pLayout->m_arElements[nIndexLayoutEl];
 						
 						if (pElement->m_lPlaceholderType > 0)
 						{
@@ -232,7 +232,7 @@ namespace NSPresentationEditor
 						pElement->m_pTheme = pTheme;
 						pElement->m_pLayout = NULL;
 
-						CShapeElement* pShape = dynamic_cast<CShapeElement*>(pElement);
+						CShapeElement* pShape = dynamic_cast<CShapeElement*>(pElement.get());
 						if (!pLayout->m_bUseThemeColorScheme && NULL != pShape)
 						{
 							int lPhType = pElement->m_lPlaceholderType;
@@ -253,20 +253,20 @@ namespace NSPresentationEditor
 								if (pThemeStyles->m_pLevels[nIndexLevel]->m_oCFRun.Color->m_lSchemeIndex == -1)
 									continue;
 
-								if (pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0].is_init())
+								if (pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0].is_init())
 								{
-									if (pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color.is_init())
+									if (pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color.is_init())
 									{
 
-										if (pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->m_lSchemeIndex != -1)
+										if (pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->m_lSchemeIndex != -1)
 											continue;
 								
 										LONG lIndexSchemeT = pThemeStyles->m_pLevels[nIndexLevel]->m_oCFRun.Color->m_lSchemeIndex;
 
-										pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->m_lSchemeIndex = -1;
-										pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->R = pLayout->m_arColorScheme[lIndexSchemeT].R;
-										pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->G = pLayout->m_arColorScheme[lIndexSchemeT].G;
-										pShape->m_oShape.m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->B = pLayout->m_arColorScheme[lIndexSchemeT].B;
+										pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->m_lSchemeIndex = -1;
+										pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->R = pLayout->m_arColorScheme[lIndexSchemeT].R;
+										pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->G = pLayout->m_arColorScheme[lIndexSchemeT].G;
+										pShape->m_pShape->m_oText.m_oStyles.m_pLevels[0]->m_oCFRun.Color->B = pLayout->m_arColorScheme[lIndexSchemeT].B;
 										
 										bIsPlaceholderSetUp = true;
 									}
@@ -301,7 +301,7 @@ namespace NSPresentationEditor
 				size_t nCountElems = pSlide->m_arElements.size();
 				for (size_t nIndexEl = 0; nIndexEl < nCountElems; ++nIndexEl)
 				{
-					IElement* pElement = pSlide->m_arElements[nIndexEl];
+					CElementPtr pElement = pSlide->m_arElements[nIndexEl];
 
 					if (pElement->m_lPlaceholderType > 0)
 					{

ASCOfficePPTXFile/Editor/Drawing/Element.h

@@ -124,11 +124,11 @@ namespace NSPresentationEditor
 	class CLayout;
 	class CSlide;
 
-	class IElement
-	{
-	protected:
-		ULONG m_lCountRef;
+class CElement;
+typedef boost::shared_ptr<CElement> CElementPtr;
 
+	class CElement
+	{
 	public:
 		ElementType			m_etType;
 		CDoubleRect			m_rcBounds;
@@ -181,23 +181,7 @@ namespace NSPresentationEditor
 
 		std::wstring		m_sHyperlink;
 
-		virtual ULONG AddRef()
-		{
-			++m_lCountRef;
-			return m_lCountRef;
-		}
-		virtual ULONG Release()
-		{
-			--m_lCountRef;
-			if (0 == m_lCountRef)
-			{
-				delete this;
-				return 0;
-			}
-			return m_lCountRef;
-		}
-
-		IElement()
+		CElement()
 		{
 			m_bIsBackground				= false;
 			m_bHaveAnchor				= true;
@@ -237,12 +221,10 @@ namespace NSPresentationEditor
 			m_bFlipV					= false;
 			m_bLine						= true;
 
-			m_lCountRef					= 1;
-
 			m_pTheme					= NULL;
 			m_pLayout					= NULL;
 		}
-		virtual ~IElement()
+		virtual ~CElement()
 		{
 		}
 
@@ -263,12 +245,11 @@ namespace NSPresentationEditor
 			m_rcBoundsOriginal.top		= dScaleY * m_rcBounds.top;
 			m_rcBoundsOriginal.bottom	= dScaleY * m_rcBounds.bottom;
 		}
-		virtual IElement* CreateDublicate() = 0;
+		virtual CElementPtr CreateDublicate() = 0;
 
-	protected:
-		virtual void SetProperiesToDublicate(IElement* pDublicate)
+		virtual void SetProperiesToDublicate(CElementPtr pDublicate)
 		{
-			if (NULL == pDublicate)
+			if (!pDublicate)
 				return;
 
 			pDublicate->m_bBoundsEnabled			= m_bBoundsEnabled;

ASCOfficePPTXFile/Editor/Drawing/Elements.cpp

@@ -63,7 +63,7 @@ void NSPresentationEditor::CShapeElement::CalculateColor(CColor& oColor, CSlide*
 
 void NSPresentationEditor::CShapeElement::SetupTextProperties(CSlide* pSlide, CTheme* pTheme, CLayout* pLayout)
 {
-	NSPresentationEditor::CTextAttributesEx* pAttributes = &m_oShape.m_oText;
+	NSPresentationEditor::CTextAttributesEx* pAttributes = &m_pShape->m_oText;
 	int nCountColors = 0;
 	if (NULL != pTheme)
 		nCountColors = (int)pTheme->m_arColorScheme.size();
@@ -123,7 +123,7 @@ void NSPresentationEditor::CShapeElement::SetupTextProperties(CSlide* pSlide, CT
 bool NSPresentationEditor::CShapeElement::SetUpTextPlaceholder(std::wstring newText)
 {
 	bool result = false;
-	NSPresentationEditor::CTextAttributesEx* pText = &m_oShape.m_oText;
+	NSPresentationEditor::CTextAttributesEx* pText = &m_pShape->m_oText;
 
 	for (size_t p = 0 ; p < pText->m_arParagraphs.size(); p++) //тут по всем -> 1-(33).ppt
 	{

ASCOfficePPTXFile/Editor/Drawing/Elements.h

@@ -284,7 +284,7 @@ namespace PPTX2EditorAdvanced
 
 namespace NSPresentationEditor
 {
-	class CImageElement : public IElement
+	class CImageElement : public CElement
 	{
 	public:
 		std::wstring	m_strImageFileName;
@@ -306,7 +306,7 @@ namespace NSPresentationEditor
 
 		std::wstring	m_sImageName;
 
-		CImageElement() : IElement()
+		CImageElement() : CElement()
 		{
 			m_etType = etPicture;
 			
@@ -328,11 +328,13 @@ namespace NSPresentationEditor
 		virtual ~CImageElement()
 		{
 		}
-		virtual IElement* CreateDublicate()
+		virtual CElementPtr CreateDublicate()
 		{
 			CImageElement* pImageElement = new CImageElement();
 
-			SetProperiesToDublicate((IElement*)pImageElement);
+			CElementPtr	pElement = CElementPtr(	pImageElement );
+			
+			SetProperiesToDublicate(pElement);
 
 			pImageElement->m_strImageFileName		= m_strImageFileName;
 			pImageElement->m_nAlpha					= m_nAlpha;
@@ -349,7 +351,7 @@ namespace NSPresentationEditor
 			pImageElement->m_bImagePresent			= m_bImagePresent;
 			pImageElement->m_bOLE					= m_bOLE;
 
-			return (IElement*)pImageElement;
+			return pElement;
 		}
         AVSINLINE std::wstring ConvertPPTShapeToPPTX(bool bIsNamespace = false)
 		{
@@ -389,79 +391,90 @@ namespace NSPresentationEditor
 		}
 	};
 
-	class CShapeElement : public IElement
+	class CShapeElement : public CElement
 	{
 	public:
 		NSBaseShape::ClassType m_ClassType;
 
 		int			m_lShapeType;
-		CShape		m_oShape;
+		CShapePtr	m_pShape;
 		bool		m_bShapePreset; // or rect (
 		
-		CShapeElement(NSBaseShape::ClassType ClassType, int eType) : IElement(), m_lShapeType(eType), m_oShape(ClassType, eType)
+		CShapeElement(NSBaseShape::ClassType ClassType, int eType) : CElement()
 		{
+			m_lShapeType			= eType;
 			m_ClassType				= ClassType;			
 			m_etType				= etShape;
 
-			m_oShape.m_rcBounds		= m_rcBounds;
+			m_pShape = CShapePtr( new CShape(ClassType, eType));
+
+			m_pShape->m_rcBounds		= m_rcBounds;
 
-			m_oShape.m_dStartTime	= m_dStartTime;
-			m_oShape.m_dStartTime	= m_dEndTime;
+			m_pShape->m_dStartTime	= m_dStartTime;
+			m_pShape->m_dStartTime	= m_dEndTime;
 
 			m_bShapePreset			= false;
+
 		}
 
-		CShapeElement() : m_oShape(NSBaseShape::unknown, 0x1000)
+		CShapeElement() : CElement()
 		{
 			m_lShapeType	= 0x1000;
 			m_etType		= etShape;
 			m_bShapePreset	= false;
+			
+			m_pShape = CShapePtr( new CShape(NSBaseShape::unknown, 0x1000));
 		}
 
-        CShapeElement(const std::wstring& str) : IElement(), m_oShape(NSBaseShape::unknown, 0x1000)
+        CShapeElement(const std::wstring& str) : CElement()
 		{
 			m_lShapeType	= 0x1000;
 			m_bShapePreset	= false;
 
-			m_oShape.LoadFromXML(str);
-			m_ClassType = m_oShape.getBaseShape()->GetClassType();
+			m_pShape = CShapePtr( new CShape(NSBaseShape::unknown, 0x1000));
+			m_pShape->LoadFromXML(str);
+			
+			m_ClassType = m_pShape->getBaseShape()->GetClassType();
 		}
 		virtual void NormalizeCoordsByMetric()
 		{
-			IElement::NormalizeCoordsByMetric();
+			CElement::NormalizeCoordsByMetric();
 
 			double dScaleX				= (double)m_oMetric.m_lUnitsHor / m_oMetric.m_lMillimetresHor;
 			double dScaleY				= (double)m_oMetric.m_lUnitsVer	/ m_oMetric.m_lMillimetresVer;
 
-			m_oShape.m_oText.m_oBounds.left		= (int)(dScaleX * m_oShape.m_oText.m_oBounds.left);
-			m_oShape.m_oText.m_oBounds.right	= (int)(dScaleX * m_oShape.m_oText.m_oBounds.right);
-			m_oShape.m_oText.m_oBounds.top		= (int)(dScaleY * m_oShape.m_oText.m_oBounds.top);
-			m_oShape.m_oText.m_oBounds.bottom	= (int)(dScaleY * m_oShape.m_oText.m_oBounds.bottom);
+			m_pShape->m_oText.m_oBounds.left		= (int)(dScaleX * m_pShape->m_oText.m_oBounds.left);
+			m_pShape->m_oText.m_oBounds.right	= (int)(dScaleX * m_pShape->m_oText.m_oBounds.right);
+			m_pShape->m_oText.m_oBounds.top		= (int)(dScaleY * m_pShape->m_oText.m_oBounds.top);
+			m_pShape->m_oText.m_oBounds.bottom	= (int)(dScaleY * m_pShape->m_oText.m_oBounds.bottom);
 		}
 		virtual ~CShapeElement()
 		{
 		}
 
-		virtual IElement* CreateDublicate()
+		virtual CElementPtr CreateDublicate()
 		{
 			CShapeElement* pShapeElement = new CShapeElement(m_ClassType, m_lShapeType);
 			
-			SetProperiesToDublicate((IElement*)pShapeElement);
+			CElementPtr	pElement = CElementPtr(	pShapeElement );
+			
+			SetProperiesToDublicate(pElement);
 
 			pShapeElement->m_lShapeType		= m_lShapeType;
 			pShapeElement->m_bShapePreset	= m_bShapePreset;
 
-			m_oShape.SetToDublicate(&pShapeElement->m_oShape);
-			return (IElement*)pShapeElement;
+			m_pShape->SetToDublicate(pShapeElement->m_pShape.get());
+			
+			return pElement;
 		}
 		bool SetUpTextPlaceholder(std::wstring newText);
 		
 		virtual void SetupProperties(CSlide* pSlide, CTheme* pTheme, CLayout* pLayout)
 		{
-			m_oShape.m_oText.m_lPlaceholderType = m_lPlaceholderType;
-			m_oShape.m_oText.m_lPlaceholderID	= m_lPlaceholderID;
+			m_pShape->m_oText.m_lPlaceholderType = m_lPlaceholderType;
+			m_pShape->m_oText.m_lPlaceholderID	= m_lPlaceholderID;
 
-			m_oShape.getBaseShape()->ReCalculate();
+			m_pShape->getBaseShape()->ReCalculate();
 
 			SetupTextProperties(pSlide, pTheme, pLayout);
 
@@ -476,7 +489,7 @@ namespace NSPresentationEditor
 
         AVSINLINE std::wstring ConvertPPTShapeToPPTX(bool bIsNamespace = false)
 		{
-			CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(m_oShape.getBaseShape());
+			CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(m_pShape->getBaseShape().get());
 			if (NULL == pPPTShape)
 			{
 				// такого быть не может
@@ -712,11 +725,12 @@ namespace NSPresentationEditor
 		{
 		}
 
-		virtual IElement* CreateDublicate()
+		virtual CElementPtr CreateDublicate()
 		{
 			CAudioElement* pAudioElement = new CAudioElement();
+			CElementPtr	pElement = CElementPtr(	pAudioElement );
 			
-			SetProperiesToDublicate((CImageElement*)pAudioElement);
+			SetProperiesToDublicate(pElement);
 
 			pAudioElement->m_strAudioFileName	= m_strAudioFileName;
 			pAudioElement->m_nAmplify			= m_nAmplify;
@@ -728,7 +742,7 @@ namespace NSPresentationEditor
 			pAudioElement->m_dClipStartTime		= m_dClipStartTime;
 			pAudioElement->m_dClipEndTime		= m_dClipEndTime;
 
-			return (IElement*)pAudioElement;
+			return pElement;
 		}
 	};
 	class CVideoElement : public CImageElement
@@ -759,11 +773,13 @@ namespace NSPresentationEditor
 		{
 		}
 		
-		virtual IElement* CreateDublicate()
+		virtual CElementPtr CreateDublicate()
 		{
 			CVideoElement* pVideoElement = new CVideoElement();
 			
-			SetProperiesToDublicate((CImageElement*)pVideoElement);
+			CElementPtr	pElement = CElementPtr(	pVideoElement );
+			
+			SetProperiesToDublicate(pElement);
 
 			pVideoElement->m_strVideoFileName	=	m_strVideoFileName;
 			pVideoElement->m_nAlpha				=	m_nAlpha;
@@ -774,7 +790,7 @@ namespace NSPresentationEditor
 			pVideoElement->m_dClipEndTime		=	m_dClipEndTime;
 			pVideoElement->m_bLoop				=	m_bLoop;
 
-			return (IElement*)pVideoElement;
+			return pElement;
 		}
 	};
 

ASCOfficePPTXFile/Editor/Drawing/Layout.h

@@ -37,7 +37,7 @@ namespace NSPresentationEditor
 	class CLayout
 	{
 	public:
-		std::vector<IElement*>	m_arElements;
+		std::vector<CElementPtr>m_arElements;
 		std::vector<CColor>		m_arColorScheme;
 		std::multimap<int,int>	m_mapPlaceholders;
 
@@ -66,7 +66,7 @@ namespace NSPresentationEditor
 		std::wstring			m_strLayoutType;
 
 		std::wstring			m_sName;
-	public:
+
 		CLayout() 
 		{
 			Clear();
@@ -81,12 +81,10 @@ namespace NSPresentationEditor
 		{
 			Clear();
 		
-			m_arElements			= oSrc.m_arElements;
-
-			size_t nCount = m_arElements.size();
+			size_t nCount = oSrc.m_arElements.size();
 			for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
 			{
-				ADDREFINTERFACE((m_arElements[nIndex]));
+				m_arElements.push_back(oSrc.m_arElements[nIndex]->CreateDublicate());
 			}
 
 			m_mapPlaceholders		= oSrc.m_mapPlaceholders;
@@ -108,7 +106,8 @@ namespace NSPresentationEditor
 			m_bHasFooter			= oSrc.m_bHasFooter;
 			m_nFormatDate			= oSrc.m_nFormatDate;
 
-			for (int i = 0 ; i < 3 ; i++) m_PlaceholdersReplaceString[i] = oSrc.m_PlaceholdersReplaceString[i];
+			for (int i = 0 ; i < 3 ; i++) 
+				m_PlaceholdersReplaceString[i] = oSrc.m_PlaceholdersReplaceString[i];
 
 			m_bShowMasterShapes		= oSrc.m_bShowMasterShapes;
 			m_strLayoutType			= oSrc.m_strLayoutType;
@@ -127,15 +126,8 @@ namespace NSPresentationEditor
 			m_lOriginalHeight	= m_oInfo.m_lUnitsVer;
 		}
 
-	public:
 		void Clear()
 		{
-			size_t nCount = m_arElements.size();
-			for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
-			{
-				RELEASEINTERFACE((m_arElements[nIndex]));
-			}
-
 			m_arElements.clear();
 			m_mapPlaceholders.clear();
 			
@@ -143,7 +135,9 @@ namespace NSPresentationEditor
 			m_bHasSlideNumber	= false;
 			m_bHasFooter		= false;
 			m_nFormatDate		= 1;
-			for (int i = 0 ; i < 3 ; i++) m_PlaceholdersReplaceString[i].clear();
+			
+			for (int i = 0 ; i < 3 ; i++) 
+				m_PlaceholdersReplaceString[i].clear();
 
 			m_bUseThemeColorScheme	= true;
 			m_bShowMasterShapes		= true;
@@ -159,12 +153,11 @@ namespace NSPresentationEditor
 
 			for (size_t nIndex = 0; nIndex < m_arElements.size(); ++nIndex)
 			{
-				IElement* pElem = m_arElements[nIndex];
+				CElementPtr pElem = m_arElements[nIndex];
 				if (NULL != pElem)
 				{
 					m_arElements[nIndex] = pElem->CreateDublicate();
 				}
-				RELEASEINTERFACE(pElem);
 			}
 		}
 
@@ -175,24 +168,21 @@ namespace NSPresentationEditor
 			return pNew;
 		}
 
-		IElement* GetPlaceholder(LONG lID, bool bIsAddRef)
+		CElementPtr GetPlaceholder(LONG lID)
 		{
 			size_t nCount = m_arElements.size();
 			
 			for (size_t i = 0; i < nCount; ++i)
 			{
-				IElement* pElem = m_arElements[i];
+				CElementPtr pElem = m_arElements[i];
 
 				if (pElem->m_lPlaceholderType == lID)
 				{
-					if (bIsAddRef)
-						ADDREFINTERFACE(pElem);
-
 					return pElem;
 				}
 			}
 			
-			return NULL;
+			return CElementPtr();
 		}
 
 		LONG GetCountPlaceholderWithType(LONG lType)
@@ -209,10 +199,6 @@ namespace NSPresentationEditor
 			
 			return lFound;
 		}
-
-	public:
-
-
 		NSPresentationEditor::CColor GetColor(const LONG& lIndexScheme)
 		{
 			if (lIndexScheme < (LONG)m_arColorScheme.size())

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/BaseShape.cpp

@@ -36,8 +36,9 @@
 #include "PPTXShape/PptxShape.h"
 #include "PPTShape/PptShape.h"
 
+using namespace NSPresentationEditor;
 
-NSPresentationEditor::CBaseShape* NSPresentationEditor::CBaseShape::CreateByType(NSPresentationEditor::NSBaseShape::ClassType ClassType, int ShapeType)
+CBaseShapePtr CBaseShape::CreateByType(NSBaseShape::ClassType ClassType, int ShapeType)
 {
 	if(ClassType == pptx)
 	{
@@ -52,7 +53,7 @@ NSPresentationEditor::CBaseShape* NSPresentationEditor::CBaseShape::CreateByType
 	return NULL;
 }
 
-bool NSPresentationEditor::CBaseShape::SetType(NSPresentationEditor::NSBaseShape::ClassType ClassType, int ShapeType)
+bool CBaseShape::SetType(NSBaseShape::ClassType ClassType, int ShapeType)
 {
 	if (ClassType != GetClassType())
 		return false;

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

@@ -30,9 +30,12 @@
  *
  */
 #pragma once
+
 #include "Path.h"
 #include "../../../../../Common/DocxFormat/Source/Common/SimpleTypes_Base.h"
 
+#include <boost/shared_ptr.hpp>
+
 namespace NSPresentationEditor
 {
     using namespace NSBaseShape;
@@ -61,7 +64,10 @@ namespace NSPresentationEditor
             return (*this);
         }
     };
-    //
+
+	class CBaseShape;
+	typedef boost::shared_ptr<CBaseShape> CBaseShapePtr;
+
     class CBaseShape
     {
     public:
@@ -120,7 +126,7 @@ namespace NSPresentationEditor
 
         virtual void AddGuide(const std::wstring& strGuide)	{}
 
-        static CBaseShape* CreateByType(ClassType ClassType, int ShapeType);
+        static CBaseShapePtr CreateByType(ClassType ClassType, int ShapeType);
 
         virtual const ClassType GetClassType()const				= 0;
         bool SetType(ClassType ClassType, int ShapeType);

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PptFormula.cpp

@@ -48,34 +48,40 @@ LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)
 	LONG lAdjCount		= (LONG)pManager->m_pAdjustments->size();
 	
 	LONG a1 = m_lParam1;
-	if (ptFormula == m_eType1)
+	if (ptFormula == m_eType1 && !pManager->m_bCalc)
 	{
+		pManager->m_bCalc = true;
 		a1 = (m_lParam1 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam1].Calculate(pManager);
 	}
 	else if (ptAdjust == m_eType1)
 	{
 		a1 = (m_lParam1 >= lAdjCount) ? 0 : (*(pManager->m_pAdjustments))[m_lParam1];
 	}
+	pManager->m_bCalc = false;
 
 	LONG b1 = m_lParam2;
-	if (ptFormula == m_eType2)
+	if (ptFormula == m_eType2 && !pManager->m_bCalc)
 	{
+		pManager->m_bCalc = true;
 		b1 = (m_lParam2 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam2].Calculate(pManager);
 	}
 	else if (ptAdjust == m_eType2)
 	{
 		b1 = (m_lParam2 >= lAdjCount) ? 0 : (*(pManager->m_pAdjustments))[m_lParam2];
 	}
+	pManager->m_bCalc = false;
 
 	LONG c1 = m_lParam3;
-	if (ptFormula == m_eType3)
+	if (ptFormula == m_eType3 && !pManager->m_bCalc)
 	{
+		pManager->m_bCalc = true;
 		c1 = (m_lParam3 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam3].Calculate(pManager);
 	}
 	else if (ptAdjust == m_eType3)
 	{
 		c1 = (m_lParam3 >= lAdjCount) ? 0 : (*(pManager->m_pAdjustments))[m_lParam3];
 	}
+	pManager->m_bCalc = false;
 
 	double a = (double)a1;
 	double b = (double)b1;

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

@@ -341,8 +341,9 @@ namespace NSGuidesVML
         long m_lShapeWidth;
         long m_lShapeHeight;
 
-    public:
-        CFormulasManager() : m_arFormulas(), m_arResults()
+		bool m_bCalc; //status
+
+        CFormulasManager() : m_bCalc(false)
         {
             m_pAdjustments	= NULL;
             m_lShapeWidth	= ShapeSizeVML;
@@ -350,6 +351,7 @@ namespace NSGuidesVML
         }
         CFormulasManager& operator =(const CFormulasManager& oSrc)
         {
+			m_bCalc			= oSrc.m_bCalc;
             m_pAdjustments	= oSrc.m_pAdjustments;
             m_lShapeWidth	= oSrc.m_lShapeWidth;
             m_lShapeHeight	= oSrc.m_lShapeHeight;
@@ -370,6 +372,7 @@ namespace NSGuidesVML
 
         void Clear()
         {
+			m_bCalc			= false;
             m_pAdjustments	= NULL;
             m_lShapeWidth	= ShapeSizeVML;
             m_lShapeHeight	= ShapeSizeVML;

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PptShape.cpp

@@ -42,7 +42,26 @@ const double EMU_MM = 36000;
 //-------------------------------------------------------------------------------
 
 using namespace PPTShapes;
-CPPTShape* CPPTShape::CreateByType(PPTShapes::ShapeType type)
+using namespace NSPresentationEditor;
+
+CPPTShape::CPPTShape() : CBaseShape(), m_arStringTextRects()
+{
+    m_eType = PPTShapes::sptMin;
+
+    m_arStringTextRects.push_back(_T("0,0,21600,21600"));
+
+    m_strPathLimoX = _T("");
+    m_strPathLimoY = _T("");
+    m_bIsShapeType = false;
+
+    m_bIsFilled = true;
+    m_bIsStroked = true;
+}
+CPPTShape::~CPPTShape()
+{
+}
+
+CBaseShapePtr CPPTShape::CreateByType(PPTShapes::ShapeType type)
 {
 	CPPTShape* pShape = NULL;
 	switch (type)
@@ -288,6 +307,143 @@ CPPTShape* CPPTShape::CreateByType(PPTShapes::ShapeType type)
 	if (NULL != pShape)
 		pShape->m_eType = type;
 
-	return pShape;
+	return CBaseShapePtr(pShape);
 }
 
+
+bool CPPTShape::LoadFromXML(const std::wstring& xml)
+{
+    XmlUtils::CXmlNode oNodePict;
+    if (oNodePict.FromXmlString(xml))
+    {
+        return LoadFromXML(oNodePict);
+    }
+    return false;
+}
+
+bool CPPTShape::LoadFromXML(XmlUtils::CXmlNode& oNodePict)
+{
+    std::wstring id = oNodePict.GetAttributeOrValue(_T("type"));
+    bool isPathList = false;
+    if (id != _T(""))
+    {
+        SetShapeType((PPTShapes::ShapeType)XmlUtils::GetInteger(id));
+    }
+    else
+    {
+        XmlUtils::CXmlNode oNodeTemplate;
+        if (oNodePict.GetNode(_T("template"), oNodeTemplate))
+        {
+            std::wstring strAdj = oNodeTemplate.GetAttributeOrValue(_T("adj"));
+            LoadAdjustValuesList(strAdj);
+
+            XmlUtils::CXmlNode oNodeGuides;
+            if (oNodeTemplate.GetNode(_T("v:formulas"), oNodeGuides))
+            {
+                LoadGuidesList(oNodeGuides.GetXml());
+            }
+
+            std::wstring strPath = oNodeTemplate.GetAttributeOrValue(_T("path"));
+            if (strPath != _T(""))
+            {
+                LoadPathList(strPath);
+                isPathList = true;
+            }
+        }
+    }
+
+    XmlUtils::CXmlNode oNodeGuides;
+    if (oNodePict.GetNode(_T("path"), oNodeGuides))
+    {
+        std::wstring strPath = oNodeGuides.GetAttributeOrValue(_T("val"));
+        if (strPath != _T(""))
+        {
+            LoadPathList(strPath);
+            isPathList = true;
+        }
+    }
+
+    if (!isPathList)
+        ReCalculate();
+    return true;
+}
+
+bool CPPTShape::LoadFromXMLShapeType(XmlUtils::CXmlNode& oNodeShapeType) // vml object
+{		// из за особенносей форматирования vmlDrawing могут вылезти пустые текстовые значения - value ..
+    std::wstring sId = oNodeShapeType.GetAttribute(_T("o:spt"));
+
+    bool bIsNeedRecalc = true;
+    if (sId != _T(""))
+    {
+        int id = XmlUtils::GetInteger(sId);
+        if (id > 0)
+        {
+            SetShapeType((PPTShapes::ShapeType)id);
+            //ReCalculate();
+            m_eType = (PPTShapes::ShapeType)id;
+        }
+    }
+    std::wstring strAdj = oNodeShapeType.GetAttribute(_T("adj"));
+    if (strAdj != _T(""))
+        LoadAdjustValuesList(strAdj);
+
+    XmlUtils::CXmlNode oNodeGuides;
+    if (oNodeShapeType.GetNode(_T("v:formulas"), oNodeGuides))
+    {
+        LoadGuidesList(oNodeGuides.GetXml());
+    }
+
+    XmlUtils::CXmlNode oNodePath;
+    if (oNodeShapeType.GetNode(_T("v:path"), oNodePath))
+    {
+        std::wstring strTextR = oNodePath.GetAttribute(_T("textboxrect"));
+        if (strTextR != _T(""))
+            LoadTextRect(strTextR);
+    }
+
+    XmlUtils::CXmlNode oNodeAHs;
+    if (oNodeShapeType.GetNode(_T("v:handles"), oNodeAHs))
+    {
+        LoadAHList(oNodeAHs);
+    }
+
+    std::wstring strPath = oNodeShapeType.GetAttribute(_T("path"));
+    if (strPath != _T(""))
+    {
+        LoadPathList(strPath);
+    }
+
+    XmlUtils::CXmlNode oNodeTextPath;
+    if (oNodeShapeType.GetNode(_T("v:textpath"), oNodeTextPath))
+    {
+        if (m_eType < PPTShapes::ShapeType::sptCTextPlain || m_eType > PPTShapes::ShapeType::sptCTextCanDown)
+            m_eType = PPTShapes::ShapeType::sptCTextPlain;
+    }
+
+    std::wstring strFilled = oNodeShapeType.GetAttribute(_T("filled"));
+    std::wstring strStroked = oNodeShapeType.GetAttribute(_T("stroked"));
+
+    if (strFilled != _T(""))
+    {
+        if (strFilled == _T("false") || strFilled == _T("f"))
+            m_bIsFilled = false;
+        else
+            m_bIsFilled = true;
+    }
+
+    if (strStroked != _T(""))
+    {
+        if (strStroked == _T("false") || strStroked == _T("f"))
+            m_bIsStroked = false;
+        else
+            m_bIsStroked = true;
+    }
+    XmlUtils::CXmlNode oNodeSignature;
+    if (oNodeShapeType.GetNode(_T("o:signatureline"), oNodeSignature))
+    {
+        m_oSignatureLine = oNodeSignature;
+    }
+
+    ReCalculate();
+    return true;
+}

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

@@ -56,240 +56,12 @@ public:
     bool m_bIsStroked;
     nullable<OOX::VmlOffice::CSignatureLine> m_oSignatureLine;
 
-public:
-    CPPTShape() : CBaseShape(), m_arStringTextRects()
-    {
-        m_eType = PPTShapes::sptMin;
-
-        m_arStringTextRects.push_back(_T("0,0,21600,21600"));
-
-        m_strPathLimoX = _T("");
-        m_strPathLimoY = _T("");
-        m_bIsShapeType = false;
-
-        m_bIsFilled = true;
-        m_bIsStroked = true;
-    }
-
-    ~CPPTShape()
-    {
-    }
-    virtual bool LoadFromXML(const std::wstring& xml)
-    {
-        XmlUtils::CXmlNode oNodePict;
-        if (oNodePict.FromXmlString(xml))
-        {
-            return LoadFromXML(oNodePict);
-        }
-        return false;
-    }
-
-    //virtual bool LoadFromXML(const std::wstring& xml)
-    //{
-    //	XmlUtils::CXmlNode oNodePict;
-    //	if (oNodePict.FromXmlString(xml))
-    //	{
-    //		if (_T("shape") == oNodePict.GetName())
-    //		{
-    //			std::wstring id = oNodePict.GetAttributeOrValue(_T("type"));
-    //			if (id != _T(""))
-    //			{
-    //				SetShapeType((PPTShapes::ShapeType)Strings::ToInteger(id));
-    //			}
-    //			else
-    //			{
-    //				XmlUtils::CXmlNode oNodeTemplate;
-    //				if (oNodePict.GetNode(_T("template"), oNodeTemplate))
-    //				{
-    //					std::wstring strAdj = oNodeTemplate.GetAttributeOrValue(_T("adj"));
-    //					LoadAdjustValuesList(strAdj);
-
-    //					XmlUtils::CXmlNode oNodeGuides;
-    //					if (oNodeTemplate.GetNode(_T("v:formulas"), oNodeGuides))
-    //					{
-    //						LoadGuidesList(oNodeGuides.GetXml());
-    //					}
-
-    //					std::wstring strPath = oNodeTemplate.GetAttributeOrValue(_T("path"));
-    //					LoadPathList(strPath);
-    //				}
-    //			}
-
-    //			XmlUtils::CXmlNode oNodeGuides;
-    //			if (oNodePict.GetNode(_T("path"), oNodeGuides))
-    //			{
-    //				std::wstring strPath = oNodeGuides.GetAttributeOrValue(_T("val"));
-    //				LoadPathList(strPath);
-    //			}
-
-    //			/*XmlUtils::CXmlNode oNodeShapeType;
-    //			if (oNodePict.GetNode(_T("v:shapetype"), oNodeShapeType))
-    //			{
-    //				std::wstring strAdj = oNodeShapeType.GetAttributeOrValue(_T("adj"));
-    //				LoadAdjustValuesList(strAdj);
-
-    //				XmlUtils::CXmlNode oNodeGuides;
-    //				if (oNodeShapeType.GetNode(_T("v:formulas"), oNodeGuides))
-    //				{
-    //					LoadGuidesList(oNodeGuides.GetXml());
-    //				}
-
-    //				std::wstring strPath = oNodeShapeType.GetAttributeOrValue(_T("path"));
-    //				LoadAdjustValuesList(strPath);
-    //			}
-    //			else
-    //			{
-    //				XmlUtils::CXmlNode oNodeShape;
-    //				if (oNodePict.GetNode(_T("v:shape"), oNodeShape))
-    //				{
-    //					std::wstring strAdj = oNodeShape.GetAttributeOrValue(_T("adj"));
-    //					LoadAdjustValuesList(strAdj);
-
-    //					XmlUtils::CXmlNode oNodeGuides;
-    //					if (oNodeShape.GetNode(_T("v:formulas"), oNodeGuides))
-    //					{
-    //						LoadGuidesList(oNodeGuides.GetXml());
-    //					}
-
-    //					std::wstring strPath = oNodeShape.GetAttributeOrValue(_T("path"));
-    //					LoadPathList(strPath);
-    //				}
-    //			}*/
-
-    //			return true;
-    //		}
-    //	}
-
-    //	return false;
-    //}
-
-    virtual bool LoadFromXML(XmlUtils::CXmlNode& oNodePict)
-    {
-        std::wstring id = oNodePict.GetAttributeOrValue(_T("type"));
-        bool isPathList = false;
-        if (id != _T(""))
-        {
-            SetShapeType((PPTShapes::ShapeType)XmlUtils::GetInteger(id));
-        }
-        else
-        {
-            XmlUtils::CXmlNode oNodeTemplate;
-            if (oNodePict.GetNode(_T("template"), oNodeTemplate))
-            {
-                std::wstring strAdj = oNodeTemplate.GetAttributeOrValue(_T("adj"));
-                LoadAdjustValuesList(strAdj);
-
-                XmlUtils::CXmlNode oNodeGuides;
-                if (oNodeTemplate.GetNode(_T("v:formulas"), oNodeGuides))
-                {
-                    LoadGuidesList(oNodeGuides.GetXml());
-                }
-
-                std::wstring strPath = oNodeTemplate.GetAttributeOrValue(_T("path"));
-                if (strPath != _T(""))
-                {
-                    LoadPathList(strPath);
-                    isPathList = true;
-                }
-            }
-        }
-
-        XmlUtils::CXmlNode oNodeGuides;
-        if (oNodePict.GetNode(_T("path"), oNodeGuides))
-        {
-            std::wstring strPath = oNodeGuides.GetAttributeOrValue(_T("val"));
-            if (strPath != _T(""))
-            {
-                LoadPathList(strPath);
-                isPathList = true;
-            }
-        }
-
-        if (!isPathList)
-            ReCalculate();
-        return true;
-    }
-
-    virtual bool LoadFromXMLShapeType(XmlUtils::CXmlNode& oNodeShapeType) // vml object
-    {		// из за особенносей форматирования vmlDrawing могут вылезти пустые текстовые значения - value ..
-        std::wstring sId = oNodeShapeType.GetAttribute(_T("o:spt"));
-
-        bool bIsNeedRecalc = true;
-        if (sId != _T(""))
-        {
-            int id = XmlUtils::GetInteger(sId);
-            if (id > 0)
-            {
-                SetShapeType((PPTShapes::ShapeType)id);
-                //ReCalculate();
-                m_eType = (PPTShapes::ShapeType)id;
-            }
-        }
-        std::wstring strAdj = oNodeShapeType.GetAttribute(_T("adj"));
-        if (strAdj != _T(""))
-            LoadAdjustValuesList(strAdj);
-
-        XmlUtils::CXmlNode oNodeGuides;
-        if (oNodeShapeType.GetNode(_T("v:formulas"), oNodeGuides))
-        {
-            LoadGuidesList(oNodeGuides.GetXml());
-        }
-
-        XmlUtils::CXmlNode oNodePath;
-        if (oNodeShapeType.GetNode(_T("v:path"), oNodePath))
-        {
-            std::wstring strTextR = oNodePath.GetAttribute(_T("textboxrect"));
-            if (strTextR != _T(""))
-                LoadTextRect(strTextR);
-        }
-
-        XmlUtils::CXmlNode oNodeAHs;
-        if (oNodeShapeType.GetNode(_T("v:handles"), oNodeAHs))
-        {
-            LoadAHList(oNodeAHs);
-        }
-
-        std::wstring strPath = oNodeShapeType.GetAttribute(_T("path"));
-        if (strPath != _T(""))
-        {
-            LoadPathList(strPath);
-        }
-
-        XmlUtils::CXmlNode oNodeTextPath;
-        if (oNodeShapeType.GetNode(_T("v:textpath"), oNodeTextPath))
-        {
-            if (m_eType < PPTShapes::ShapeType::sptCTextPlain || m_eType > PPTShapes::ShapeType::sptCTextCanDown)
-                m_eType = PPTShapes::ShapeType::sptCTextPlain;
-        }
-
-        std::wstring strFilled = oNodeShapeType.GetAttribute(_T("filled"));
-        std::wstring strStroked = oNodeShapeType.GetAttribute(_T("stroked"));
-
-        if (strFilled != _T(""))
-        {
-            if (strFilled == _T("false") || strFilled == _T("f"))
-                m_bIsFilled = false;
-            else
-                m_bIsFilled = true;
-        }
-
-        if (strStroked != _T(""))
-        {
-            if (strStroked == _T("false") || strStroked == _T("f"))
-                m_bIsStroked = false;
-            else
-                m_bIsStroked = true;
-        }
-        XmlUtils::CXmlNode oNodeSignature;
-        if (oNodeShapeType.GetNode(_T("o:signatureline"), oNodeSignature))
-        {
-            m_oSignatureLine = oNodeSignature;
-        }
-
-        ReCalculate();
-        return true;
-    }
+    CPPTShape();
+    virtual ~CPPTShape();
 
+    virtual bool LoadFromXML(const std::wstring& xml);
+    virtual bool LoadFromXML(XmlUtils::CXmlNode& oNodePict);
+    virtual bool LoadFromXMLShapeType(XmlUtils::CXmlNode& oNodeShapeType);
     virtual bool LoadAdjustValuesList(const std::wstring& xml)
     {
         std::wstring strXml = xml;
@@ -484,7 +256,8 @@ public:
         LoadPathList(m_strPath);
     }
 
-    static CPPTShape* CreateByType(PPTShapes::ShapeType type);
+    static CBaseShapePtr CreateByType(PPTShapes::ShapeType type);
+    
 	virtual const ClassType GetClassType()const
     {
         return NSBaseShape::ppt;
@@ -533,13 +306,13 @@ public:
 
     bool SetShapeType(PPTShapes::ShapeType type)
     {
-        CPPTShape* l_pShape = CreateByType(type);
-        if(l_pShape != NULL)
+        CBaseShapePtr pShape = CreateByType(type);
+       
+		if(pShape)
         {
             m_eType = type;
 
-            SetProperties(l_pShape);
-            delete l_pShape;
+            SetProperties(pShape.get());
             return true;
         }
 

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/PptxShape.cpp

@@ -34,8 +34,9 @@
 #include "PptxShape.h"
 //#include "PresetShapesHeader.h"
 
-CPPTXShape* CPPTXShape::CreateByType(OOXMLShapes::ShapeType type)
+CBaseShapePtr CPPTXShape::CreateByType(OOXMLShapes::ShapeType type)
 {
+	CBaseShapePtr shape;
 //    switch(type)
 //	{
 //	case OOXMLShapes::sptCAccentBorderCallout1:		return new OOXMLShapes::CAccentBorderCallout1();
@@ -266,5 +267,5 @@ CPPTXShape* CPPTXShape::CreateByType(OOXMLShapes::ShapeType type)
 //	case OOXMLShapes::sptCWedgeRectCallout:			return new OOXMLShapes::CWedgeRectCallout();
 //	case OOXMLShapes::sptCWedgeRoundRectCallout:	return new OOXMLShapes::CWedgeRoundRectCallout();
 //	}
-	return NULL;
+	return shape;
 }

ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/PptxShape.h

@@ -280,7 +280,7 @@ public:
     OOXMLShapes::ShapeType m_eType;
 
     NSGuidesOOXML::CFormulaManager FManager;
-public:
+
     CPPTXShape() : CBaseShape(), FManager(m_arAdjustments, m_arGuides)
     {
         m_eType = OOXMLShapes::sptMin;
@@ -507,7 +507,7 @@ public:
         LoadPathList(m_strPath);
     }
 
-    static CPPTXShape* CreateByType(OOXMLShapes::ShapeType type);
+    static CBaseShapePtr CreateByType(OOXMLShapes::ShapeType type);
     
 	virtual const ClassType GetClassType()const
     {
@@ -540,13 +540,12 @@ public:
 
     bool SetShapeType(OOXMLShapes::ShapeType type)
     {
-        CPPTXShape* l_pShape = CreateByType(type);
-        if(l_pShape != NULL)
+        CBaseShapePtr pShape = CreateByType(type);
+        if(pShape)
         {
             m_eType = type;
 
-            SetProperties(l_pShape);
-            delete l_pShape;
+            SetProperties(pShape.get());
             return true;
         }
 

ASCOfficePPTXFile/Editor/Drawing/Shapes/Shape.h

@@ -49,10 +49,13 @@ const LONG c_ShapeDrawType_Graphic	= 0x01;
 const LONG c_ShapeDrawType_Text		= 0x02;
 const LONG c_ShapeDrawType_All		= c_ShapeDrawType_Graphic | c_ShapeDrawType_Text;
 
+class CShape;
+typedef boost::shared_ptr<CShape> CShapePtr;
+
 class CShape
 {
 private:
-	CBaseShape*				m_pShape;
+	CBaseShapePtr			m_pShape;
 public:
 	double					m_dStartTime;
 	double					m_dEndTime;
@@ -103,15 +106,11 @@ public:
 		m_dTextMarginRight	= 0;
 		m_dTextMarginBottom	= 0;
 
-		m_strPPTXShape = _T("");
-
-		m_pShape = NULL;
-
 		m_classType = classType;
 
 		if (m_classType == NSBaseShape::pptx)
 		{
-			m_pShape = new CPPTXShape();
+			m_pShape = CBaseShapePtr(new CPPTXShape());
 			m_pShape->SetType(NSBaseShape::pptx, ShapeType_);
 		}
 		else if (m_classType == NSBaseShape::ppt)
@@ -119,7 +118,7 @@ public:
 			m_pShape = CPPTShape::CreateByType((PPTShapes::ShapeType)ShapeType_ );
 			if (m_pShape == NULL)
 			{
-				m_pShape = new CPPTShape();
+				m_pShape = CBaseShapePtr(new CPPTShape());
 				m_pShape->SetType(NSBaseShape::ppt, ShapeType_);
 			}
 
@@ -135,20 +134,17 @@ public:
 
 	~CShape()
 	{
-		RELEASEOBJECT(m_pShape);
 	}
 
-	CBaseShape* getBaseShape()
+	CBaseShapePtr getBaseShape()
 	{
 		return m_pShape;
 	}
 
-	void setBaseShape(CBaseShape* pShape)
+	void setBaseShape(CBaseShapePtr pShape)
 	{
-		if (pShape == NULL) return;
-
-		CPPTXShape *pptxShape = dynamic_cast<CPPTXShape*>(pShape);
-		CPPTShape *pptShape = dynamic_cast<CPPTShape*>(pShape);
+		CPPTXShape *pptxShape = dynamic_cast<CPPTXShape*>(pShape.get());
+		CPPTShape *pptShape = dynamic_cast<CPPTShape*>(pShape.get());
 
 		if (pptxShape)	m_classType = NSBaseShape::pptx;
 		if (pptShape)	m_classType = NSBaseShape::ppt;
@@ -180,7 +176,7 @@ public:
 			if (NSBaseShape::ppt == m_pShape->GetClassType())
 			{
 				// как будто могло быть иначе
-				CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(m_pShape);
+				CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(m_pShape.get());
 				if (NULL != pPPTShape)
 				{
 					pPPTShape->CalcTextRectOffsets(dPercentLeft, dPercentTop, dPercentRight, dPercentBottom);
@@ -251,7 +247,7 @@ public:
 			if ((m_pShape) && (NSBaseShape::ppt == m_pShape->GetClassType()))
 			{
 				// как будто могло быть иначе
-				CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(m_pShape);
+				CPPTShape* pPPTShape = dynamic_cast<CPPTShape*>(m_pShape.get());
 				if (NULL != pPPTShape)
 				{
 					//pPPTShape->CalcTextRectOffsets(dPercentLeft, dPercentTop, dPercentRight, dPercentBottom);
@@ -338,23 +334,23 @@ public:
 	{
 		if(_T("ooxml-shape") == root.GetName())
 		{
-			if(m_pShape != NULL)
-				delete m_pShape;
-			m_pShape = new CPPTXShape();
-			//return m_pShape->LoadFromXML(xml);
-			return ((CPPTXShape*)m_pShape)->LoadFromXML(root);
+			m_pShape = CBaseShapePtr(new CPPTXShape());
+			
+			CPPTXShape* pptx_shape = dynamic_cast<CPPTXShape*>(m_pShape.get());
+			
+			return pptx_shape ? pptx_shape->LoadFromXML(root) : false;
 		}
 		else if(_T("shape") == root.GetName())
 		{
-			if(m_pShape != NULL)
-				delete m_pShape;
-			m_pShape = new CPPTShape();
+			m_pShape = CBaseShapePtr(new CPPTShape());
 
 			SetCoordSize(root);
 			SetPen		(root);
 			SetBrush	(root);
 			
-			return ((CPPTShape*)m_pShape)->LoadFromXML(root);			
+			CPPTShape* ppt_shape = dynamic_cast<CPPTShape*>(m_pShape.get());
+
+			return ppt_shape ? ppt_shape->LoadFromXML(root) : false;
 		}
 
 		return false;
@@ -386,7 +382,7 @@ public:
 		Shape->m_dTextMarginBottom	= m_dTextMarginBottom;
 
 		if (m_pShape)
-			return m_pShape->SetToDublicate(Shape->m_pShape);
+			return m_pShape->SetToDublicate(Shape->m_pShape.get());
 		return true;
 	}
 

ASCOfficePPTXFile/Editor/Drawing/Slide.h

@@ -44,7 +44,7 @@ namespace NSPresentationEditor
 		LONG m_lSlideID;	//for notes rels
 		LONG m_lNotesID;	//for slide rels
 
-		std::vector<IElement*>	m_arElements;
+		std::vector<CElementPtr>m_arElements;
 		CSlideShowInfo			m_oSlideShow;
 		std::multimap<int,int>	m_mapPlaceholders;
 
@@ -73,7 +73,7 @@ namespace NSPresentationEditor
 		std::wstring			m_strComment;
 		std::wstring			m_sName;
 
-		CSlide() : m_arElements(), m_oSlideShow()
+		CSlide() : m_oSlideShow()
 		{
 			Clear(); 
 		}
@@ -84,11 +84,6 @@ namespace NSPresentationEditor
 
 		void Clear()
 		{
-			for (size_t nIndex = 0; nIndex < m_arElements.size(); ++nIndex)
-			{
-				IElement* pElem = m_arElements[nIndex];
-				RELEASEINTERFACE(pElem);
-			}
 			m_arColorScheme.clear();
 			m_arElements.clear();
 			
@@ -111,7 +106,8 @@ namespace NSPresentationEditor
 			m_strComment.clear();
 			m_sName.clear();
 
-			for (int i = 0 ; i < 3 ; i++) m_PlaceholdersReplaceString[i].clear();
+			for (int i = 0 ; i < 3 ; i++) 
+				m_PlaceholdersReplaceString[i].clear();
 		}
 
 		CSlide(const CSlide& oSrc)
@@ -171,7 +167,7 @@ namespace NSPresentationEditor
 			{
 				if (-1 != m_arElements[nEl]->m_lPlaceholderType && etShape == m_arElements[nEl]->m_etType)
 				{
-					CShapeElement* pSlideElement = dynamic_cast<CShapeElement*>(m_arElements[nEl]);
+					CShapeElement* pSlideElement = dynamic_cast<CShapeElement*>(m_arElements[nEl].get());
 
 					if (NULL != pSlideElement)
 					{
@@ -185,10 +181,10 @@ namespace NSPresentationEditor
 								if ((pLayout->m_arElements[i]->m_lPlaceholderType	== pSlideElement->m_lPlaceholderType) &&
 									(pLayout->m_arElements[i]->m_etType				== etShape))
 								{
-									CShapeElement* pLayoutElement = dynamic_cast<CShapeElement*>(pLayout->m_arElements[i]);
+									CShapeElement* pLayoutElement = dynamic_cast<CShapeElement*>(pLayout->m_arElements[i].get());
 									if (NULL != pLayoutElement)
 									{
-										pSlideElement->m_oShape.m_oText.m_oLayoutStyles		= pLayoutElement->m_oShape.m_oText.m_oStyles;
+										pSlideElement->m_pShape->m_oText.m_oLayoutStyles = pLayoutElement->m_pShape->m_oText.m_oStyles;
 									}
 								}
 							}
@@ -198,10 +194,10 @@ namespace NSPresentationEditor
 									(pLayout->m_arElements[i]->m_lPlaceholderID		== pSlideElement->m_lPlaceholderID) &&
 									(pLayout->m_arElements[i]->m_etType				== etShape))
 								{
-									CShapeElement* pLayoutElement = dynamic_cast<CShapeElement*>(pLayout->m_arElements[i]);
+									CShapeElement* pLayoutElement = dynamic_cast<CShapeElement*>(pLayout->m_arElements[i].get());
 									if (NULL != pLayoutElement)
 									{
-										pSlideElement->m_oShape.m_oText.m_oLayoutStyles		= pLayoutElement->m_oShape.m_oText.m_oStyles;
+										pSlideElement->m_pShape->m_oText.m_oLayoutStyles = pLayoutElement->m_pShape->m_oText.m_oStyles;
 									}
 								}								
 							}

ASCOfficePPTXFile/Editor/Drawing/Theme.h

@@ -57,7 +57,7 @@ namespace NSPresentationEditor
 		bool							m_bIsBackground;
 		CBrush							m_oBackground;
 
-		std::vector<IElement*>			m_arElements;
+		std::vector<CElementPtr>		m_arElements;
 
 		CMetricInfo						m_oInfo;
 
@@ -133,11 +133,6 @@ namespace NSPresentationEditor
 
 			m_arElements = oSrc.m_arElements;
 
-			nCount = m_arElements.size();
-			for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
-			{
-				ADDREFINTERFACE((m_arElements[nIndex]));
-			}
 			CreateDublicateElements();
 
 			for (long nIndexStyle = 0; nIndexStyle < g_ThemeTextStylesCount; ++nIndexStyle)
@@ -154,23 +149,16 @@ namespace NSPresentationEditor
 			size_t nCount = m_arElements.size();
 			for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
 			{
-				IElement* pElem = m_arElements[nIndex];
+				CElementPtr pElem = m_arElements[nIndex];
 				if (NULL != pElem)
 				{
 					m_arElements[nIndex] = pElem->CreateDublicate();
 				}
-				RELEASEINTERFACE(pElem);
 			}
 		}
 
 		void Clear()
 		{
-			size_t nCount = m_arElements.size();
-			for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
-			{
-				RELEASEINTERFACE((m_arElements[nIndex]));
-			}
-
 			m_arElements.clear();
 			m_arLayouts.clear();
 			m_mapTitleLayout.clear();
@@ -186,15 +174,13 @@ namespace NSPresentationEditor
 			m_bHasFooter		= false;
 			m_nFormatDate		= 1;
 		
-			for (int i = 0 ; i < 3 ; i++) m_PlaceholdersReplaceString[i].clear();
+			for (int i = 0 ; i < 3 ; i++) 
+				m_PlaceholdersReplaceString[i].clear();
 		}
 
 		~CTheme()
 		{
 		}
-
-	public:
-
 		NSPresentationEditor::CColor GetColor(const LONG& lIndexScheme)
 		{
 			if (lIndexScheme < (LONG)m_arColorScheme.size())

ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp

@@ -54,7 +54,7 @@ namespace PPTX
 				lpShapeElement = new NSPresentationEditor::CShapeElement(NSBaseShape::pptx, (int)_lspt);
 				std::wstring strAdjustValues = lpGeom.GetODString();
 				
-				lpShapeElement->m_oShape.getBaseShape()->LoadAdjustValuesList(strAdjustValues);
+				lpShapeElement->m_pShape->getBaseShape()->LoadAdjustValuesList(strAdjustValues);
 			}
 			else if (this->is<PPTX::Logic::CustGeom>())
 			{
@@ -71,8 +71,8 @@ namespace PPTX
 
 			LONG lCoordSize = 100000;
 
-			lpShapeElement->m_oShape.getBaseShape()->SetWidthHeightLogic(dCoordSizeX, dCoordSizeY);
-			lpShapeElement->m_oShape.getBaseShape()->ReCalculate();
+			lpShapeElement->m_pShape->getBaseShape()->SetWidthHeightLogic(dCoordSizeX, dCoordSizeY);
+			lpShapeElement->m_pShape->getBaseShape()->ReCalculate();
 
 			pOOXToVMLRenderer->put_Width((double)lCoordSize / dCoordSizeX);
 			pOOXToVMLRenderer->put_Height((double)lCoordSize / dCoordSizeY);						
@@ -85,7 +85,7 @@ namespace PPTX
 			oInfo.m_dWidth	= dCoordSizeX;
 			oInfo.m_dHeight	= dCoordSizeY;
 
-			NSPresentationEditor::CPath& oPath = lpShapeElement->m_oShape.getBaseShape()->m_oPath;
+			NSPresentationEditor::CPath& oPath = lpShapeElement->m_pShape->getBaseShape()->m_oPath;
 			
 			COOXToVMLGeometry* pOOXToVMLGeometry = dynamic_cast<COOXToVMLGeometry*>(pOOXToVMLRenderer);
 
@@ -111,19 +111,19 @@ namespace PPTX
 			if(NULL != pOOXToVMLGeometry)
 				pOOXToVMLGeometry->ResultPath(&strPath);
 
-			if (lpShapeElement->m_oShape.getBaseShape()->m_arTextRects.size() <= 0)
+			if (lpShapeElement->m_pShape->getBaseShape()->m_arTextRects.size() <= 0)
 			{
 				strRect = _T("0,0,100000,100000");
 			}
 			else
 			{
-				Aggplus::RECT& txRect = lpShapeElement->m_oShape.getBaseShape()->m_arTextRects[0];
+				Aggplus::RECT& txRect = lpShapeElement->m_pShape->getBaseShape()->m_arTextRects[0];
 				//double dkoefX = (double)lCoordSize / max(1, dCoordSizeX);
 				//double dkoefY = (double)lCoordSize / max(1, dCoordSizeY);
 
 				double _dWidth = ShapeSize;
 				double _dHeight = ShapeSize;
-				lpShapeElement->m_oShape.getBaseShape()->GetWidthHeightLogic(_dWidth, _dHeight);
+				lpShapeElement->m_pShape->getBaseShape()->GetWidthHeightLogic(_dWidth, _dHeight);
 
                 double dkoefX = (double)lCoordSize / (std::max)(1., _dWidth);
                 double dkoefY = (double)lCoordSize / (std::max)(1., _dHeight);

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -233,7 +233,7 @@ namespace PPTX
 				}		
 				NSDirectory::DeleteDirectory(oox_unpacked.GetPath());
 			}
-			else if ( L"Equation.3" == sProgID || L"Equation.2" == sProgID )
+			else if ( std::wstring::npos != sProgID.find(L"Equation"))
 			{
 				pWriter->StartRecord(1);
 					pWriter->WriteBYTE(4);

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.cpp

@@ -49,6 +49,7 @@ global_info_(global_info)
 	skippable_records_names.push_back("StartBlock");
 	skippable_records_names.push_back("EndBlock");
 	skippable_records_names.push_back("ChartFrtInfo");
+	skippable_records_names.push_back("FrtWrapper");
 }
 
 
@@ -100,7 +101,7 @@ CFRecordPtr CFStreamCacheReader::getNextRecord(const CFRecordType::TypeId desira
 		}
 		if(skippable_records_names.end() != std::find(skippable_records_names.begin(), skippable_records_names.end(), rec_name))
 		{
-			Log::warning("The extracted record has been skipped (" + rec_name + ")");
+			//Log::warning("The extracted record has been skipped (" + rec_name + ")");
 			records_cache.pop_front();
 			continue;
 		}

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

@@ -55,7 +55,10 @@ void DefColWidth::readFields(CFRecord& record)
 	GlobalWorkbookInfoPtr global_info = record.getGlobalWorkbookInfo();
 	record >> cchdefColWidth;
 
+	if (!global_info->sheet_size_info.empty())
+	{
 		global_info->sheet_size_info.back().defaultColumnWidth = cchdefColWidth ;
+	}
 }
 
 } // namespace XLS

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

@@ -65,7 +65,10 @@ void DefaultRowHeight::readFields(CFRecord& record)
 	
 	record >> miyRw;
 
+	if (!global_info->sheet_size_info.empty())
+	{
 		global_info->sheet_size_info.back().defaultRowHeight = miyRw / 20.;
+	}
 
 }
 

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

@@ -31,10 +31,8 @@
  */
 
 #include "AI.h"
-#include <Logic/Biff_records/BRAI.h>
-#include <Logic/Biff_records/SeriesText.h>
-
-//#include <Logic/Biff_unions/PAGESETUP.h>
+#include "../Biff_records/BRAI.h"
+#include "../Biff_records/SeriesText.h"
 
 namespace XLS
 {

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

@@ -31,23 +31,22 @@
  */
 
 #include "ATTACHEDLABEL.h"
-#include <Logic/Biff_records/Text.h>
-#include <Logic/Biff_records/Begin.h>
-#include <Logic/Biff_records/Pos.h>
-#include <Logic/Biff_records/FontX.h>
-#include <Logic/Biff_records/AlRuns.h>
-#include <Logic/Biff_records/ObjectLink.h>
-#include <Logic/Biff_records/DataLabExtContents.h>
-#include <Logic/Biff_records/CrtLayout12.h>
-#include <Logic/Biff_records/End.h>
-#include <Logic/Biff_records/SeriesText.h>
-#include <Logic/Biff_records/Font.h>
-#include <Logic/Biff_records/FrtWrapper.h>
-
-#include <Logic/Biff_unions/AI.h>
-#include <Logic/Biff_unions/FRAME.h>
-#include <Logic/Biff_unions/TEXTPROPS.h>
-#include <Logic/Biff_unions/CRTMLFRT.h>
+#include "AI.h"
+#include "FRAME.h"
+#include "TEXTPROPS.h"
+#include "CRTMLFRT.h"
+
+#include "../Biff_records/Text.h"
+#include "../Biff_records/Begin.h"
+#include "../Biff_records/Pos.h"
+#include "../Biff_records/FontX.h"
+#include "../Biff_records/AlRuns.h"
+#include "../Biff_records/ObjectLink.h"
+#include "../Biff_records/DataLabExtContents.h"
+#include "../Biff_records/CrtLayout12.h"
+#include "../Biff_records/End.h"
+#include "../Biff_records/SeriesText.h"
+#include "../Biff_records/Font.h"
 
 #include <utils.h>
 
@@ -149,7 +148,7 @@ const bool ATTACHEDLABEL::loadContent(BinProcessor& proc)
 	}
 	
 	proc.optional<CRTMLFRT>();
-	proc.optional<FrtWrapper>();
+
 	proc.mandatory<End>();			elements_.pop_back();
 
 	return true;

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

@@ -69,7 +69,7 @@ const bool AXISPARENT::loadContent(BinProcessor& proc)
 	m_AxisParent = elements_.back();
 	elements_.pop_back();
 	
-	proc.mandatory<Begin>();		elements_.pop_back();
+	if (proc.optional<Begin>())		elements_.pop_back();
 
 	if (proc.optional<Pos>())
 	{
@@ -93,7 +93,7 @@ const bool AXISPARENT::loadContent(BinProcessor& proc)
 		count--;
 	}	
 
-	if (proc.mandatory<End>())			elements_.pop_back();
+	if (proc.optional<End>())	elements_.pop_back();
 
 	return true;
 }

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

@@ -31,11 +31,11 @@
  */
 
 #include "AXM.h"
-#include <Logic/Biff_records/YMult.h>
-#include <Logic/Biff_records/StartObject.h>
-#include <Logic/Biff_unions/ATTACHEDLABEL.h>
-#include <Logic/Biff_records/EndObject.h>
-#include <Logic/Biff_records/FrtWrapper.h>
+#include "ATTACHEDLABEL.h"
+
+#include "../Biff_records/YMult.h"
+#include "../Biff_records/StartObject.h"
+#include "../Biff_records/EndObject.h"
 
 namespace XLS
 {
@@ -68,7 +68,6 @@ const bool AXM::loadContent(BinProcessor& proc)
 	
 	if (proc.optional<StartObject>())		elements_.pop_back();
 	
-	int count = proc.repeated<FrtWrapper>(0,0);
 	if (proc.optional<ATTACHEDLABEL>())
 	{
 		m_ATTACHEDLABEL = elements_.back();	elements_.pop_back();

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

@@ -57,8 +57,8 @@
 #include "../Biff_records/EndObject.h"
 #include "../Biff_records/End.h"
 #include "../Biff_records/ObjectLink.h"
-#include "../Biff_records/FrtWrapper.h"
 #include "../Biff_records/TextPropsStream.h"
+#include "../Biff_records/FrtFontList.h"
 
 namespace XLS
 {
@@ -86,7 +86,10 @@ public:
 
 	const bool loadContent(BinProcessor& proc)
 	{
-		if(proc.optional<DataLabExt>())
+		bool bData = proc.optional<DataLabExt>();
+		bool bFont = proc.optional<FrtFontList>();
+
+		if(bFont || bData)
 		{
 			while (true)
 			{
@@ -254,11 +257,8 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 				cf.attachedLABEL = NULL;
 			}
 			cf.dataLabExt = elements_.front();
-			elements_.pop_front();
-			count--;
-			continue;
 		}
-		if ("ATTACHEDLABEL" == elements_.front()->getClassName())
+		else if ("ATTACHEDLABEL" == elements_.front()->getClassName())
 		{//обязат
 			if (cf.attachedLABEL)
 			{
@@ -266,10 +266,12 @@ const bool CHARTFORMATS::loadContent(BinProcessor& proc)
 				cf.dataLabExt = NULL;
 			}
 			cf.attachedLABEL = elements_.front();
+		}
+		else
+		{
+		}
 		elements_.pop_front();
 		count--;
-			continue;
-		}
 	}
 	if (proc.optional<TEXTPROPS>())
 	{

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

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of COLUMNS union of records 
 class COLUMNS: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(COLUMNS)

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

@@ -31,43 +31,43 @@
  */
 
 #include "CRT.h"
-#include <Logic/Biff_records/ChartFormat.h>
-#include <Logic/Biff_records/Begin.h>
-#include <Logic/Biff_records/Bar.h>
-#include <Logic/Biff_records/Line.h>
-#include <Logic/Biff_records/BopPop.h>
-#include <Logic/Biff_records/BopPopCustom.h>
-#include <Logic/Biff_records/Pie.h>
-#include <Logic/Biff_records/Area.h>
-#include <Logic/Biff_records/Scatter.h>
-#include <Logic/Biff_records/Radar.h>
-#include <Logic/Biff_records/RadarArea.h>
-#include <Logic/Biff_records/Surf.h>
-#include <Logic/Biff_records/CrtLink.h>
-#include <Logic/Biff_records/SeriesList.h>
-#include <Logic/Biff_records/Chart3d.h>
-#include <Logic/Biff_unions/LD.h>
-#include <Logic/Biff_unions/DROPBAR.h>
-#include <Logic/Biff_records/CrtLine.h>
-#include <Logic/Biff_records/LineFormat.h>
-#include <Logic/Biff_unions/DFTTEXT.h>
-#include <Logic/Biff_records/DataLabExtContents.h>
-#include <Logic/Biff_unions/SS.h>
-#include <Logic/Biff_unions/SHAPEPROPS.h>
-#include <Logic/Biff_records/End.h>
-#include <Logic/Biff_records/ValueRange.h>
-#include <Logic/Biff_records/Tick.h>
-#include <Logic/Biff_records/FontX.h>
-#include <Logic/Biff_records/AxisLine.h>
-#include <Logic/Biff_records/LineFormat.h>
-#include <Logic/Biff_records/ShapePropsStream.h>
-#include <Logic/Biff_records/TextPropsStream.h>
-#include <Logic/Biff_records/PlotArea.h>
-#include <Logic/Biff_records/DropBar.h>
-#include <Logic/Biff_records/CrtMlFrt.h>
-
-#include <Logic/Biff_records/StartObject.h>
-#include <Logic/Biff_records/EndObject.h>
+#include "../Biff_records/ChartFormat.h"
+#include "../Biff_records/Begin.h"
+#include "../Biff_records/Bar.h"
+#include "../Biff_records/Line.h"
+#include "../Biff_records/BopPop.h"
+#include "../Biff_records/BopPopCustom.h"
+#include "../Biff_records/Pie.h"
+#include "../Biff_records/Area.h"
+#include "../Biff_records/Scatter.h"
+#include "../Biff_records/Radar.h"
+#include "../Biff_records/RadarArea.h"
+#include "../Biff_records/Surf.h"
+#include "../Biff_records/CrtLink.h"
+#include "../Biff_records/SeriesList.h"
+#include "../Biff_records/Chart3d.h"
+#include "../Biff_unions/LD.h"
+#include "../Biff_unions/DROPBAR.h"
+#include "../Biff_records/CrtLine.h"
+#include "../Biff_records/LineFormat.h"
+#include "../Biff_unions/DFTTEXT.h"
+#include "../Biff_records/DataLabExtContents.h"
+#include "../Biff_unions/SS.h"
+#include "../Biff_unions/SHAPEPROPS.h"
+#include "../Biff_records/End.h"
+#include "../Biff_records/ValueRange.h"
+#include "../Biff_records/Tick.h"
+#include "../Biff_records/FontX.h"
+#include "../Biff_records/AxisLine.h"
+#include "../Biff_records/LineFormat.h"
+#include "../Biff_records/ShapePropsStream.h"
+#include "../Biff_records/TextPropsStream.h"
+#include "../Biff_records/PlotArea.h"
+#include "../Biff_records/DropBar.h"
+#include "../Biff_records/CrtMlFrt.h"
+
+#include "../Biff_records/StartObject.h"
+#include "../Biff_records/EndObject.h"
 namespace XLS
 {
 
@@ -176,7 +176,8 @@ const bool CRT::loadContent(BinProcessor& proc)
 	m_ChartFormat = elements_.back();
 	elements_.pop_back(); 
 
-	proc.mandatory<Begin>();				elements_.pop_back();
+	if (proc.optional<Begin>())	elements_.pop_back();
+
 	proc.mandatory<Parenthesis_CRT_1>();
 
 	m_ChartType = elements_.front();
@@ -196,7 +197,9 @@ const bool CRT::loadContent(BinProcessor& proc)
 	}
 	if (proc.optional<StartObject>())
 	{
-		proc.optional<EndObject>();
+		elements_.pop_back();
+		if (proc.optional<EndObject>())
+			elements_.pop_back();
 	}
 	if (proc.optional<SeriesList>())
 	{
@@ -252,6 +255,7 @@ const bool CRT::loadContent(BinProcessor& proc)
 		m_DataLabExtContents = elements_.back();
 		elements_.pop_back();
 	}
+
 	if (proc.optional<SS>())
 	{
 		m_SS = elements_.back();
@@ -268,7 +272,7 @@ const bool CRT::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 	}
 	
-	proc.mandatory<End>();					elements_.pop_back();
+	if (proc.optional<End>())	elements_.pop_back();
 //-------------------------------------------------------------------------------------
 	m_bIs3D = false;
 	if (m_Chart3d)

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

@@ -31,12 +31,13 @@
  */
 
 #include "DFTTEXT.h"
-#include <Logic/Biff_records/DataLabExt.h>
-#include <Logic/Biff_records/StartObject.h>
-#include <Logic/Biff_records/DefaultText.h>
-#include <Logic/Biff_records/EndObject.h>
+#include "ATTACHEDLABEL.h"
 
-#include <Logic/Biff_unions/ATTACHEDLABEL.h>
+#include "../Biff_records/DataLabExt.h"
+#include "../Biff_records/DataLabExtContents.h"
+#include "../Biff_records/StartObject.h"
+#include "../Biff_records/DefaultText.h"
+#include "../Biff_records/EndObject.h"
 
 namespace XLS
 {
@@ -66,30 +67,32 @@ const bool DFTTEXT::loadContent(BinProcessor& proc)
 		m_DataLabExt = elements_.back();
 		elements_.pop_back();
 
-		proc.mandatory<StartObject>();	elements_.pop_back();
+		if (proc.optional<StartObject>())	elements_.pop_back();
 
-		proc.mandatory<DefaultText>();
+	}
 	
+	if(proc.mandatory<DefaultText>())
+	{
 		m_DefaultText = elements_.back();
 		elements_.pop_back();
 	}
-	else
+	if (proc.optional<DataLabExtContents>())
 	{
-		if(!proc.mandatory<DefaultText>())
-		{
-			return false;
-		}
-		m_DefaultText = elements_.back();
+		m_DataLabExtContents = elements_.back();
 		elements_.pop_back();
 	}	
-
-	proc.mandatory<ATTACHEDLABEL>();
+	if (proc.mandatory<ATTACHEDLABEL>())
+	{
 		m_ATTACHEDLABEL = elements_.back();
 		elements_.pop_back();
+	}
 
 	if (proc.optional<EndObject>()) elements_.pop_back();
 
+	if (m_DefaultText || m_DataLabExtContents)
 		return true;
+	else
+		return false;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/DFTTEXT.h

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of DFTTEXT union of records 
 class DFTTEXT: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(DFTTEXT)
@@ -52,6 +50,8 @@ public:
 	static const ElementType type = typeDFTTEXT;
 
 	BaseObjectPtr m_DefaultText;
+	BaseObjectPtr m_DataLabExtContents;
+
 	BaseObjectPtr m_ATTACHEDLABEL;
 	BaseObjectPtr m_DataLabExt;
 };

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

@@ -31,12 +31,11 @@
  */
 
 #include "FONTLIST.h"
-#include <Logic/Biff_records/FrtFontList.h>
-#include <Logic/Biff_records/StartObject.h>
-#include <Logic/Biff_records/Font.h>
-#include <Logic/Biff_records/Fbi.h>
-#include <Logic/Biff_records/EndObject.h>
-#include <Logic/Biff_records/FrtWrapper.h>
+#include "../Biff_records/FrtFontList.h"
+#include "../Biff_records/StartObject.h"
+#include "../Biff_records/Font.h"
+#include "../Biff_records/Fbi.h"
+#include "../Biff_records/EndObject.h"
 
 namespace XLS
 {
@@ -88,9 +87,9 @@ const bool FONTLIST::loadContent(BinProcessor& proc)
 		return false;
 	}
 	proc.mandatory<StartObject>();					elements_.pop_back();
+	
 	proc.repeated<Parenthesis_FONTLIST_1>(0, 0);
 
-	proc.optional<FrtWrapper>();
 	proc.mandatory<EndObject>();					elements_.pop_back();
 
 	return true;

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

@@ -38,7 +38,7 @@ namespace XLS
 {
 
 
-PIVOTADDL::PIVOTADDL() : current( &content)
+PIVOTADDL::PIVOTADDL() : current( &content), m_SXADDLCONDFMTS(NULL, -1), m_SXADDLSXFILTERS12(NULL, -1)
 {
 	_sxAddl elm(NULL, 0);
 	current->push_back(elm);
@@ -94,38 +94,51 @@ const bool PIVOTADDL::loadContent(BinProcessor& proc)
 		
 		result = true;
 		
-		if (addl->bEndElement)
+		if (level == 0 && addl->bEndElement)
 		{
-			elements_.pop_back();
-			
-			if (level == 0)
+			elements_.pop_back(); //end элемент не нужен в дальнейшем
 			break;
-			else level--;
-			
-			current = current->back().prev;
-			continue;
 		}
+		else if (addl->bEndElement)
+		{ 			
+			level--;
+			std::vector<_sxAddl> *current_old = current;
+			
+			_sxAddl & current_level = current->back();
+			
+			current = current_level.prev;			
+			current_level.prev = NULL;
+
 			if (level == 0)
 			{
-			SXAddl_SXCView_SXDId* p0 = dynamic_cast<SXAddl_SXCView_SXDId*>(addl->content.get());
-			if (p0)
+				switch(addl->sxc)
 				{
-				m_SXAddl_SXCView_SXDId = addl->content;
+					case 0x01:	
+					case 0x17:
+								m_arSXADDLFIELD.push_back(current_level);		break;
+					case 0x02:	m_arSXADDLHIERARCHY.push_back(current_level);	break;
+					case 0x03:	m_arSXADDLCALCMEMBER.push_back(current_level);	break;
+					case 0x1a:	m_SXADDLCONDFMTS	= current_level;			break;
+					case 0x1c:	m_SXADDLSXFILTERS12 = current_level;			break;
 				}
-			SXAddl_SXCView_SXDTableStyleClient* p1 = dynamic_cast<SXAddl_SXCView_SXDTableStyleClient*>(addl->content.get());
-			if (p1)
-			{
-				m_SXAddl_SXCView_SXDTableStyleClient = addl->content;
 			}			
-			SXAddl_SXCView_SXDVer10Info* p2 = dynamic_cast<SXAddl_SXCView_SXDVer10Info*>(addl->content.get());
-			if (p2)
+			
+			elements_.pop_back(); //end элемент не нужен в дальнейшем
+			continue;
+		}
+		else if (level == 0)
+		{
+			switch(addl->sxd)
 			{
-				m_SXAddl_SXCView_SXDVer10Info = addl->content;
+				case 0x00: m_SXAddl_SXCView_SXDId				= addl->content;	break;
+ 				case 0x02: m_SXAddl_SXCView_SXDVer10Info		= addl->content;    break;
+				case 0x19: m_SXAddl_SXCView_SXDVer12Info		= addl->content;    break;
+				case 0x1E: m_SXAddl_SXCView_SXDTableStyleClient = addl->content;	break;
 			}
-			SXAddl_SXCView_SXDVer12Info* p3 = dynamic_cast<SXAddl_SXCView_SXDVer12Info*>(addl->content.get());
-			if (p3)
+			if (addl->sxd == 0x00 || addl->sxd == 0x02 || addl->sxd == 0x19 || addl->sxd == 0x1e)
 			{
-				m_SXAddl_SXCView_SXDVer12Info = addl->content;
+				elements_.pop_back();
+				continue;
 			}
 		}
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTADDL.h

@@ -36,10 +36,10 @@
 namespace XLS
 {
 
-
-
 class PIVOTADDL: public CompositeObject
 {
+	BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTADDL)
+public:
     struct _sxAddl
     {
         _sxAddl(std::vector<_sxAddl> *p, int l) : prev(p), level (l) {}
@@ -50,8 +50,6 @@ class PIVOTADDL: public CompositeObject
         std::vector<_sxAddl>		levels;
     };	
 	
-    BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTADDL)
-public:
 	PIVOTADDL();
 	~PIVOTADDL();
 
@@ -72,6 +70,14 @@ public:
 	std::vector<BiffStructurePtr>	m_arSXAddl_SXCView_SXDVerUpdInv;
 	std::vector<BiffStructurePtr>	m_arSXAddl_SXCView_SXDSXPIIvmb;
 
+	std::vector<_sxAddl> m_arSXADDLHIERARCHY;
+	std::vector<_sxAddl> m_arSXADDLFIELD;
+	std::vector<_sxAddl> m_arSXADDLCALCMEMBER;
+
+	_sxAddl m_SXADDLCONDFMTS;
+	_sxAddl m_SXADDLSXFILTERS12;
+
+//others
 	std::vector<_sxAddl> content;
 	std::vector<_sxAddl> *current;
 

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

@@ -200,8 +200,10 @@ int PIVOTCACHEDEFINITION::serialize_definitions(std::wostream & strm)
 					}
 				}
 			}
-			if (bOLAP)
+			if (olap_view)
 			{
+				olap_view->m_PIVOTADDL = m_PIVOTADDL;
+
 				olap_view->serialize(CP_XML_STREAM());
 			}
 		}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTCACHEDEFINITION.h

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of PIVOTCACHEDEFINITION union of records 
 class PIVOTCACHEDEFINITION: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(PIVOTCACHEDEFINITION)
@@ -60,7 +58,9 @@ public:
 	BaseObjectPtr	m_SXADDLCACHE;
 //--------------------------------------------------------------------------
 	GlobalWorkbookInfoPtr global_info_;
+
 	BaseObjectPtr	m_PIVOTVIEWEX;
+	BaseObjectPtr	m_PIVOTADDL;
 };
 
 } // namespace XLS

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

@@ -102,18 +102,23 @@ const bool PIVOTVIEW::loadContent(BinProcessor& proc)
 	PIVOTCACHEDEFINITION* pivot_cache = dynamic_cast<PIVOTCACHEDEFINITION*>(global_info_->arPIVOTCACHEDEFINITION[view->iCache].get());
 	if (pivot_cache)
 	{
-		SXStreamID *stream_id = dynamic_cast<SXStreamID*>(pivot_cache->m_SXStreamID.get());
-		indexStream = stream_id->idStm;
+		SXSRC*			src			= dynamic_cast<SXSRC*>		(pivot_cache->m_SXSRC.get());
+		SXStreamID *	stream_id	= dynamic_cast<SXStreamID*>	(pivot_cache->m_SXStreamID.get());
+		PIVOTFRT*		frt			= dynamic_cast<PIVOTFRT*>	(m_PIVOTFRT.get());
 
-		if (m_PIVOTFRT && pivot_cache->m_SXSRC)
+		indexStream = stream_id ? stream_id->idStm : -1;
+
+		if (frt && src)
 		{
-			SXSRC* src = dynamic_cast<SXSRC*>(pivot_cache->m_SXSRC.get());
-			PIVOTFRT* frt = dynamic_cast<PIVOTFRT*>(m_PIVOTFRT.get());
+			pivot_cache->m_PIVOTADDL = frt->m_PIVOTADDL;
 
-			PIVOTFRT9* frt9 = frt ? dynamic_cast<PIVOTFRT9*>(frt->m_PIVOTFRT9.get()) : NULL;
+			PIVOTFRT9* frt9		= dynamic_cast<PIVOTFRT9*>(frt->m_PIVOTFRT9.get());
+			if (frt9)
+			{
+				pivot_cache->m_PIVOTVIEWEX = frt9->m_PIVOTVIEWEX;
 
 				DBQUERY * db_query	= dynamic_cast<DBQUERY*>(src->m_source.get());
-			if (db_query && frt9)
+				if (db_query)
 				{
 					QsiSXTag *qsiTag =dynamic_cast<QsiSXTag*>(frt9->m_QsiSXTag.get());
 					if (qsiTag->fTensorEx)
@@ -123,7 +128,7 @@ const bool PIVOTVIEW::loadContent(BinProcessor& proc)
 						core->bOLAP = true;
 					}
 					db_query->m_DBQUERYEXT = frt9->m_DBQUERYEXT;
-				pivot_cache->m_PIVOTVIEWEX	= frt9->m_PIVOTVIEWEX;
+				}
 			}
 		}
 	}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/PIVOTVIEWEX.h

@@ -54,6 +54,8 @@ public:
 	std::vector<BaseObjectPtr>	m_arPIVOTTH;
 	std::vector<BaseObjectPtr>	m_arSXPIEx;
 	std::vector<BaseObjectPtr>	m_arPIVOTVDTEX;
+//-------------------------------------------------------------
+	BaseObjectPtr				m_PIVOTADDL;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/SXADDLCACHE.h

@@ -43,7 +43,7 @@ class SXADDLCACHE: public CompositeObject
 
         std::vector<_sxAddl>*			prev = NULL;
         int								level = 0;
-        std::vector<BaseObjectPtr>	elements;
+        std::vector<BiffStructurePtr>	elements;
         std::vector<_sxAddl>			levels;
     };
 
@@ -58,13 +58,6 @@ public:
 
 	static const ElementType type = typeSXADDLCACHE;
 	
-	BiffStructurePtr	m_SXAddl_SXCCache_SXDId;
-	BiffStructurePtr	m_SXAddl_SXCCache_SXDVerUpdInv;
-	BiffStructurePtr	m_SXAddl_SXCCache_SXDVer10Info;
-	BiffStructurePtr	m_SXAddl_SXCCache_SXDVerSXMacro;
-	BiffStructurePtr	m_SXAddl_SXCCache_SXDInvRefreshReal;
-	BiffStructurePtr	m_SXAddl_SXCCache_SXDInfo12;
-
 	std::vector<_sxAddl> content;
 	std::vector<_sxAddl> *current;
 };

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

@@ -56,26 +56,7 @@ BaseObjectPtr SXADDLCALCMEMBER::clone()
 // SXADDLCALCMEMBER = (SXAddl_SXCView_SXDCalcMember [SXAddl_SXCView_SXDCalcMemString *Continue_SxaddlSxString])
 const bool SXADDLCALCMEMBER::loadContent(BinProcessor& proc)
 {
-	bool result = false;
-	while (true)
-	{
-		CFRecordType::TypeId type = proc.getNextRecordType();	
-
-		if (type == rt_SXAddl)
-		{
-			result = true;
-			proc.optional<SXAddl>();
-
-			SXAddl* addl = dynamic_cast<SXAddl*>(elements_.back().get());				
-			if (!addl) continue;
-			
-			if (addl->bEndElement)
-				break;
-		}
-		else
-			break;
-	}
-	return result;
+	return false;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h

@@ -149,6 +149,8 @@ public:
 		
 		double						defaultColumnWidth = 8.0;
 		double						defaultRowHeight = 14.4;
+
+		bool						bMacrosSheet = false;
 	};
 	std::vector<_sheet_size_info>	sheet_size_info;
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h

@@ -51,7 +51,7 @@ public:
 	std::wstring							m_strPathLimoY;
 
 	std::vector<std::wstring> m_arStringTextRects;
-public:
+
 	CCustomShape() : CBaseShape()
 	{
 		m_eType = oox::msosptNotPrimitive;