Merge pull request #405 from ONLYOFFICE/fixBug47276

Fix bug47276

ASCOfficeDocxFile2/BinReader/Readers.cpp

@@ -9077,7 +9077,18 @@ BinaryFileReader::BinaryFileReader(std::wstring& sFileInDir, NSBinPptxRW::CBinar
 }
 int BinaryFileReader::ReadFile()
 {
-	return ReadMainTable();
+	long res = c_oSerConstants::ReadOk;
+
+	try
+	{
+		res = ReadMainTable();
+	}
+	catch(...)
+	{
+		res = c_oSerConstants::ErrorStream;
+	}
+
+	return res;
 }
 int BinaryFileReader::ReadMainTable()
 {

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -202,7 +202,8 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 		bool bValidFormat = false;
         std::wstring sSignature(g_sFormatSignature);
         int nSigLength = (int)sSignature.length();
-		if((int)nBase64DataSize > nSigLength)
+		
+		if ((int)nBase64DataSize > nSigLength)
 		{
             std::string sCurSig((char*)pBase64Data, nSigLength);
             if(sSignature == std::wstring(sCurSig.begin(), sCurSig.end()))

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -174,8 +174,15 @@ namespace BinXlsxRW{
 		BinXlsxRW::SaveParams			oSaveParams(sDrawingsPath, sThemePath, m_pExternalDrawingConverter->GetContentTypes());
 		OOX::Spreadsheet::CChartSpace	oChartSpace(NULL);
 		BinXlsxRW::BinaryChartReader	oBinaryChartReader(*pReader, oSaveParams, m_pExternalDrawingConverter);
-		
-		oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace);
+	
+		try
+		{
+			oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace);
+		}
+		catch(...)
+		{
+			//todooo
+		}
 
 		if(oChartSpace.isValid())
 		{

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.cpp

@@ -1532,7 +1532,7 @@ void xlsx_pivots_context::add_field_cache(int index, std::wstring value, bool sh
 			node_name = L"n";
 
 			_INT64 iVal = *dVal;
-			if (abs(iVal - *dVal) > 0.00001)
+			if ( *dVal - iVal > 0.00001)
 			{
 				value = std::to_wstring(*dVal);
 				impl_->current_.fields.back().bNumber = true;

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h

@@ -102,7 +102,10 @@ namespace PPT_FORMAT
 				CFileDownloader oDownloader(strInput, TRUE);
 				if ( oDownloader.DownloadSync() )
 				{
-					return GenerateMedia( oDownloader.GetFilePath(), Template, Indexer, strDefaultExt);
+					std::wstring file_name = oDownloader.GetFilePath();
+					
+					//todooo - check media file
+					return GenerateMedia(file_name , Template, Indexer, strDefaultExt);
 				}
 #endif
 			}

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -5786,6 +5786,9 @@ xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"";
 
 HRESULT CDrawingConverter::GetRecordXml(LONG lStart, LONG lLength, LONG lRecType, int nDocType, std::wstring & sXml)
 {
+	if (NULL == m_pReader)
+		return S_FALSE;
+
 	m_pReader->m_pRels->m_pManager->m_nDocumentType = nDocType;
 
 	m_pReader->Seek(lStart);

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

@@ -366,11 +366,19 @@ _UINT32 CPPTXFile::ConvertPPTYToPPTX(std::wstring bsInput, std::wstring bsOutput
 	std::wstring strBsInput = bsInput;
     std::wstring srcFolder = NSDirectory::GetFolderPath(strBsInput);
 
-	oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, bsThemesFolder);
+	_UINT32 hRes = S_OK;
+	
+	try
+	{
+		oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, bsThemesFolder);
+	}
+	catch(...)
+	{
+		hRes = S_FALSE;
+	}
 	
 	RELEASEARRAYOBJECTS(pSrcBuffer);
 	
-	_UINT32 hRes = 0;
 
 	if (m_fCallbackCompress)
 	{

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -575,10 +575,16 @@ namespace NSBinPptxRW
 
 		if ( oDownloader.DownloadSync() )
 		{
-			return oDownloader.GetFilePath();
+			std::wstring file_name = oDownloader.GetFilePath();
+			
+			CImageFileFormatChecker checker;
+			if (checker.isImageFile(file_name))
+			{
+				return file_name;
+			}
 		}
 #endif
-		return _T("");
+		return L"";
 	}
 
 	CBinaryFileWriter::CSeekTableEntry::CSeekTableEntry()
@@ -1885,6 +1891,16 @@ namespace NSBinPptxRW
 		m_pDataCur += 8;
         return res;			
 	}
+	_INT32 CBinaryFileReader::GetRecordSize()
+	{
+		_INT32 sz = (_INT32)GetULong();
+		if (m_lPos + sz > m_lSize)
+		{
+			//todooo - переделать
+			throw;
+		}
+		return sz;
+	}
 	_INT32 CBinaryFileReader::GetLong()
 	{
 		return (_INT32)GetULong();			

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h

@@ -527,6 +527,8 @@ namespace NSBinPptxRW
 		bool GetBool();
 		BYTE GetUChar_TypeNode();
 
+		_INT32 GetRecordSize();
+		
 		// 2 byte
 		_UINT16 GetUShort();
 		_INT16 GetShort();

ASCOfficePPTXFile/Editor/Drawing/Elements.cpp

@@ -32,6 +32,28 @@
 
 #include "Slide.h"
 
+#ifndef DISABLE_FILE_DOWNLOADER
+    #include "../../../Common/FileDownloader/FileDownloader.h"
+	#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#endif
+
+std::wstring PPT_FORMAT::CImageElement::DownloadImage(const std::wstring& strFile)
+{
+#ifndef DISABLE_FILE_DOWNLOADER
+	CFileDownloader oDownloader(strFile, true);
+	if ( oDownloader.DownloadSync() )
+	{
+		m_strImageFileName = oDownloader.GetFilePath();
+		
+		CImageFileFormatChecker checker;
+		if (false == checker.isImageFile(m_strImageFileName))
+		{
+			m_strImageFileName.clear();
+		}
+	}
+#endif
+    return m_strImageFileName;
+}
 void PPT_FORMAT::CShapeElement::CalculateColor(CColor& oColor, CSlide* pSlide, CTheme* pTheme, CLayout* pLayout)
 {
 	LONG lOldIndex = oColor.m_lSchemeIndex;

ASCOfficePPTXFile/Editor/Drawing/Elements.h

@@ -33,10 +33,6 @@
 #include "Theme.h"
 #include "Shapes/Shape.h"
 
-#ifndef DISABLE_FILE_DOWNLOADER
-    #include "../../../Common/FileDownloader/FileDownloader.h"
-#endif
-
 #include "Shapes/BaseShape/PPTShape/Ppt2PptxShapeConverter.h"
 
 namespace PPTX2EditorAdvanced
@@ -378,17 +374,7 @@ namespace PPT_FORMAT
 			return strXmlPPTX;
 		}
 
-		AVSINLINE std::wstring DownloadImage(const std::wstring& strFile)
-		{
-#ifndef DISABLE_FILE_DOWNLOADER
-			CFileDownloader oDownloader(strFile, true);
-			if ( oDownloader.DownloadSync() )
-			{
-				m_strImageFileName = oDownloader.GetFilePath();
-			}
-#endif
-            return m_strImageFileName;
-		}
+		AVSINLINE std::wstring DownloadImage(const std::wstring& strFile);
 	};
 
 	class CShapeElement : public CElement

ASCOfficePPTXFile/Editor/PPTXWriter.h

@@ -1058,7 +1058,7 @@ namespace NSBinPptxRW
 		void ReadMasterInfo(LONG nIndexMaster)
 		{
 			LONG _rec_start = m_oReader.GetPos();
-			LONG _end_rec = _rec_start + m_oReader.GetLong() + 4;
+			LONG _end_rec = _rec_start + m_oReader.GetRecordSize() + 4;
 
 			_slideMasterInfo& oMaster = m_arSlideMasters_Theme[nIndexMaster];			
 			

ASCOfficePPTXFile/Editor/imagemanager.cpp

@@ -119,10 +119,14 @@ namespace NSShapeImageGen
 			if (oDownloader.DownloadSync())
 			{
 				strDownload = oDownloader.GetFilePath();
+				
+				CImageFileFormatChecker checker;
+				if (false == checker.isImageFile(strDownload))
+				{
+					strDownload.clear();
+				}
 			}
-
 #endif
-
 			return GenerateImageID(strDownload, strFileUrl, (std::max)(1.0, width), (std::max)(1.0, height), strAdditionalFile, typeAdditionalFile);
 		}
 		
@@ -179,7 +183,13 @@ namespace NSShapeImageGen
             if (oDownloader.DownloadSync())
             {
                 strDownload = oDownloader.GetFilePath();
-            }
+				
+				CImageFileFormatChecker checker;
+				if (false == checker.isImageFile(strDownload))
+				{
+					strDownload.clear();
+				}           
+			}
 #endif
             return GenerateMediaID(strDownload, strFileUrl);
         }

