Fixed bugs with reading pdf files.

v4.2.7 v4.2.7

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -307,13 +307,11 @@ namespace DocFileFormat
 				if (!FormatUtils::IsControlSymbol(xchBullet))
 				{
 					ret.push_back(lvl.xst[0]);
-					ret.push_back(L'\0');
 				}
 			}
 			else
 			{
 				ret.push_back(L'\xF0B7');
-				ret.push_back(L'\0');
 			}
 		}
 		else

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -33,7 +33,7 @@
 //
 #include "../DocFormatLib/DocFormatLib.h"
 
-#include "../win32/ASCOfficeCriticalSection.h"
+#include "../../OfficeUtils/src/ASCOfficeCriticalSection.h"
 
 #include "../../OfficeUtils/src/OfficeUtils.h"
 
@@ -41,6 +41,7 @@
 
 #include <string>
 #include <windows.h>
+#include <tchar.h>
 
 #if defined(_WIN64)
 	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
@@ -58,7 +59,6 @@ int _tmain(int argc, _TCHAR* argv[])
 	std::wstring outputDir		= NSDirectory::GetFolderPath(sDstDocx);
 	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
-	// doc->docx
 	COfficeDocFile docFile;
 
 	docFile.m_sTempFolder = outputDir;
@@ -71,7 +71,7 @@ int _tmain(int argc, _TCHAR* argv[])
 		hRes = oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), sDstDocx, -1);
 	}
 	
-	FileSystem::Directory::DeleteDirectory(dstTempPath);
+	NSDirectory::DeleteDirectory(dstTempPath);
 
 	return hRes;
 }

ASCOfficeDocFile/DocFormatTest/DocFormatTest.vcproj

@@ -338,6 +338,58 @@
 	<References>
 	</References>
 	<Files>
+		<Filter
+			Name="Common"
+			>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\ChartWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Common\Common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\CommonWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\CSVReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Writer\CSVWriter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalOptions="/bigobj&#x0D;&#x0A;"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\DocFormatTest.cpp"
 			>
@@ -386,6 +438,14 @@
 			RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

ASCOfficeOdfFile/OdfFileTest/OdfFile.sln

@@ -2,6 +2,9 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "..\win32\cpxml.vcproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\win32\cpodf.vcproj", "{50E20601-4A8D-4AFB-8870-63828D328429}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -21,7 +24,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\wi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
 	ProjectSection(ProjectDependencies) = postProject
+		{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
 		{50E20601-4A8D-4AFB-8870-63828D328429} = {50E20601-4A8D-4AFB-8870-63828D328429}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
 		{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
 		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
@@ -30,7 +35,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileReaderTest", "OdfFil
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.cpp

@@ -31,18 +31,23 @@
  */
 // OdfFileTest.cpp 
 
-#include "../../../OfficeUtils/src/OfficeUtils.h"
+#include <stdio.h>
+#include <tchar.h>
 
-#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 
-#include "../../src/ConvertOO2OOX.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
+#include "../../DesktopEditor/common/Directory.h"
+#include "../src/ConvertOO2OOX.h"
+
 
 #if defined(_WIN64)
-	#pragma comment(lib, "../../../build/bin/icu/win_64/icuuc.lib")
+	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
 #elif defined (_WIN32)
-	#pragma comment(lib, "../../../build/bin/icu/win_32/icuuc.lib")
+	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
 
+
+
 int _tmain(int argc, _TCHAR* argv[])
 {
 	if (argc < 2) return 1;
@@ -50,12 +55,12 @@ int _tmain(int argc, _TCHAR* argv[])
 	HRESULT hr = S_OK;
 //////////////////////////////////////////////////////////////////////////
 	std::wstring srcFileName	= argv[1];
-	std::wstring dstPath		= argc > 2 ? argv[2] : sSrcDoc + L"-my.docx"; //xlsx pptx
+	std::wstring dstPath		= argc > 2 ? argv[2] : srcFileName + L"-my.pptx"; //xlsx pptx
 	
-	std::wstring outputDir		= FileSystem::Directory::GetFolderPath(dstPath);
+	std::wstring outputDir		= NSDirectory::GetFolderPath(dstPath);
 	
-	std::wstring srcTempPath	= FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
-	std::wstring dstTempPath	= FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring srcTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
+	std::wstring dstTempPath	= NSDirectory::CreateDirectoryWithUniqueName(outputDir);
 
     // распаковываем исходник во временную директорию
 	COfficeUtils oCOfficeUtils(NULL);
@@ -64,14 +69,14 @@ int _tmain(int argc, _TCHAR* argv[])
 
 	hr = ConvertOO2OOX(srcTempPath, dstTempPath, L"C:\\Windows\\Fonts", false, NULL);
 
-	FileSystem::Directory::DeleteDirectory(srcTempPath);
+	NSDirectory::DeleteDirectory(srcTempPath);
 
 	if (hr != S_OK)  return hr;
    
 	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), dstPath.c_str(), -1))
         return hr;
 	
