fix bugs after refactoring

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

@@ -91,7 +91,7 @@ public:
 			int pos =target.find(L".");
 			if (pos < 0)
 			{
-				target = target + std::wstring(L".A1");
+				target = L"\"" + target + std::wstring(L"\".A1");
 			}
             r.location = converter_.convert_ref(std::wstring(target.begin() + 1, target.end()));
 			r.type = L"Internal" ;

ASCOfficePPTXFile/PPTXFormat/Logic/Path2D/CubicBezTo.h

@@ -100,7 +100,7 @@ namespace PPTX
 				{
 					std::wstring sName = oReader.GetName();
 
-					if (sName == L"a:pos")
+					if (sName == L"a:pt")
 					{
 						ReadAttributes2(oReader, x[count], y[count]);
 						count++;

ASCOfficePPTXFile/PPTXFormat/Logic/Path2D/LineTo.h

@@ -70,7 +70,7 @@ namespace PPTX
 				{
 					std::wstring sName = oReader.GetName();
 
-					if (sName == L"a:pos")
+					if (sName == L"a:pt")
 					{
 						ReadAttributes2(oReader);
 					}

ASCOfficePPTXFile/PPTXFormat/Logic/Path2D/MoveTo.h

@@ -69,7 +69,7 @@ namespace PPTX
 				{
 					std::wstring sName = oReader.GetName();
 
-					if (sName == L"a:pos")
+					if (sName == L"a:pt")
 					{
 						ReadAttributes2(oReader);
 					}

ASCOfficePPTXFile/PPTXFormat/Logic/Path2D/QuadBezTo.h

@@ -73,7 +73,7 @@ namespace PPTX
 				{
 					std::wstring sName = oReader.GetName();
 
-					if (sName == L"a:pos")
+					if (sName == L"a:pt")
 					{
 						ReadAttributes2(oReader, x[count], y[count]);
 						count++;

ASCOfficePPTXFile/PPTXFormat/Logic/Runs/MathParaWrapper.cpp

@@ -50,17 +50,25 @@ namespace PPTX
 		}
 		void MathParaWrapper::fromXML(XmlUtils::CXmlLiteReader& oReader)
 		{
-			std::wstring name = oReader.GetName();
+			if ( oReader.IsEmptyNode() )
+				return;
+			int nCurDepth = oReader.GetDepth();
+			while( oReader.ReadNextSiblingNode( nCurDepth ) )
+			{
+				std::wstring strName = XmlUtils::GetNameNoNS(oReader.GetName());
 			
-			if(L"oMathPara" == name)
+				if(L"oMathPara" == strName)
 				{
 					m_oMathPara = oReader;
 				}
-			else if(L"oMath" == name)
+				else if(L"oMath" == strName)
 				{
 					m_oMath = oReader;
 				}
 			}
+			
+			FillParentPointersForChilds();
+		}
 		void MathParaWrapper::fromXML(XmlUtils::CXmlNode& node)
 		{
 			std::wstring sBegin(_T("<root xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:p=\"urn:schemas-microsoft-com:office:powerpoint\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:ve=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:w15=\"http://schemas.microsoft.com/office/word/2012/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\" xmlns:xdr=\"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing\">"));
@@ -151,8 +159,7 @@ namespace PPTX
 					oDrawingConverter.m_pBinaryWriter = pWriter;
 
 					DocWrapper::FontProcessor fp;
-					BinDocxRW::ParamsWriter oParamsWriter(pWriter, &fp, &oDrawingConverter, NULL);
-					oDocxSerializer.m_pParamsWriter = &oParamsWriter;
+					oDocxSerializer.m_pParamsWriter = new BinDocxRW::ParamsWriter(pWriter, &fp, &oDrawingConverter, NULL);
 					oDocxSerializer.getBinaryContentElem(eElemType, pElem, *pWriter, lDataSize);
 					//*oDrawingConverter.m_pBinaryWriter->m_pCommonRels = pOldRels;
 					oDrawingConverter.m_pBinaryWriter = pOldWriter;

ASCOfficePPTXFile/PPTXFormat/Logic/SpTreeElem.cpp

@@ -247,19 +247,28 @@ namespace PPTX
 				m_elem.reset(new Logic::GraphicFrame(oReader));
 			else if (name == _T("AlternateContent"))
 			{
-				bool isEmpty = true;
+				if ( oReader.IsEmptyNode() )
+					return;
 				int nCurDepth = oReader.GetDepth();
 				while( oReader.ReadNextSiblingNode( nCurDepth ) )
 				{
 					std::wstring strName = oReader.GetName();
+					
+					if ( oReader.IsEmptyNode() )
+						continue;
+					
 					if (strName == L"mc:Choice")
 					{
+						oReader.ReadNextSiblingNode(nCurDepth + 1);
 						//GetAttributeIfExist(L"Requires", sRequires) && L"a14" == sRequires)
 						fromXML(oReader);
+						
+						if (m_elem.is_init())
 							break;
 					}
 					else if (strName == L"mc:Fallback")
 					{
+						oReader.ReadNextSiblingNode(nCurDepth + 1);
 						fromXML(oReader);
 					}
 				}