ASCOfficePPTXFile/PPTXFormat/App.h

@@ -172,7 +172,7 @@ namespace PPTX
 		virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
 			pReader->Skip(1); // type
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/CommentAuthors.h

@@ -93,7 +93,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Comments.h

@@ -253,7 +253,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Core.h

@@ -137,7 +137,7 @@ namespace PPTX
 		virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
 			pReader->Skip(1); // type
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Backdrop.h

@@ -171,7 +171,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Bevel.h

@@ -114,7 +114,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Bg.h

@@ -81,7 +81,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/BgPr.h

@@ -95,7 +95,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/BodyPr.h

@@ -326,7 +326,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 				while (true)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/Bullet.h

@@ -137,7 +137,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				if (pReader->GetPos() == _end_rec)
 					return;
 

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BulletColor.h

@@ -103,7 +103,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				if (pReader->GetPos() == _end_rec)
 					return;
 

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BulletSize.h

@@ -130,7 +130,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				if (pReader->GetPos() == _end_rec)
 					return;
 

ASCOfficePPTXFile/PPTXFormat/Logic/Bullets/BulletTypeface.h

@@ -132,7 +132,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				if (pReader->GetPos() == _end_rec)
 					return;
 

ASCOfficePPTXFile/PPTXFormat/Logic/CNvCxnSpPr.h