-	FileSystem::Directory::DeleteDirectory(dstTempPath);
+	NSDirectory::DeleteDirectory(dstTempPath);
 
 ////////////////////////////////////////////////////////////////////////
 	return 0;

ASCOfficeOdfFile/OdfFileTest/OdfFileTest.vcproj

@@ -43,11 +43,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gdi32.lib"
+				AdditionalDependencies="gdi32.lib Rpcrt4.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -369,6 +369,30 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

ASCOfficeOdfFile/src/docx/mediaitems.cpp

@@ -58,7 +58,7 @@ bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
 
 	std::wstring  resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
 
-    return NSDirectory::Exists(resultPath) || NSDirectory::Exists(mediaPath);
+	return NSFile::CFileBinary::Exists(resultPath) || NSDirectory::Exists(mediaPath);
 }
 
 mediaitems::item::item(	std::wstring const & _href,

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

@@ -433,8 +433,6 @@ void pptx_slide_context::end_shape()
 
 void pptx_slide_context::end_table()
 {
-	impl_->objects_.push_back(impl_->object_description_);
-	default_set();
 }
 
 bool pptx_slide_context::empty() const

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -376,7 +376,7 @@ void oox_serialize_tcPr(std::wostream & strm, std::vector<const odf_reader::styl
 				
 				if (fill.bitmap)
 				{
-					bool isMediaInternal = false;
+					bool isMediaInternal = true;
 					std::wstring ref;
 					fill.bitmap->rId = Context.get_slide_context().get_mediaitems().add_or_find(fill.bitmap->xlink_href_, oox::typeImage, isMediaInternal, ref);
 					Context.get_slide_context().add_rels(isMediaInternal, fill.bitmap->rId, ref, oox::typeImage);

ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp

@@ -71,14 +71,9 @@ namespace odf_reader {
 
 void draw_g::pptx_convert(oox::pptx_conversion_context & Context)
 {
-	int i=0;
-	int size = content_.size();
-	while(true)
-    {
-		if (i>=size)break;
-		office_element_ptr const & elm = content_[i];
-        elm->pptx_convert(Context);
-		i++;
+	for (size_t i = 0; i < content_.size(); i++)
+	{
+        content_[i]->pptx_convert(Context);
     }
 }
 void draw_frame::pptx_convert_placeHolder(oox::pptx_conversion_context & Context)

ASCOfficeOdfFile/src/odf/math_table_elements.cpp

@@ -94,10 +94,10 @@ void math_mtr::oox_convert(oox::math_context & Context)
 	strm << L"<m:mr>";		
 		for (int i = 0; i < content_.size(); i++)
 		{
-		strm << L"<m:e>";
+		//strm << L"<m:e>"; // EqArray записался в числитель вместо знаменателя.docx - дублирование
 			office_math_element* math_element = dynamic_cast<office_math_element*>(content_[i].get());
 			math_element->oox_convert(Context);
-		strm << L"</m:e>";
+		//strm << L"</m:e>";
 		}
 	strm << L"</m:mr>";
 }

ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp

@@ -1735,13 +1735,16 @@ void CDrawingConverter::doc_LoadDiagram(PPTX::Logic::SpTreeElem *result, XmlUtil
 			
 			OOX::CPath pathDiagramDrawing = pathDiagramData.GetDirectory() + FILE_SEPARATOR_STR + L"drawing" + strId + L".xml";	
 
-			oFileDrawing = smart_ptr<OOX::File>(dynamic_cast<OOX::File*>(new OOX::CDiagramDrawing(pathDiagramDrawing)));
-			if (oFileDrawing.IsInit())
-				pDiagramDrawing = dynamic_cast<OOX::CDiagramDrawing*>(oFileDrawing.operator->());
+			if (NSFile::CFileBinary::Exists(pathDiagramDrawing.GetPath()))
+			{
+				oFileDrawing = smart_ptr<OOX::File>(dynamic_cast<OOX::File*>(new OOX::CDiagramDrawing(pathDiagramDrawing)));
+				if (oFileDrawing.IsInit())
+					pDiagramDrawing = dynamic_cast<OOX::CDiagramDrawing*>(oFileDrawing.operator->());
+			}
 		}
 	}
 
-	if (pDiagramDrawing)
+	if ((pDiagramDrawing) && (pDiagramDrawing->m_oShapeTree.IsInit()))
 	{
 		result->InitElem(new PPTX::Logic::SpTree(*pDiagramDrawing->m_oShapeTree));
 		//to correct write blipFill rId to binary

ASCOfficePPTXFile/Editor/Converter.h

@@ -257,54 +257,74 @@ namespace PPTX2EditorAdvanced
 			tablestyles->toPPTY(&oBinaryWriter);
 		}
 
-		// Presentation
+	// Presentation
 		oBinaryWriter.StartMainRecord(NSMainTables::Presentation);
 		presentation->toPPTY(&oBinaryWriter);
 
-		// themes
+	// themes
 		oBinaryWriter.StartMainRecord(NSMainTables::Themes);
-		ULONG nCountThemes = (ULONG)_themes.size();
+		
+		ULONG nCountThemes = 0;
+        for (size_t i = 0; i < _themes.size(); ++i)
+        {
+			if (_themes[i].IsInit()) nCountThemes++;
+        }		
 		oBinaryWriter.WriteULONG(nCountThemes);
-		for (ULONG i = 0; i < nCountThemes; ++i)
+		
+		for (size_t  i = 0; i < _themes.size(); ++i)
 		{
+			if (_themes[i].IsInit() == false) continue;
 			_themes[i]->toPPTY(&oBinaryWriter);
 		}
 
-		// slidemasters
+	// slidemasters
 		oBinaryWriter.StartMainRecord(NSMainTables::SlideMasters);
-		ULONG nCountSM = (ULONG)_slideMasters.size();
+		
+		ULONG nCountSM = 0;
+        for (size_t i = 0; i < _slideMasters.size(); ++i)
+        {
+			if (_slideMasters[i].IsInit()) nCountSM++;
+        }
 		oBinaryWriter.WriteULONG(nCountSM);
-		for (ULONG i = 0; i < nCountSM; ++i)
+		
+		for (size_t i = 0; i < _slideMasters.size(); ++i)
 		{
+			if (_slideMasters[i].IsInit() == false) continue;
+			
 			_slideMasters[i]->toPPTY(&oBinaryWriter);
 		}
 
-		// slidelayouts
+	// slidelayouts
 		oBinaryWriter.StartMainRecord(NSMainTables::SlideLayouts);
-        ULONG nCountL = 0;
-
-        for (ULONG i = 0; i < _layouts.size(); ++i)
+       
+		ULONG nCountL = 0;
+        for (size_t i = 0; i < _layouts.size(); ++i)
         {
-            if (_layouts[i].IsInit())nCountL++;
+			if (_layouts[i].IsInit())nCountL++;
         }
-
 		oBinaryWriter.WriteULONG(nCountL);
-        for (ULONG i = 0; i < _layouts.size(); ++i)
+
+        for (size_t i = 0; i < _layouts.size(); ++i)
 		{
-            if (_layouts[i].IsInit() == false)
-            {
-                continue;
-                //непонятки с 42 шаблоном в FY10_September_Partner_Call.pptx
-            }
+            if (_layouts[i].IsInit() == false)	continue;	//непонятки с 42 шаблоном в FY10_September_Partner_Call.pptx
+
 			_layouts[i]->toPPTY(&oBinaryWriter);
 		}
 
-		// slides
+	// slides
 		oBinaryWriter.StartMainRecord(NSMainTables::Slides);
-		ULONG nCountS = (ULONG)_slides.size();
+		
+		ULONG nCountS = 0;
+        for (size_t i = 0; i < _slides.size(); ++i)
+        {
+			if (_slides[i].IsInit())	nCountS++;
+        }
 		oBinaryWriter.WriteULONG(nCountS);
-		for (ULONG i = 0; i < nCountS; ++i)
+
+		for (size_t i = 0; i < _slides.size(); ++i)
 		{
+			if (_slides[i].IsInit() == false )	continue;
+
 			_slides[i]->toPPTY(&oBinaryWriter);
 		}
 
@@ -312,7 +332,7 @@ namespace PPTX2EditorAdvanced
 		{
 			// ПОКА нету NOTES
 
-			// notes
+		// notes
 			oBinaryWriter.StartMainRecord(NSMainTables::NotesSlides);
 			ULONG nCountN = (ULONG)_notes.size();
 			oBinaryWriter.WriteULONG(nCountN);
@@ -321,7 +341,7 @@ namespace PPTX2EditorAdvanced
 				_notes[i]->toPPTY(&oBinaryWriter);
 			}
 
-			// notesmasters
+		// notesmasters
 			oBinaryWriter.StartMainRecord(NSMainTables::NotesMasters);
 			ULONG nCountNM = (ULONG)_notesMasters.size();
 			oBinaryWriter.WriteULONG(nCountNM);

ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp

@@ -42,11 +42,49 @@
 #include "../../Common/DocxFormat/Source/DocxFormat/ContentTypes.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/External/HyperLink.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/FileTypes.h"
+#include "../../DesktopEditor/common/Directory.h"
 
 #include <map>
 
 namespace PPTX
 {
+	static std::wstring arDefDirectories [9][2] = //in ppt Directory
+	{
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide",			L"slides"},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout",	L"slideLayouts"},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster",	L"slideMasters"},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide",		L"notesSlides"},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster",	L"notesMasters"},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/handoutMaster",	L"handoutMasters"},		
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",		L"comments"},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors",	L""},
+		{L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme",			L"theme"},
+	};
+
+	static std::wstring FindFileInDirectory(std::wstring directory, std::wstring filename)
+	{
+		if (directory.empty()) return L"";
+
+		if (directory[directory.length() - 1] == FILE_SEPARATOR_CHAR)
+			directory = directory.substr(0, directory.length() - 1);
+
+		int pos_ppt = directory.rfind(L"ppt");
+		if (pos_ppt >= 0)
+		{
+			directory = directory.substr(0, pos_ppt - 1); //root directory
+		}
+		CArray<std::wstring> arrFiles = NSDirectory::GetFiles(directory, true);
+
+		for (int i = 0 ; i < arrFiles.GetCount(); i++)
+		{
+			if (std::wstring::npos != arrFiles[i].find(filename))
+			{
+				return arrFiles[i];
+			}
+		}
+		return L"";
+	}
+
 	void FileContainer::read(const OOX::CPath& filename)
 	{
 		//not implement FileContainer.read
@@ -70,6 +108,39 @@ namespace PPTX
 		read(rels, path, map, Event);
 	}
 
+	OOX::CPath FileContainer::CorrectPathRels(const OOX::CPath& path, OOX::Rels::CRelationShip* relation )
+	{
+		OOX::CPath filename = path / relation->Target();
+		
+		if ( NSFile::CFileBinary::Exists(filename.GetPath()) == true ) return filename;
+		
+		//file_1_ (1).pptx			
+		std::wstring strDefDirectory;
+		for (int i = 0; i < 9; i++)
+		{
+			if (relation->Type() == arDefDirectories[i][0])
+			{
+				strDefDirectory = arDefDirectories[i][1];
+				break;
+			}
+		}
+		
+		OOX::CPath new_filename = strDefDirectory + FILE_SEPARATOR_STR + relation->Filename().GetFilename();
+		
+		filename = path / new_filename;
+		
+		if (NSFile::CFileBinary::Exists(filename.GetPath()) == false) 
+		{
+			filename = FindFileInDirectory(path.GetPath(), relation->Filename().GetFilename()); // find true path by filename
+
+			if (NSFile::CFileBinary::Exists(filename.GetPath()) == false) 
+				return filename;
+		}
+
+		*relation = OOX::Rels::CRelationShip( relation->rId(), relation->Type(), filename);
+
+		return filename;
+	}
 	void FileContainer::read(const OOX::CRels& rels, const OOX::CPath& path, FileMap& map, IPPTXEvent* Event)
 	{
 		bool bIsSlide = false;
@@ -81,10 +152,11 @@ namespace PPTX
 
         for (size_t i = 0; i < nCount; ++i)
 		{
-			const OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
-			OOX::CPath normPath = path / pRelation->Target();
+			OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
 
-            std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.find(normPath);
+ 			OOX::CPath normPath = CorrectPathRels(path, pRelation);
+
+			std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.find(normPath);
 
 			if (bIsSlide && (pRelation->Type() == OOX::Presentation::FileTypes::Slide))
 			{
@@ -112,7 +184,10 @@ namespace PPTX
 				{
 					long percent = Event->GetPercent();
 
-					smart_ptr<OOX::File> file = PPTX::FileFactory::CreateFilePPTX(path, *pRelation, map);													
+					smart_ptr<OOX::File> file = PPTX::FileFactory::CreateFilePPTX(normPath, *pRelation, map);
+
+					if (file.IsInit() == false)
+						continue;
 					
 					map.add(normPath, file);
 					Add(pRelation->rId(), file);
@@ -223,9 +298,11 @@ namespace PPTX
 		size_t nCount = rels.m_arrRelations.size();
 		for (size_t i = 0; i < nCount; ++i)
 		{
-			const OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
+			OOX::Rels::CRelationShip* pRelation = rels.m_arrRelations[i];
 
-			smart_ptr<OOX::File> _file = PPTX::FileFactory::CreateFilePPTX_OnlyMedia(path, *pRelation);
+			OOX::CPath normPath = CorrectPathRels(path, pRelation);
+
+			smart_ptr<OOX::File> _file = PPTX::FileFactory::CreateFilePPTX_OnlyMedia(normPath, *pRelation);
 			Add(pRelation->rId(), _file);	
 		}
 	}

ASCOfficePPTXFile/PPTXFormat/FileContainer.h

@@ -64,6 +64,7 @@ namespace PPTX
 		void write(OOX::CRels& rels, const OOX::CPath& current, const OOX::CPath& directory, OOX::CContentTypes& content) const;
 
 		void WrittenSetFalse();
+		OOX::CPath CorrectPathRels(const OOX::CPath& path, OOX::Rels::CRelationShip* relation );
 
 		long m_lPercent;
 		bool m_bCancelled;

ASCOfficePPTXFile/PPTXFormat/FileFactory.cpp

@@ -30,13 +30,13 @@
  *
  */
 
+#include "FileFactory.h"
 
 #include "../../Common/DocxFormat/Source/DocxFormat/File.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/Rels.h"
 #include "../../Common/DocxFormat/Source/DocxFormat/FileTypes.h"
 #include "FileTypes.h"
 
-#include "FileFactory.h"
 #include "App.h"
 #include "Core.h"
 #include "Theme.h"
@@ -69,11 +69,15 @@
 
 #include "FileMap.h"
 
+
 namespace PPTX
 {
-	const smart_ptr<OOX::File> FileFactory::CreateFilePPTX(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation, FileMap& map)
+	const smart_ptr<OOX::File> FileFactory::CreateFilePPTX(const OOX::CPath& filename, OOX::Rels::CRelationShip& relation, FileMap& map)
 	{
-		OOX::CPath filename = path / relation.Filename();
+		if (NSFile::CFileBinary::Exists(filename.GetPath()) == false)
+		{
+			return smart_ptr<OOX::File>(NULL);
+		}
 		
 		if (relation.Type() == OOX::Presentation::FileTypes::App)
 			return smart_ptr<OOX::File>(new PPTX::App(filename, map));
@@ -138,7 +142,7 @@ namespace PPTX
 		return smart_ptr<OOX::File>(new OOX::UnknowTypeFile());
 	}
 
-	const smart_ptr<OOX::File> FileFactory::CreateFilePPTX_OnlyMedia(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation)
+	const smart_ptr<OOX::File> FileFactory::CreateFilePPTX_OnlyMedia(const OOX::CPath& norm_filename, OOX::Rels::CRelationShip& relation)
 	{
 		bool bIsDownload = false;
 		std::wstring strFile = relation.Filename().GetPath();
@@ -152,7 +156,7 @@ namespace PPTX
         if (0 == n1 || 0 == n2 || 0 == n3 || 0 == n4)
 			bIsDownload = true;
 		
-		OOX::CPath filename = path / relation.Filename();
+		OOX::CPath filename = norm_filename;
 
 		if (bIsDownload)
 			filename = relation.Filename();

ASCOfficePPTXFile/PPTXFormat/FileFactory.h

@@ -30,9 +30,6 @@
  *
  */
 #pragma once
-#ifndef PPTX_FILE_FACTORY_INCLUDE_H_
-#define PPTX_FILE_FACTORY_INCLUDE_H_
-
 #include "../../Common/DocxFormat/Source/DocxFormat/File.h"
 
 namespace OOX {namespace Rels {class CRelationShip;}}
@@ -44,9 +41,7 @@ namespace PPTX
 	class FileFactory
 	{
 	public:
-		static const smart_ptr<OOX::File> CreateFilePPTX(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation, FileMap& map);
-		static const smart_ptr<OOX::File> CreateFilePPTX_OnlyMedia(const OOX::CPath& path, const OOX::Rels::CRelationShip& relation);
+		static const smart_ptr<OOX::File> CreateFilePPTX(const OOX::CPath& path, OOX::Rels::CRelationShip& relation, FileMap& map);
+		static const smart_ptr<OOX::File> CreateFilePPTX_OnlyMedia(const OOX::CPath& path, OOX::Rels::CRelationShip& relation);
 	};
 } // namespace PPTX
-
-#endif // PPTX_FILE_FACTORY_INCLUDE_H_

ASCOfficePPTXFile/PPTXFormat/FileTypes.h

@@ -33,7 +33,7 @@
 #ifndef PPTXOOX_FILE_TYPES_INCLUDE_H_
 #define PPTXOOX_FILE_TYPES_INCLUDE_H_
 
-#include "../../../Common/DocxFormat/Source/DocxFormat/FileType.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/FileType.h"
 
 namespace OOX
 {

ASCOfficePPTXFile/PPTXFormat/NotesMaster.h

@@ -121,9 +121,11 @@ namespace PPTX
             theme_= (FileContainer::Get(OOX::Presentation::FileTypes::ThemePPTX)).smart_dynamic_cast<PPTX::Theme>();
 
             if (theme_.IsInit())
+			{
                 theme_->SetColorMap(clrMap);
 
-            tableStyles_ = (theme_->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
+				tableStyles_ = (theme_->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
+			}
 		}
 
 		virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const

ASCOfficePPTXFile/PPTXFormat/Slide.h

@@ -407,14 +407,20 @@ namespace PPTX
 			Layout	= FileContainer::Get(OOX::Presentation::FileTypes::SlideLayout).smart_dynamic_cast<PPTX::SlideLayout>();//boost::shared_dynamic_cast<PPTX::SlideLayout, PPTX::File>(FileContainer::get(OOX::Presentation::FileTypes::SlideLayout));
 			Note	= FileContainer::Get(OOX::Presentation::FileTypes::NotesSlide).smart_dynamic_cast<PPTX::NotesSlide>();
 			comments = FileContainer::Get(OOX::Presentation::FileTypes::SlideComments).smart_dynamic_cast<PPTX::Comments>();
-			Master	= Layout->Master;
-			theme	= Layout->theme;
 			
-            tableStyles_= theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();//boost::shared_dynamic_cast<PPTX::TableStyles, PPTX::File>(Theme->Presentation->get(OOX::Presentation::FileTypes::TableStyles));
-
-			if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
+			if (Layout.IsInit())
 			{
-				Vml = FileContainer::Get(OOX::Presentation::FileTypes::VmlDrawing).smart_dynamic_cast<OOX::CVmlDrawing>();//boost::shared_dynamic_cast<PPTX::VmlDrawing, PPTX::File>(FileContainer::get(OOX::Presentation::FileTypes::VmlDrawing));
+				Master	= Layout->Master;
+				theme	= Layout->theme;
+				
+				if (theme.IsInit())
+				{
+					tableStyles_= theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();//boost::shared_dynamic_cast<PPTX::TableStyles, PPTX::File>(Theme->Presentation->get(OOX::Presentation::FileTypes::TableStyles));
+				}
+				if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
+				{
+					Vml = FileContainer::Get(OOX::Presentation::FileTypes::VmlDrawing).smart_dynamic_cast<OOX::CVmlDrawing>();//boost::shared_dynamic_cast<PPTX::VmlDrawing, PPTX::File>(FileContainer::get(OOX::Presentation::FileTypes::VmlDrawing));
+				}
 			}
 		}
 

ASCOfficePPTXFile/PPTXFormat/SlideLayout.h

@@ -478,11 +478,13 @@ namespace PPTX
 			Master = pFile.smart_dynamic_cast<PPTX::SlideMaster>();
 
 			if (Master.IsInit())
+			{
 				theme = Master->theme;
 			
-			if (theme.IsInit())
-			{	
-                tableStyles = theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();
+				if (theme.IsInit())
+				{	
+					tableStyles = theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();
+				}
 			}
 			if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
 			{

ASCOfficePPTXFile/PPTXFormat/SlideMaster.h

@@ -76,7 +76,7 @@ namespace PPTX
 	public:
 		virtual void read(const OOX::CPath& filename, FileMap& map)
 		{
-			//FileContainer::read(filename, map);
+			//FileContainer::read(filename, map);			
 			XmlUtils::CXmlNode oNode;
 			oNode.FromXmlFile(filename.m_strFilename);
 
@@ -516,9 +516,11 @@ namespace PPTX
             theme = (FileContainer::Get(OOX::Presentation::FileTypes::ThemePPTX)).smart_dynamic_cast<PPTX::Theme>();
 
             if (theme.IsInit())
+			{
                 theme->SetColorMap(clrMap);
-			//Theme->Master.reset((PPTX::WrapperFile*)this);
-            tableStyles = (theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
+				//Theme->Master.reset((PPTX::WrapperFile*)this);
+				tableStyles = (theme->presentation->Get(OOX::Presentation::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
+			}
 
 			if (IsExist(OOX::Presentation::FileTypes::VmlDrawing))
 			{

ASCOfficeRtfFile/RtfFormatLib/source/RtfOldList.cpp

@@ -95,7 +95,7 @@ std::wstring RtfOldList::RenderToOOX(RenderParameter oRenderParameter)
 		{
 			if( PROP_DEF != m_nLs && PROP_DEF != m_nIlvl )
                 sResult += L"<w:numPr><w:ilvl w:val=\"" + std::to_wstring(m_nLs) +
-                        L"\"/><w:numId w:val=\"%" + std::to_wstring(m_nLs) + L"\"/></w:numPr>";
+                        L"\"/><w:numId w:val=\"" + std::to_wstring(m_nLs) + L"\"/></w:numPr>";
 		}
 	}
 	return sResult;

ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp

@@ -2090,7 +2090,7 @@ std::wstring RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
 		case tbw_txbxtwno:			sResult += L"<w:textboxTightWrap w:val=\"none\"/>";				break;
 		case tbw_txbxtwalways:		sResult += L"<w:textboxTightWrap w:val=\"allLines\"/>";			break;
 		case tbw_txbxtwfirstlast:	sResult += L"<w:textboxTightWrap w:val=\"firstAndLastLine\"/>";	break;
-		case tbw_txbxtwfirst:		sResult += L"<w:textboxTightWrap w:val=\"firstLineOnly\"/>";		break;
+		case tbw_txbxtwfirst:		sResult += L"<w:textboxTightWrap w:val=\"firstLineOnly\"/>";	break;
 		case tbw_txbxtwlast:		sResult += L"<w:textboxTightWrap w:val=\"lastLineOnly\"/>";		break;
 	}
 	if( PROP_DEF != m_nListId && PROP_DEF != m_nListLevel )

ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.sln

@@ -3,7 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatLib", "..\RtfFormatLib\Win32\RtfFormatLib.vcproj", "{AF2D00A7-A351-4700-AE88-C1D9ADE29345}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
 	EndProjectSection
 EndProject
@@ -14,21 +13,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
 	ProjectSection(ProjectDependencies) = postProject
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
 		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
 	ProjectSection(ProjectDependencies) = postProject
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
 		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
+		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
+		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
+		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
+		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
+		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
@@ -53,15 +52,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\Off
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatTest", "RtfFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	ProjectSection(ProjectDependencies) = postProject
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
-		{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+		{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
+		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
+		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"

Common/DocxFormat/Source/DocxFormat/FileType.h

@@ -53,7 +53,8 @@ namespace OOX
 
 		FileType(const WCHAR* defaultDirectory, const WCHAR* defaultFileName,
 							const std::wstring& overrideType, 
-							const std::wstring& relationType, bool bEnumerated = false, bool bEnumeratedGlobal = false ) : m_defaultDirectory(defaultDirectory),
+							const std::wstring& relationType, bool bEnumerated = false, bool bEnumeratedGlobal = false )
+		:	m_defaultDirectory(defaultDirectory),
 			m_defaultFileName(defaultFileName),
 			m_overrideType(overrideType),
 			m_relationType(relationType),

DesktopEditor/fontengine/fontconverter/FontFileBase.h

@@ -96,7 +96,7 @@ namespace NSFontConverter
         // BE = big endian
         int          GetS8    (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos >= m_nLen )
             {
@@ -111,7 +111,7 @@ namespace NSFontConverter
 
         int          GetU8    (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
             if ( nPos < 0 || nPos >= m_nLen )
             {
                 *pbSuccess = false;
@@ -122,7 +122,7 @@ namespace NSFontConverter
 
         int          GetS16BE (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos + 1 >= m_nLen )
             {
@@ -138,7 +138,7 @@ namespace NSFontConverter
 
         int          GetU16BE (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos + 1 >= m_nLen)
             {
@@ -152,7 +152,7 @@ namespace NSFontConverter
 
         int          GetS32BE (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos + 3 >= m_nLen )
             {
@@ -171,7 +171,7 @@ namespace NSFontConverter
 
         unsigned int GetU32BE (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos + 3 >= m_nLen )
             {
@@ -186,7 +186,7 @@ namespace NSFontConverter
         }
         unsigned int GetU32LE (int nPos, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos + 3 >= m_nLen )
             {
@@ -201,7 +201,7 @@ namespace NSFontConverter
         }
         unsigned int GetUVarBE(int nPos, int nSize, bool *pbSuccess)
         {
-            *pbSuccess = true;
+            //*pbSuccess = true;
 
             if ( nPos < 0 || nPos + nSize > m_nLen )
             {

HtmlRenderer/src/HTMLRenderer3.cpp

@@ -1261,6 +1261,10 @@ namespace NSHtmlRenderer
         m_pInternal->m_bPageOpened = false;
 
         m_pInternal->m_pFontManager = m_pInternal->m_oApplicationFonts.GenerateFontManager();
+        CFontsCache* pGraphicsFontCache = new CFontsCache();
+        pGraphicsFontCache->SetStreams(m_pInternal->m_oApplicationFonts.GetStreams());
+        pGraphicsFontCache->SetCacheSize(16);
+        m_pInternal->m_pFontManager->SetOwnerCache(pGraphicsFontCache);
 
         m_pInternal->m_oFont.SetDefaultParams();
         m_pInternal->m_oInstalledFont.SetDefaultParams();

PdfReader/Src/JBIG2Stream.cpp

@@ -1646,7 +1646,7 @@ namespace PdfReader
 
 			MemUtilsFree(punRefSegs);
 
-			if (m_pCurStream->GetPos() - unDataStartPos != unSegLength)
+			if (unSegLength != 0xFFFFFFFF && m_pCurStream->GetPos() - unDataStartPos != unSegLength)
 				m_pCurStream->SetPos(unDataStartPos + unSegLength);
 		}
 

PdfReader/Src/Stream.cpp

@@ -803,7 +803,7 @@ namespace PdfReader
 		if (!bLimited || unStart + unLength > m_unStart + m_unLength)
 		{
 			unNewLength = m_unStart + m_unLength - unStart;
-            if (unStart >= m_unLength)
+			if (unStart >= m_unStart + m_unLength)
                 unNewLength = 0;
 		}
 		else