.

ASCOfficePPTXFile/PPTXFormat/Logic/BodyPr.h

@@ -147,6 +147,8 @@ namespace PPTX
 
 			virtual std::wstring toXML() const
 			{
+				if (m_namespace.empty()) m_namespace = L"a";
+
 				XmlUtils::CAttribute oAttr;
 				oAttr.Write(_T("rot"), rot);
 				oAttr.Write(_T("spcFirstLastPara"), spcFirstLastPara);
@@ -186,6 +188,8 @@ namespace PPTX
 
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const
 			{
+				if (m_namespace.empty()) m_namespace = L"a";
+
 				pWriter->StartNode(m_namespace + _T(":bodyPr"));
 
 				pWriter->StartAttributes();

ASCOfficePPTXFile/PPTXFormat/Logic/Paragraph.h

@@ -127,7 +127,7 @@ namespace PPTX
 				int nParentDepth = oReader.GetDepth();
 				while( oReader.ReadNextSiblingNode( nParentDepth ) )
 				{
-					std::wstring strName = oReader.GetName();
+					std::wstring strName = XmlUtils::GetNameNoNS(oReader.GetName());
 					WritingElement *pItem = NULL;
 
 					if (_T("pPr") == strName)

ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h

@@ -98,14 +98,19 @@ namespace PPTX
 		{
 		public:
 			WritingElement_AdditionConstructors(RunProperties)
-			PPTX_LOGIC_BASE2(RunProperties)
 			
+			RunProperties()
+			{
+				m_name = L"a:rPr";
+			}
 			virtual OOX::EElementType getType () const
 			{
 				return OOX::et_a_rPr;
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
+				m_name = oReader.GetName();
+
 				ReadAttributes( oReader );
 
 				if ( oReader.IsEmptyNode() )
@@ -114,34 +119,34 @@ namespace PPTX
 				int nParentDepth = oReader.GetDepth();
 				while( oReader.ReadNextSiblingNode( nParentDepth ) )
 				{
-					std::wstring sName = oReader.GetName();
+					std::wstring sName = XmlUtils::GetNameNoNS(oReader.GetName());
 					
-					if (L"a:blipFill"	== sName	||
-						L"a:gradFill"	== sName	||
-						L"a:grpFill"	== sName	||
-						L"a:noFill"		== sName	||
-						L"a:pattFill"	== sName	||
-						L"a:solidFill" == sName )
+					if (L"blipFill"	== sName	||
+						L"gradFill"	== sName	||
+						L"grpFill"	== sName	||
+						L"noFill"	== sName	||
+						L"pattFill"	== sName	||
+						L"solidFill" == sName )
 					{
 						Fill.fromXML(oReader);
 					}
-					else if ( _T("a:ln") == sName )
+					else if ( _T("ln") == sName )
 						ln = oReader;
-					else if ( _T("a:cs") == sName )
+					else if ( _T("cs") == sName )
 						cs = oReader;					
-					else if ( _T("a:ea") == sName )
+					else if ( _T("ea") == sName )
 						ea = oReader;				
-					else if ( _T("a:latin") == sName )
+					else if ( _T("latin") == sName )
 						latin = oReader;			
-					else if ( _T("a:sym") == sName )
+					else if ( _T("sym") == sName )
 						sym = oReader;		
-					else if ( _T("a:hlinkClick") == sName )
+					else if ( _T("hlinkClick") == sName )
 						hlinkClick = oReader;			
-					else if ( _T("a:rtl") == sName )
+					else if ( _T("rtl") == sName )
 						rtl = oReader;
-					else if (	L"a:effectDag"	== sName	||
-								L"a:effectLst"	== sName	||
-								L"a:extLst"		== sName )
+					else if (	L"effectDag"	== sName	||
+								L"effectLst"	== sName	||
+								L"extLst"		== sName )
 					{
 						EffectList.fromXML(oReader);		
 					}

ASCOfficePPTXFile/PPTXFormat/Logic/TextListStyle.h

@@ -45,7 +45,11 @@ namespace PPTX
 		{
 		public:
 			WritingElement_AdditionConstructors(TextListStyle)
-			PPTX_LOGIC_BASE2(TextListStyle)
+
+			TextListStyle()
+			{
+				m_name = L"a:lstStyle";
+			}
 
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{

ASCOfficePPTXFile/PPTXFormat/Logic/TextParagraphPr.h

@@ -53,8 +53,11 @@ namespace PPTX
 		{
 		public:
 			WritingElement_AdditionConstructors(TextParagraphPr)
-			PPTX_LOGIC_BASE2(TextParagraphPr)
 
+			TextParagraphPr()
+			{
+				m_name = L"a:pPr";
+			}
 			TextParagraphPr& operator=(const TextParagraphPr& oSrc)
 			{
 				parentFile		= oSrc.parentFile;
@@ -92,6 +95,7 @@ namespace PPTX
 
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
+				m_name = oReader.GetName();
 				ReadAttributes( oReader );
 
 				if ( oReader.IsEmptyNode() )

ASCOfficePPTXFile/PPTXFormat/Logic/UniFill.h

@@ -197,7 +197,7 @@ namespace PPTX
 			virtual std::wstring toXML() const
 			{
 				if (Fill.IsInit())
-					Fill->toXML();
+					return Fill->toXML();
 				return _T("");
 			}
 

Common/DocxFormat/Source/XML/XmlSimple.h

@@ -251,31 +251,42 @@ namespace XmlUtils
 
 	AVSINLINE std::wstring CreateNode(const std::wstring& strName, const CAttribute& oAttr)
 	{
-		return _T("<") + strName + _T(" ") + oAttr.m_strValue + _T(" />");
+		if (strName.empty()) return L"";
+
+		return L"<" + strName + (oAttr.m_strValue.empty() ? L"" : L" " + oAttr.m_strValue) + L"/>";
 	}
 	AVSINLINE std::wstring CreateNode(const std::wstring& strName, const CNodeValue& oNode)
 	{
-		if (_T("") == oNode.m_strValue)
-			return _T("<") + strName + _T("/>");
+		if (strName.empty()) return L"";
 
-		return _T("<") + strName + _T(">") + oNode.m_strValue + _T("</") + strName + _T(">");
+		if (oNode.m_strValue.empty())
+			return L"<" + strName + L"/>";
+
+		return L"<" + strName + L">" + oNode.m_strValue + L"</" + strName + L">";
 	}
 	AVSINLINE std::wstring CreateNode(const std::wstring& strName, const CAttribute& oAttr, const CNodeValue& oNode)
 	{
-		if (_T("") == oNode.m_strValue)
+		if (strName.empty()) return L"";
+
+		if ( oNode.m_strValue.empty())
 			return CreateNode(strName, oAttr);
 		
-		return _T("<") + strName + _T(" ") + oAttr.m_strValue + _T(">") + oNode.m_strValue +  _T("</") + strName + _T(">");
+		return L"<" + strName + (oAttr.m_strValue.empty() ? L"" : L" " + oAttr.m_strValue) + L">" + oNode.m_strValue +  L"</" + strName + L">";
 	}
 	AVSINLINE std::wstring CreateNode(const std::wstring& strName, const CAttribute& oAttr, const std::wstring& strXml)
 	{
-		if (_T("") != strXml)
-			return _T("<") + strName + _T(" ") + oAttr.m_strValue + _T(">") + strXml + _T("</") + strName + _T(">");
-		return _T("<") + strName + _T(" ") + oAttr.m_strValue + _T("/>");
+		if (strName.empty()) return L"";
+
+		if (!strXml.empty())
+			return L"<" + strName + (oAttr.m_strValue.empty() ? L"" : L" " + oAttr.m_strValue) + L">" + strXml + L"</" + strName + L">";
+		
+		return L"<" + strName + (oAttr.m_strValue.empty() ? L"" : L" " + oAttr.m_strValue) + L"/>";
 	}
 	AVSINLINE std::wstring CreateNode(const std::wstring& strName, const std::wstring& strXml)
 	{
-		return _T("<") + strName + _T(">") + strXml + _T("</") + strName + _T(">");
+		if (strName.empty()) return L"";
+
+		return L"<" + strName + L">" + strXml + L"</" + strName + L">";
 	}
 
 	AVSINLINE void SaveToFile(const std::wstring& strFile, const std::wstring& strXml)

X2tConverter/test/win32Test/X2tTest.vcproj

@@ -666,6 +666,14 @@
 				<File
 					RelativePath="..\..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
 					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							AdditionalOptions="/bigobj"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.h"

XlsxSerializerCom/Reader/ChartFromToBinary.cpp

@@ -916,12 +916,12 @@ namespace BinXlsxRW
 		else if(c_oserct_chartspaceSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			res = ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_chartspaceTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		//else if(c_oserct_chartspaceEXTERNALDATA == type)
 		//{
@@ -1322,7 +1322,7 @@ namespace BinXlsxRW
 		else if(c_oserct_legendentryTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_legendentryEXTLST == type)
 		{
@@ -1414,12 +1414,12 @@ namespace BinXlsxRW
 		else if(c_oserct_legendSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_legendTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_legendEXTLST == type)
 		{
@@ -1594,12 +1594,12 @@ namespace BinXlsxRW
 		else if(c_oserct_dtableSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_dtableTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_dtableEXTLST == type)
 		{
@@ -1684,12 +1684,12 @@ namespace BinXlsxRW
 		else if(c_oserct_seraxSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_seraxTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_seraxCROSSAX == type)
 		{
@@ -1820,7 +1820,7 @@ namespace BinXlsxRW
 		if(c_oserct_chartlinesSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;
@@ -1851,12 +1851,12 @@ namespace BinXlsxRW
 		else if(c_oserct_titleSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_titleTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_titleEXTLST == type)
 		{
@@ -1874,8 +1874,10 @@ namespace BinXlsxRW
 		CT_Tx* poVal = static_cast<CT_Tx*>(poResult);
 		if(c_oserct_txRICH == type)
 		{
+			BYTE typeRec1 = m_oBufferedStream.GetUChar();
+
 			poVal->m_oRich = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oRich.GetPointer());
+			poVal->m_oRich->fromPPTY(&m_oBufferedStream);
 			
 			poVal->m_oRich->m_name = L"c:rich";
 		}
@@ -2128,12 +2130,12 @@ namespace BinXlsxRW
 		else if(c_oserct_dateaxSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_dateaxTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_dateaxCROSSAX == type)
 		{
@@ -2321,12 +2323,12 @@ namespace BinXlsxRW
 		else if(c_oserct_cataxSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_cataxTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_cataxCROSSAX == type)
 		{
@@ -2411,12 +2413,12 @@ namespace BinXlsxRW
 		else if(c_oserct_dispunitslblSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_dispunitslblTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;
@@ -2557,12 +2559,12 @@ namespace BinXlsxRW
 		else if(c_oserct_valaxSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_valaxTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_valaxCROSSAX == type)
 		{
@@ -2670,7 +2672,7 @@ namespace BinXlsxRW
 		else if(c_oserct_bubbleserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_bubbleserINVERTIFNEGATIVE == type)
 		{
@@ -2793,7 +2795,7 @@ namespace BinXlsxRW
 		else if(c_oserct_dptSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_dptPICTUREOPTIONS == type)
 		{
@@ -2830,7 +2832,7 @@ namespace BinXlsxRW
 		else if(c_oserct_markerSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_markerEXTLST == type)
 		{
@@ -3064,7 +3066,7 @@ namespace BinXlsxRW
 			poVal->m_ItemsElementName0.push_back(eElemtype);
 
 			PPTX::Logic::SpPr * pNewElem = new PPTX::Logic::SpPr();
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, pNewElem);
+			res = ReadCT_SpPr(0, length, pNewElem);
 			poVal->m_Items.push_back(pNewElem);
 		}
 		else if(c_oserct_dlblsTXPR == type)
@@ -3203,7 +3205,7 @@ namespace BinXlsxRW
 			poVal->m_ItemsElementName0.push_back(eElemtype);
 
 			PPTX::Logic::SpPr *pNewElem = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, pNewElem);
+			res = ReadCT_SpPr(0, length, pNewElem);
 			poVal->m_Items.push_back(pNewElem);
 		}
 		else if(c_oserct_dlblTX == type)
@@ -3222,7 +3224,7 @@ namespace BinXlsxRW
 			poVal->m_ItemsElementName0.push_back(eElemtype);
 			
 			PPTX::Logic::TxBody * pNewElem = new PPTX::Logic::TxBody();
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, pNewElem);
+			res = ReadCT_SpPr(0, length, pNewElem);
 			poVal->m_Items.push_back(pNewElem);
 		}
 		else if(c_oserct_dlblEXTLST == type)
@@ -3263,7 +3265,7 @@ namespace BinXlsxRW
 		else if(c_oserct_trendlineSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_trendlineTRENDLINETYPE == type)
 		{
@@ -3397,12 +3399,12 @@ namespace BinXlsxRW
 		else if(c_oserct_trendlinelblSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_trendlinelblTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_trendlinelblEXTLST == type)
 		{
@@ -3463,7 +3465,7 @@ namespace BinXlsxRW
 		else if(c_oserct_errbarsSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_errbarsEXTLST == type)
 		{
@@ -3867,7 +3869,7 @@ namespace BinXlsxRW
 		else if(c_oserct_surfaceserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_surfaceserCAT == type)
 		{
@@ -3904,7 +3906,7 @@ namespace BinXlsxRW
 		else if(c_oserct_bandfmtSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;
@@ -4105,7 +4107,7 @@ namespace BinXlsxRW
 		else if(c_oserct_pieserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_pieserEXPLOSION == type)
 		{
@@ -4284,7 +4286,7 @@ namespace BinXlsxRW
 		else if(c_oserct_barserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_barserINVERTIFNEGATIVE == type)
 		{
@@ -4614,7 +4616,7 @@ namespace BinXlsxRW
 		else if(c_oserct_scatterserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_scatterserMARKER == type)
 		{
@@ -4758,7 +4760,7 @@ namespace BinXlsxRW
 		else if(c_oserct_radarserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_radarserMARKER == type)
 		{
@@ -4934,7 +4936,7 @@ namespace BinXlsxRW
 		else if(c_oserct_lineserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_lineserMARKER == type)
 		{
@@ -5033,7 +5035,7 @@ namespace BinXlsxRW
 		if(c_oserct_updownbarSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else
 			res = c_oSerConstants::ReadUnknown;
@@ -5265,7 +5267,7 @@ namespace BinXlsxRW
 		else if(c_oserct_areaserSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_areaserPICTUREOPTIONS == type)
 		{
@@ -5568,7 +5570,7 @@ namespace BinXlsxRW
 		else if(c_oserct_plotareaSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_plotareaEXTLST == type)
 		{
@@ -5607,7 +5609,7 @@ namespace BinXlsxRW
 		else if(c_oserct_surfaceSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_surfacePICTUREOPTIONS == type)
 		{
@@ -5758,12 +5760,12 @@ namespace BinXlsxRW
 		else if(c_oserct_pivotfmtSPPR == type)
 		{
 			poVal->m_oSpPr = new PPTX::Logic::SpPr;
-			res = Read1(length, &BinaryChartReader::ReadCT_SpPr, this, poVal->m_oSpPr.GetPointer());
+			ReadCT_SpPr(0, length, poVal->m_oSpPr.GetPointer());
 		}
 		else if(c_oserct_pivotfmtTXPR == type)
 		{
 			poVal->m_oTxPr = new PPTX::Logic::TxBody;
-			res = Read1(length, &BinaryChartReader::ReadCT_TxPr, this, poVal->m_oTxPr.GetPointer());
+			res = ReadCT_TxPr(0, length, poVal->m_oTxPr.GetPointer());
 		}
 		else if(c_oserct_pivotfmtMARKER == type)
 		{