@@ -262,7 +262,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/CNvGraphicFramePr.h

@@ -182,7 +182,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/CNvGrpSpPr.h

@@ -142,7 +142,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/CNvPicPr.h

@@ -229,7 +229,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/CNvPr.h

@@ -241,7 +241,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/CNvSpPr.h

@@ -268,7 +268,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/CSld.h

@@ -123,7 +123,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Camera.h

@@ -130,7 +130,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/CxnSp.h

@@ -115,7 +115,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/DefaultShapeDefinition.h

@@ -137,7 +137,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/EffectDag.cpp

@@ -116,7 +116,7 @@ namespace PPTX
 		{
 			pReader->Skip(4); // len
 			BYTE _type = pReader->GetUChar(); 
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/EffectLst.cpp

@@ -138,7 +138,7 @@ namespace PPTX
 		{
 			pReader->Skip(4); // len
 			BYTE _type = pReader->GetUChar(); 
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			while (pReader->GetPos() < _end_rec)
 			{

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaInv.h

@@ -102,7 +102,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/AlphaMod.h

@@ -106,7 +106,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Blend.h

@@ -121,7 +121,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrChange.h

@@ -140,7 +140,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/ClrRepl.h

@@ -103,7 +103,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/EffectElement.h

@@ -104,7 +104,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/FillEffect.h

@@ -102,7 +102,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar();
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/FillOverlay.h

@@ -128,7 +128,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar();
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Glow.h

@@ -126,7 +126,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/InnerShdw.h

@@ -137,7 +137,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/LumEffect.h

@@ -107,7 +107,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/OuterShdw.h

@@ -180,7 +180,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/PrstShdw.h

@@ -157,7 +157,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/Reflection.h

@@ -186,7 +186,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/RelOff.h

@@ -108,7 +108,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/Effects/XfrmEffect.h

@@ -137,7 +137,7 @@ namespace PPTX
 			{
 				pReader->Skip(4); // len
 				BYTE _type = pReader->GetUChar(); 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1);
 

ASCOfficePPTXFile/PPTXFormat/Logic/FillStyle.h

@@ -74,7 +74,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Fills/Tile.h

@@ -133,7 +133,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/FontCollection.h

@@ -130,7 +130,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/FontRef.h

@@ -104,7 +104,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetULong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.h

@@ -106,7 +106,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				if (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -582,7 +582,7 @@ namespace PPTX
 
 		void GraphicFrame::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 			pReader->Skip(1); // start attributes
 
 			while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/GrpSpPr.h

@@ -209,7 +209,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Hyperlink.cpp

@@ -101,7 +101,7 @@ namespace PPTX
 
 		void Hyperlink::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/LightRig.h

@@ -123,7 +123,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Lin.h

@@ -89,7 +89,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/LineEnd.h

@@ -111,7 +111,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/LineJoin.h

@@ -183,7 +183,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/LineStyle.h

@@ -88,7 +88,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Ln.h

@@ -227,7 +227,7 @@ namespace PPTX
 			{
 				m_name = _T("a:ln");
 
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/Media/WavAudioFile.cpp

@@ -85,7 +85,7 @@ namespace PPTX
 		
 		void WavAudioFile::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/NvCxnSpPr.h

@@ -143,7 +143,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/NvGraphicFramePr.h

@@ -152,7 +152,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/NvGrpSpPr.h

@@ -106,7 +106,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/NvPicPr.h

@@ -155,7 +155,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/NvPr.h

@@ -183,7 +183,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/NvSpPr.h

@@ -152,7 +152,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Paragraph.h

@@ -206,7 +206,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Path.h

@@ -102,7 +102,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Ph.h

@@ -112,7 +112,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -245,7 +245,7 @@ namespace PPTX
 
 		void COLEObject::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 
@@ -834,7 +834,7 @@ namespace PPTX
 
 		void Pic::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			nvPicPr.cNvPr.id = -1;
 			while (pReader->GetPos() < _end_rec)

ASCOfficePPTXFile/PPTXFormat/Logic/PrstDash.h

@@ -81,7 +81,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/PrstTxWarp.h

@@ -142,7 +142,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/Rect.h

@@ -120,7 +120,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Rot.h

@@ -100,7 +100,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/RunProperties.h

@@ -76,7 +76,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 
@@ -150,7 +150,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 
@@ -246,7 +246,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 
@@ -606,7 +606,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Scene3d.h

@@ -102,7 +102,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -301,7 +301,7 @@ namespace PPTX
 		
 		void Shape::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
         {
-            LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+            LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/ShapeStyle.h

@@ -159,7 +159,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Sp3d.h

@@ -191,7 +191,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp

@@ -204,7 +204,7 @@ namespace PPTX
 
 		void SpPr::fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
-			LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+			LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 			pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h

@@ -267,7 +267,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(5); //+ len
 
@@ -435,7 +435,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(5); // type + len
 

ASCOfficePPTXFile/PPTXFormat/Logic/StyleRef.h

@@ -102,7 +102,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attributes
 

ASCOfficePPTXFile/PPTXFormat/Logic/SupplementalFont.h

@@ -76,7 +76,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				pReader->Skip(1); // start attr
 

ASCOfficePPTXFile/PPTXFormat/Logic/Table/Table.h

@@ -122,7 +122,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCell.h

@@ -94,7 +94,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCellProperties.h

@@ -209,7 +209,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableCol.h

@@ -91,7 +91,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 				while (true)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableProperties.h

@@ -193,7 +193,7 @@ namespace PPTX
 			}
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/Table/TableRow.h

@@ -118,7 +118,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 				pReader->Skip(1); // start attributes
 
 				while (true)

ASCOfficePPTXFile/PPTXFormat/Logic/TableBgStyle.h

@@ -76,7 +76,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{

ASCOfficePPTXFile/PPTXFormat/Logic/TablePartStyle.h

@@ -77,7 +77,7 @@ namespace PPTX
 
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 			{
-				LONG _end_rec = pReader->GetPos() + pReader->GetLong() + 4;
+				LONG _end_rec = pReader->GetPos() + pReader->GetRecordSize() + 4;
 
 				while (pReader->GetPos() < _end_rec)
 				{