PPT выкинут ненужный код

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65643 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp

@@ -757,15 +757,10 @@ int CPPTUserInfo::AddNewLayout(NSPresentationEditor::CTheme* pTheme, SSlideLayou
 				int usualType = layoutRecord->m_pPlaceHolderID[i];
 				CorrectPlaceholderType(usualType);
 
-				std::map<int, int>::iterator it = pTheme->m_pPlaceholders.find(NSOfficePPT::MasterSlideNumber);
-				if (it  != pTheme->m_pPlaceholders.end())
+				if (!AddThemeLayoutElement(pLayout, usualType, pTheme))
 				{
-					IElement* pElement = pTheme->m_arElements[it->second]->CreateDublicate();
-					pLayout->m_arElements.push_back(dynamic_cast<IElement*>(pElement));
-					pLayout->m_pPlaceholders.insert(std::pair<int, int>(NSOfficePPT::MasterSlideNumber, pLayout->m_arElements.size()-1)); 
-				}
-				else
 					AddNewLayoutElement(pLayout, usualType, defObjSize);
+				}					
 			}break;
 		default:
 			AddNewLayoutElement(pLayout, layoutRecord->m_pPlaceHolderID[i], defObjSize);
@@ -773,39 +768,27 @@ int CPPTUserInfo::AddNewLayout(NSPresentationEditor::CTheme* pTheme, SSlideLayou
 		}
 	}
 
-	if (layoutRecord->m_nGeom==0x0F) return ind;
+	if (layoutRecord->m_nGeom==0x0F) return ind; // big object only !!!
 
 	if (headers_footers)
 	{
 		if (headers_footers->m_bHasSlideNumber)
 		{
-			if (!AddThemeLayoutElement(pLayout, MasterSlideNumber, pTheme))
-			{
-				AddNewLayoutElement(pLayout, MasterSlideNumber, 2);
-			}
+			AddThemeLayoutElement(pLayout, MasterSlideNumber, pTheme);
 		}
 		if (headers_footers->m_bHasTodayDate || 
 			headers_footers->m_bHasUserDate	||
 			headers_footers->m_bHasDate)
 		{
-			if (!AddThemeLayoutElement(pLayout, MasterDate, pTheme))
-			{
-				AddNewLayoutElement(pLayout, MasterDate, 2);
-			}
+			AddThemeLayoutElement(pLayout, MasterDate, pTheme);
 		}
 		if (headers_footers->m_bHasHeader)
 		{
-			if (!AddThemeLayoutElement(pLayout, MasterHeader, pTheme))
-			{
-				AddNewLayoutElement(pLayout, MasterHeader, 2);
-			}
+			AddThemeLayoutElement(pLayout, MasterHeader, pTheme);
 		}
 		if (headers_footers->m_bHasFooter)
 		{
-			if (!AddThemeLayoutElement(pLayout, MasterFooter, pTheme))
-			{
-				AddNewLayoutElement(pLayout, MasterFooter, 2);
-			}
+			AddThemeLayoutElement(pLayout, MasterFooter, pTheme);
 		}	
 	}
 	else if (bMasterObjects)

ASCOfficePPTFile/PPTFormatLib/Reader/Records.cpp

@@ -4,11 +4,6 @@
 
 #include <iostream>
 
-void SRecordHeader::ToXmlWriter(XmlUtils::CXmlWriter* pWriter, POLE::Stream* pStream)
-{
-
-}
-
 void CRecordsContainer::ReadFromStream(SRecordHeader & oHeader, POLE::Stream* pStream)
 {
 	m_oHeader = oHeader;
@@ -187,11 +182,6 @@ IRecord* CreateByType(SRecordHeader oHeader)
 
 	default: 
 		{
-#ifdef _DEBUG
-			char str[1024]={};
-			sprintf(str, "Unknown record type: %xd\n" , oHeader.RecType);
-			std::cout << str;
-#endif
 		}break;		
 	};
 
@@ -204,12 +194,12 @@ IRecord* CreateByType(SRecordHeader oHeader)
 		else
 		{
 			pRecord = new CUnknownRecord();
+#ifdef _DEBUG
+			char str[1024]={};
+			sprintf(str, "Unknown record type: %xd\t" , oHeader.RecType);
+			std::cout << str << GetRecordName((DWORD)oHeader.RecType) << "\n"; 
+#endif
 		}
 	}
-//#ifdef _DEBUG
-		//wchar_t str[1024]={};
-		//swprintf(str, L"%s record type: %xd\n" , GetRecordName((DWORD)oHeader.RecType).GetBuffer(), oHeader.RecType);
-		//std::wcout << str;
-//#endif
 	return pRecord;
 }

ASCOfficePPTFile/PPTFormatLib/Reader/Records.h

@@ -73,20 +73,6 @@ struct SRecordHeader
 		return (*this);
 	}
 
-	void ToXmlWriter(XmlUtils::CXmlWriter* pWriter)
-	{
-		CString str = GetRecordName((DWORD)RecType);
-		
-		pWriter->WriteNodeBegin(str, TRUE);
-		pWriter->WriteAttribute(_T("length"), CDirectory::ToString(RecLen));
-		pWriter->WriteAttribute(_T("type"), CDirectory::ToString(RecType));
-		pWriter->WriteAttribute(_T("instance"), CDirectory::ToString(RecInstance));
-
-		pWriter->WriteNodeEnd(str, TRUE);
-	}
-
-	void ToXmlWriter(XmlUtils::CXmlWriter* pWriter, POLE::Stream* pStream);
-
 };
 
 class IRecord

ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h

@@ -1403,8 +1403,10 @@ public:
 		if (NULL == pElem)
 			return;
 
-		std::wstring strShapeText;
+		pElem->m_lID		= oArrayShape[0]->m_nID;
+		pElem->m_lLayoutID	= lMasterID;
 
+//---------  
 		{
 			CExFilesInfo::ExFilesType exType		= CExFilesInfo::eftNone;
 			CExFilesInfo			* pTextureInfo	= pMapIDs->Lock(0xFFFFFFFF, exType);
@@ -1426,10 +1428,9 @@ public:
 				}
 			}
 		}
-		pElem->m_lID = oArrayShape[0]->m_nID;
-
+		std::wstring strShapeText;
 //------------------------------------------------------------------------------------------------		
-		// placeholder
+		// placeholders
 		std::vector<CRecordPlaceHolderAtom*> oArrayPlaceHolder;
 		GetRecordsByType(&oArrayPlaceHolder, true, true);
 		if (0 < oArrayPlaceHolder.size())
@@ -1453,9 +1454,7 @@ public:
 			
 			CorrectPlaceholderType(pElem->m_lPlaceholderType);
 		}
-
-		if (pElem->m_lPlaceholderType > 0) // meta
-		{
+		//meta placeholders
 		std::vector<CRecordFooterMetaAtom*> oArrayFooterMeta;
 		GetRecordsByType(&oArrayFooterMeta, true, true);
 		if (0 < oArrayFooterMeta.size())
@@ -1475,11 +1474,8 @@ public:
 
 			if (posText < pTheme->m_oFootersHeaderString.size())
 				strShapeText = pTheme->m_oFootersHeaderString[posText];
-
 		}
-		}
-
-//----------------------------------------------------------------------------------------------
+//-------------  ---------------------------------------------------------------------------------
 		std::vector<CRecordClientAnchor*> oArrayAnchor;
 		this->GetRecordsByType(&oArrayAnchor, true, true);
 
@@ -1550,8 +1546,7 @@ public:
 			pElementLayout->m_bPlaceholderSet	= true;
 			pElementLayout->m_bBoundsEnabled	= true;
 		}
-
-		//    
+//---------   --------------------------------------------------------------------------
 		CShapeElement* pShapeElem = dynamic_cast<CShapeElement*>(pElem);
 		if (NULL != pShapeElem)
 		{
@@ -1588,15 +1583,12 @@ public:
 				oElementInfo.m_lPersistIndex = oArrayTextRefs[0]->m_nIndex;
 			}
 
-			//   ...
+			//  ...
 			std::vector<CRecordTextBytesAtom*> oArrayTextBytes;
 			GetRecordsByType(&oArrayTextBytes, true, true);
 			if (0 < oArrayTextBytes.size() && strShapeText.empty())
 			{
 				strShapeText = oArrayTextBytes[0]->m_strText;
-
-				if (pElem->m_lPlaceholderType == PT_MasterSlideNumber && strShapeText.length() > 5)
-					pElem->m_lPlaceholderType = PT_MasterFooter; ///???? 1-(33).ppt
 			}
 			
 			std::vector<CRecordTextCharsAtom*> oArrayTextChars;
@@ -1607,17 +1599,16 @@ public:
 				strShapeText = oArrayTextChars[0]->m_strText;
 			}
 
-			//    ...
+			if (pElem->m_lPlaceholderType == PT_MasterSlideNumber && strShapeText.length() > 5)
+				pElem->m_lPlaceholderType = PT_MasterFooter; ///???? 1-(33).ppt
 
-			//  - 
+//------ shape properties ----------------------------------------------------------------------------------------
 			for (int nIndexProp = 0; nIndexProp < oArrayOptions.size(); ++nIndexProp)
 			{
 				CPPTElement oElement;
 				oElement.SetUpProperties(pElem, pTheme, pSlideWrapper, pSlide, &oArrayOptions[nIndexProp]->m_oProperties);
 			}
 
-			pElem->m_lLayoutID = lMasterID;
-
 			std::vector<CRecordStyleTextPropAtom*> oArrayTextStyle;
 			this->GetRecordsByType(&oArrayTextStyle, true, true);
 			if (0 != oArrayTextStyle.size())
@@ -1694,12 +1685,9 @@ public:
 			pSlideWrapper->m_mapElements.insert(std::pair<LONG, CElementInfo>(pShapeElem->m_lID, oElementInfo));
 			
 			SetUpTextStyle(strShapeText, pTheme, pLayout, pElem, pThemeWrapper, pSlideWrapper, pSlide, master_level);
-			
-//------------------------------------------------------------------------------------
-
 		}
 		else
-		{
+		{//image, audio, video ....
 			for (int nIndexProp = 0; nIndexProp < oArrayOptions.size(); ++nIndexProp)
 			{
 				CPPTElement oElement;
@@ -1708,7 +1696,7 @@ public:
 
 			pElem->m_lLayoutID = lMasterID;
 		}
-
+//----------------------------------------------------------------------------------------------------
 		if (NULL != pSlide)
 		{
 			pElem->m_dStartTime		= pSlide->m_dStartTime;

ASCPresentationEditor/ASCPresentationEditor.cpp

-// ASCPresentationEditor.cpp : Implementation of DLL Exports.
-
-
-#include "stdafx.h"
-#include "resource.h"
-
-#include "ASCPresentationEditor.h"
-
-// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
-[ module(dll, uuid = "{B34974D7-C020-45b2-8A19-AFC20526B083}", 
-		 name = "ASCPresentationEditor", 
-		 helpstring = "ASCPresentationEditor 1.0 Type Library",
-		 resource_name = "IDR_ASCPRESENTATIONEDITOR") ];
-		 

ASCPresentationEditor/ASCPresentationEditor.rc

-//Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-#define COMPONENT_NAME "PresentationEditor"
-#include "../Common/FileInfo.h"
-#include "version.h"
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1251)
-
-/////////////////////////////////////////////////////////////////////////////
-IDB_XML_NOTESTHEME		PPTXW                     "PPTXWriter\\ResourceFiles\\notesTheme.xml"
-IDB_XML_NOTESMASTER		PPTXW                     "PPTXWriter\\ResourceFiles\\notesMaster.xml"
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE  
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE  
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-
-#endif    // APSTUDIO_INVOKED
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION INTVER
- PRODUCTVERSION INTVER
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION_ACTIVEX
-            VALUE "FileVersion", STRVER
-            VALUE "InternalName", COMPONENT_FILE_NAME_DLL
-            VALUE "LegalCopyright", LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", COMPONENT_FILE_NAME_DLL
-            VALUE "ProductName", FILE_DESCRIPTION_ACTIVEX
-            VALUE "ProductVersion", STRVER
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-		VALUE "Translation", 0x0409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE  
-BEGIN
-	IDS_PROJNAME					"ASCPresentationEditor"
-END
-
-IDR_ASCPRESENTATIONEDITOR REGISTRY "ASCPresentationEditor.rgs"
-////////////////////////////////////////////////////////////////////////////
-
-
-#endif
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

ASCPresentationEditor/ASCPresentationEditor.rgs

-HKCR
-{
-	NoRemove AppID
-	{
-		'%APPID%' = s 'ASCPresentationEditor'
-		'ASCPresentationEditor.DLL'
-		{
-			val AppID = s '%APPID%'
-		}
-	}
-}

ASCPresentationEditor/ASCPresentationEditor.sln

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCPresentationEditor", "ASCPresentationEditor.vcproj", "{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}.Debug|Win32.Build.0 = Debug|Win32
-		{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}.Release|Win32.ActiveCfg = Release|Win32
-		{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

ASCPresentationEditor/ASCPresentationEditor.vcproj

-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ASCPresentationEditor"
-	ProjectGUID="{61BE1BAC-A599-48FF-B44E-097C9D2DF0E9}"
-	Keyword="AtlProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
-				HeaderFileName="ASCPresentationEditor.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
-				ProxyFileName="ASCPresentationEditor_p.c"
-				ValidateParameters="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\ASCPresentationEditor"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="true"
-				IgnoreImportLibrary="true"
-				LinkIncremental="2"
-				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\Redist\VersionControl.exe &quot;$(ProjectDir)\version.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/ASCPresentationEditor.tlb"
-				HeaderFileName="ASCPresentationEditor.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="ASCPresentationEditor_i.c"
-				ProxyFileName="ASCPresentationEditor_p.c"
-				ValidateParameters="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\ASCPresentationEditor"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="true"
-				IgnoreImportLibrary="true"
-				LinkIncremental="1"
-				MergedIDLBaseFileName="_ASCPresentationEditor.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\Redist&quot;&#x0D;&#x0A;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\ASCPresentationEditor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\ASCPresentationEditor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PPTStorage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\ASCPresentationEditor.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\ASCPresentationEditor.rgs"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="OfficeDrawing"
-			>
-			<File
-				RelativePath=".\OfficeDrawing\Animations.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Attributes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\AudioOverlay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Document.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Effects.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Element.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\ElementProperties.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Elements.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Elements.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Interactive.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Layout.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Layout.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Metric.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Slide.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\SlideShow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Structures.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\SVGConverter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\SVGConverter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\TextAttributesEx.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\TextAttributesEx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\TextStructures.h"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Theme.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\OfficeDrawing\Theme.h"
-				>
-			</File>
-			<Filter
-				Name="Graphics"
-				>
-				<File
-					RelativePath=".\OfficeDrawing\Shapes\Graphics\agg_trans_affine.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\OfficeDrawing\Shapes\Graphics\agg_trans_affine.h"
-					>
-				</File>
-				<File
-					RelativePath=".\OfficeDrawing\Shapes\Graphics\ap_AggPlusEnums.h"
-					>
-				</File>
-				<File
-					RelativePath=".\OfficeDrawing\Shapes\Graphics\ap_AggPlusTypes.h"
-					>
-				</File>
-				<File
-					RelativePath=".\OfficeDrawing\Shapes\Graphics\Matrix.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="PPTXWriter"
-			>
-			<File
-				RelativePath=".\PPTXWriter\Converter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PPTXWriter\CSS.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PPTXWriter\ImageManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PPTXWriter\ShapeWriter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\PPTXWriter\ShapeWriter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PPTXWriter\StylesWriter.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

ASCPresentationEditor/OfficeDrawing/Attributes.h

@@ -9,7 +9,7 @@
 
 #include "Metric.h"
 #include "Effects.h"
-#include "../../Common/DocxFormat/Source/XML/xmlutils.h"
+//#include "../../Common/DocxFormat/Source/XML/xmlutils.h"
 #include "../../Common/ASCUtils.h"
 #include "./XmlWriter.h"
 
@@ -639,49 +639,6 @@ namespace NSPresentationEditor
 			RELEASEARRAYOBJECTS(DashPattern);
 		}
 
-	public:
-
-		inline CString ToString()
-        {
-			if (0 == Count)
-			{
-				CString str = _T("");
-				str.Format(_T("<pen pen-color='%s' pen-alpha='%d' pen-size='%.6f' pen-style='%d' pen-line-start-cap='%d' pen-line-end-cap='%d' pen-line-join='%d'/>"),
-					Color.ToString(), Alpha, Size, DashStyle, LineStartCap, LineEndCap, LineJoin);
-				return str;
-			}
-			CString str = _T("");
-			str.Format(_T("<pen pen-color='%s' pen-alpha='%d' pen-size='%.6f' pen-style='%d' pen-line-start-cap='%d' pen-line-end-cap='%d' pen-line-join='%d' pen-dash-pattern-count='%d' dash-offset='%.2lf'>"),
-				Color.ToString(), Alpha, Size, DashStyle, LineStartCap, LineEndCap, LineJoin, Count, DashOffset);
-
-			str += _T("<dash-pattern>");
-
-			for (long i = 0; i < Count; ++i)
-			{
-				CString strMem = _T("");
-				strMem.Format(_T("<dash>%.2lf</dash>"), DashPattern[i]);
-				str += strMem;
-			}
-
-			str += _T("</dash-pattern></pen>");
-
-			return str;
-        }
-		inline CString ToXmlWriter(NSPresentationEditor::CXmlWriter* pWriter)
-		{
-			pWriter->WriteNodeBegin(_T("pen"), true);
-			pWriter->WriteAttributeString(_T("color"), Color.ToString());
-			pWriter->WriteAttributeLONG(_T("alpha"), Alpha);
-			pWriter->WriteAttributeDouble(_T("size"), Size);
-
-			pWriter->WriteAttributeDouble(_T("style"), (LONG)DashStyle);
-			pWriter->WriteAttributeDouble(_T("line-start-cap"), (LONG)LineStartCap);
-			pWriter->WriteAttributeDouble(_T("line-end-cap"), (LONG)LineEndCap);
-			pWriter->WriteAttributeDouble(_T("line-join"), (LONG)LineJoin);
-			pWriter->WriteNodeEnd(_T("pen"), true);
-
-            return CString(_T(""));
-		}
 	};
 
 	class CBrush
@@ -910,32 +867,6 @@ namespace NSPresentationEditor
 		}
 
 	public:
-		inline CString ToString()
-		{
-			return _T("<brush brush-type='")	+ NSPresentationEditor::ToString(Type)
-				+ _T("' brush-color1='")		+ Color1.ToString() + _T("' brush-color2='") + Color2.ToString()
-				+ _T("' brush-alpha1='")		+ NSPresentationEditor::ToString(Alpha1) + _T("' brush-alpha2='") + NSPresentationEditor::ToString(Alpha2) 
-				+ _T("' brush-texturepath='")	+ std_string2string(TexturePath) + _T("' brush-texturealpha='") + NSPresentationEditor::ToString(TextureAlpha)  
-				+ _T("' brush-texturemode='")	+ NSPresentationEditor::ToString(TextureMode)  + _T("' />");
-		}
-		inline CString ToXmlWriter(NSPresentationEditor::CXmlWriter* pWriter)
-		{
-			pWriter->WriteNodeBegin(_T("brush"), true);
-			pWriter->WriteAttributeLONG(_T("brush-type"), Type);
-			pWriter->WriteAttributeString(_T("brush-color1"), Color1.ToString());
-			pWriter->WriteAttributeString(_T("brush-color2"), Color2.ToString());
-			pWriter->WriteAttributeLONG(_T("brush-alpha1"), Alpha1);
-			pWriter->WriteAttributeLONG(_T("brush-alpha2"), Alpha2);
-
-			pWriter->WriteAttributeString(_T("brush-texturepath"), std_string2string(TexturePath));
-
-			pWriter->WriteAttributeDouble(_T("brush-texturealpha"), TextureAlpha);
-			pWriter->WriteAttributeDouble(_T("brush-texturemode"), TextureMode);
-
-			pWriter->WriteNodeEnd(_T("brush"), true);
-           
-            return CString(_T(""));
-		}
 	};
 
 	class CFont
@@ -1248,11 +1179,6 @@ namespace NSPresentationEditor
 
 			return (*this);
 		}
-
-		void ToXmlWriter(NSPresentationEditor::CXmlWriter* pWriter)
-		{
- 
-		}
 	};
 
 	static void ParseString(CString strDelimeters, CString strSource, 

ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Path.h

@@ -1357,29 +1357,7 @@ namespace NSPresentationEditor
 	#endif
 		CString ToXml(CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo, NSBaseShape::ClassType ClassType)
 		{
-			CString strTimeLine = _T("");
-			strTimeLine.Format(_T("<timeline type='1' begin='%lf' end='%lf' fadein='0' fadeout='0' completeness='1.0'/>"), dStartTime, dEndTime);
-
-			CString strFill = _T("");
-			strFill.Format(_T(" stroke='%s' fill='%s' angle='%lf' flags='%d' bounds-left='%lf' bounds-top='%lf' bounds-right='%lf' bounds-bottom='%lf' widthmm='%d' heightmm='%d'>"),
-				NSPresentationEditor::BoolToString(m_bStroke), NSPresentationEditor::BoolToString(m_bFill), 
-				pGeomInfo.m_dRotate, pGeomInfo.GetFlags(), 
-				pGeomInfo.m_dLeft, pGeomInfo.m_dTop, pGeomInfo.m_dLeft + pGeomInfo.m_dWidth, pGeomInfo.m_dTop + pGeomInfo.m_dHeight,
-				pInfo.m_lMillimetresHor, pInfo.m_lMillimetresVer);
-
-			strFill += pPen.ToString();
-			if (m_bFill)
-				strFill += pFore.ToString();
-
-			CString strResult = _T("<ImagePaint-DrawGraphicPath") + strFill;
-			for (int nIndex = 0; nIndex < m_arSlices.size(); ++nIndex)
-			{
-				strResult += m_arSlices[nIndex].ToXml(pGeomInfo, width, height, ClassType);
-			}
-			strResult += strTimeLine;
-			strResult += _T("</ImagePaint-DrawGraphicPath>");
-
-			return strResult;
+			return _T("");
 		}
 
 		void ToRenderer(CGraphicPath* pRenderer, CGeomShapeInfo& pGeomInfo, double dStartTime, double dEndTime, CPen& pPen, CBrush& pFore, CMetricInfo& pInfo, NSBaseShape::ClassType ClassType)

ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h

@@ -3,8 +3,6 @@
 #include "TextStructures.h"
 
 #if !defined(_WIN32) && !defined (_WIN64)
-    //#include "./../../DesktopEditor/cximage/CxImage/ximadef.h"
-    //#include "../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
     #include "../../DesktopEditor/graphics/aggplustypes.h"
 #endif
 

ASCPresentationEditor/PPTStorage.h

-#pragma once
-
-#include "../Common/ShareMemArray.h"
-
-namespace NSPresentationEditor
-{
-	//  
-	#define ISID_DEFAULT			0x0000	//  
-	#define ISID_PPTSTATUSSTORAGE	0x0001	//   
-	#define ISID_PPTINFOSTORAGE		0x0002	//   
-
-	static long AVS_OFFICESTUDIO_FILE_UNKNOWN					= 0x0000;
-	static long AVS_OFFICESTUDIO_FILE_PRESENTATION				= 0x0080;
-	static long AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX			= 0x0081;
-	static long AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT			= 0x0082;
-	static long AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP			= 0x0083;
-
-
-	namespace NSStrings
-	{
-		static CString ConvertCStringWToCString(CStringW& strW)
-		{
-			BSTR bstr = strW.AllocSysString();
-			CString str(bstr);
-			SysFreeString(bstr);
-
-			return str;
-		}
-
-		static CStringW GetCStringWFromUTF8( BYTE* pBuffer, LONG64 lCount )
-		{
-			LONG64 lLenght = 0;
-			CStringW strRes = L"";
-			for (LONG lIndex = 0; lIndex < lCount; ++lIndex)
-			{
-				if (0x00 == (0x80 & pBuffer[lIndex]))
-				{
-					strRes += (WCHAR)pBuffer[lIndex];
-					continue;
-				}
-				else if (0x00 == (0x20 & pBuffer[lIndex]))
-				{
-					WCHAR mem = (WCHAR)(((pBuffer[lIndex] & 0x1F) << 6) + (pBuffer[lIndex + 1] & 0x3F));
-					strRes += mem;
-
-					lIndex += 1;
-				}
-				else if (0x00 == (0x10 & pBuffer[lIndex]))
-				{
-					WCHAR mem = (WCHAR)(((pBuffer[lIndex] & 0x0F) << 12) + ((pBuffer[lIndex + 1] & 0x3F) << 6) + (pBuffer[lIndex + 2] & 0x3F));
-					strRes += mem;
-
-					lIndex += 2;
-				}
-			}
-			return strRes;
-		}
-		
-		static CString GetCStringFromUTF8( BYTE* pBuffer, LONG64 lCount )
-		{
-			CStringW strRes = GetCStringWFromUTF8(pBuffer, lCount);
-			return ConvertCStringWToCString(strRes);
-		}
-	};
-
-	//    PPT-
-	enum PPTStatus {STIF_ERROR, STIF_AVAILABLE, STIF_CREATING, STIF_BROKEN};
-
-	enum StringCoding 
-	{	
-		scASCII		= 0, 
-		scUNICODE	= 1, 
-		scUTF8		= 2
-	};
-
-	//        
-	struct SPPTStatusStorage
-	{
-		PPTStatus	m_sStatus;					// 
-
-		//       
-		LONG		m_nProgress;				//  
-		LONG64		m_lLength;					//  
-
-		SPPTStatusStorage() 
-		{
-			Reset();
-		}
-
-		void Reset()
-		{
-			//  
-			m_sStatus = STIF_ERROR;				// 
-
-			//       
-			m_nProgress		= 0;
-			m_lLength		= 0;				//  
-		}
-	};
-
-	struct SPPTInfoStorage
-	{
-		LONG		m_lCount;
-		
-		CString		m_strTempDirectory;
-		CString		m_strXml;				//    
-
-		SPPTInfoStorage() 
-		{
-			Reset();
-		}
-
-		~SPPTInfoStorage()
-		{
-		}
-
-		void Reset()
-		{
-			m_lCount			= 0;
-
-			m_strTempDirectory	= _T("");
-			m_strXml			= _T("");
-		}
-
-		CString SetXml(BYTE* pBuffer, LONG lBytesCount)
-		{
-			CString strXml((WCHAR*)pBuffer, lBytesCount / sizeof(WCHAR));
-			return strXml;
-		}
-		void Save(BYTE* pBuffer)
-		{
-			if (NULL == pBuffer)
-				return;
-
-			BYTE* pData = pBuffer;
-			
-			*((LONG*)pData) = m_lCount;
-			pData += sizeof(LONG);
-
-			LONG lLenTemp = m_strTempDirectory.GetLength();
-
-			*((LONG*)pData) = lLenTemp;
-			pData += sizeof(LONG);
-
-			size_t lSizeTemp = ((size_t)lLenTemp) * sizeof(WCHAR);
-			memcpy(pData, m_strTempDirectory.GetBuffer(), lSizeTemp);
-			pData += lSizeTemp;
-
-			memcpy(pData, (BYTE*)m_strXml.GetBuffer(), m_strXml.GetLength() * sizeof(WCHAR));
-		}
-
-		LONG64 GetLength()
-		{
-			LONG64 lRes = 2 * sizeof(LONG);
-			lRes += (m_strTempDirectory.GetLength() * sizeof(WCHAR));
-			lRes += (m_strXml.GetLength() * sizeof(WCHAR));
-			return lRes;
-		}
-
-		void Load(BYTE* pBuffer, LONG64 lLength)
-		{
-			BYTE* pData = pBuffer;
-
-			m_lCount = *((LONG*)pData);
-			pData += sizeof(LONG);
-
-			LONG lLenTemp = *((LONG*)pData);
-			pData += sizeof(LONG);
-
-			CStringW strTemp((WCHAR*)pData, lLenTemp);
-			m_strTempDirectory = strTemp;
-			pData += lLenTemp * sizeof(WCHAR);
-
-			LONG lXmlSize = (LONG)(lLength - (pData - pBuffer));
-			CStringW strW((WCHAR*)pData, lXmlSize / sizeof(WCHAR));
-
-			m_strXml = strW;
-		}
-	};
-
-	//    
-	class CStatusStorage: public CShareMemArray<BYTE>
-	{
-	protected:
-
-		bool ReadStruct_unsync(SPPTStatusStorage *aData)		//   unsync
-		{
-			__try
-			{
-				SPPTStatusStorage *pTable = (SPPTStatusStorage *) ( (BYTE *)m_pArray + sizeof(LONG64));	// sizeof(LONG64) -  
-				memcpy(aData, pTable, sizeof(SPPTStatusStorage)); 
-			}
-			__except(EXCEPTION_IN_PAGE_ERROR == GetExceptionCode() ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
-			{
-				// Failed to read from the view.
-				ATLTRACE2("CStatusStorage::ReadStruct_unsync() fails!\n");
-				return false;
-			}
-			return true;
-		}
-
-		bool WriteStruct_unsync(SPPTStatusStorage *aData)	//   unsync
-		{
-			__try
-			{
-				SPPTStatusStorage *pTable = (SPPTStatusStorage *) ( (BYTE *)m_pArray + sizeof(LONG64));	// sizeof(LONG64) -  
-				memcpy(pTable, aData, sizeof(SPPTStatusStorage)); 
-			}
-			__except(EXCEPTION_IN_PAGE_ERROR == GetExceptionCode() ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
-			{
-				// Failed to read from the view.
-				ATLTRACE2("CStatusStorage::ReadStruct_unsync() fails!\n");
-				return false;
-			}
-			return true;
-		}
-
-	public:
-
-		bool ReadStruct(SPPTStatusStorage *aData)
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			return ReadStruct_unsync(aData);
-		}
-		bool WriteStruct(SPPTStatusStorage *aData)
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			return WriteStruct_unsync(aData);
-		}
-
-	public:
-
-		//    (bForceControl -   ,  )
-		//  *bForceControl == true -    
-		bool GetStatus(bool *bForceControl, SPPTStatusStorage* aIS)
-		{
-			bool bTryToForceControl = bForceControl && (*bForceControl);
-
-			if (NULL == aIS) return false;
-
-			if (bForceControl) *bForceControl = false;	//      
-
-			//     :)
-			CSynchAccess oAccess = m_hAccessMutex;
-			
-			if (!ReadStruct_unsync(aIS)) return false;	//    
-
-			if ((STIF_BROKEN == aIS->m_sStatus) || (STIF_ERROR == aIS->m_sStatus))
-			{
-				//   - ,     (  )
-				if (bTryToForceControl)
-				{
-					//  
-					aIS->Reset();
-					aIS->m_sStatus = STIF_CREATING;
-					*bForceControl = WriteStruct_unsync(aIS);	//     ,   
-				}
-			}
-
-			return true;
-		}
-		//  ,   .     
-		bool SetBroken()
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			SPPTStatusStorage sStor;
-			sStor.m_sStatus = STIF_BROKEN;
-			//   -
-			return WriteStruct_unsync(&sStor);
-		}
-		//   ( )
-		void Progress(double aProgress)
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			
-			SPPTStatusStorage sStor;
-			ReadStruct_unsync(&sStor);
-			sStor.m_nProgress = aProgress;
-			
-			WriteStruct_unsync(&sStor);
-		}
-		//  
-		double Progress()
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			
-			SPPTStatusStorage sStor;
-			ReadStruct_unsync( &sStor );
-			return sStor.m_nProgress;
-		}
-	private:
-		//     
-		bool Save(std::vector<BYTE> &aTable)
-		{
-			return false;
-		}
-
-		bool Load(std::vector<BYTE> &aTable)
-		{
-			return false;
-		}
-
-
-	public:
-		CStatusStorage(CString &aFileName):
-		  CShareMemArray(aFileName, sizeof(SPPTStatusStorage), ISID_PPTSTATUSSTORAGE)
-		{
-			//ATLTRACE2("CStatusStorage created;\n");
-		};	
-		~CStatusStorage()
-		{
-			//ATLTRACE2("CStatusStorage destroyed;\n");
-		};
-	};
-
-	//    
-	class CInfoStorage: public CShareMemArray<BYTE>
-	{
-	protected:
-
-		bool ReadStruct_unsync(SPPTInfoStorage *aData)		//   unsync
-		{
-			__try
-			{
-				LONG64 lLength = Size();
-				aData->Load((BYTE*)m_pArray + sizeof(LONG64), lLength);	// sizeof(LONG64) -  
-			}
-			__except(EXCEPTION_IN_PAGE_ERROR == GetExceptionCode() ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
-			{
-				// Failed to read from the view.
-				ATLTRACE2("CStatusStorage::ReadStruct_unsync() fails!\n");
-				return false;
-			}
-			return true;
-		}
-
-		bool WriteStruct_unsync(SPPTInfoStorage *aData)	//   unsync
-		{
-			__try
-			{
-				LONG64 *pSize = (LONG64*)m_pArray;	
-				*pSize = m_nSize;
-
-				aData->Save((BYTE*)m_pArray + sizeof(LONG64));	// sizeof(LONG64) -  
-			}
-			__except(EXCEPTION_IN_PAGE_ERROR == GetExceptionCode() ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
-			{
-				// Failed to read from the view.
-				ATLTRACE2("CStatusStorage::ReadStruct_unsync() fails!\n");
-				return false;
-			}
-			return true;
-		}
-
-	public:
-
-		bool ReadStruct(SPPTInfoStorage *aData)
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			return ReadStruct_unsync(aData);
-		}
-		bool WriteStruct(SPPTInfoStorage *aData)
-		{
-			CSynchAccess oAccess = m_hAccessMutex;
-			return WriteStruct_unsync(aData);
-		}
-		bool WriteCount(SPPTInfoStorage *aData)
-		{
-			__try
-			{
-				BYTE* pData = (BYTE*)m_pArray + sizeof(LONG64);
-				*((LONG*)pData) = aData->m_lCount;
-			}
-			__except(EXCEPTION_IN_PAGE_ERROR == GetExceptionCode() ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH)
-			{
-				// Failed to read from the view.
-				ATLTRACE2("CStatusStorage::ReadStruct_unsync() fails!\n");
-				return false;
-			}
-			return true;
-		}
-
-	private:
-		//     
-		bool Save(std::vector<BYTE> &aTable)
-		{
-			return false;
-		}
-
-		bool Load(std::vector<BYTE> &aTable)
-		{
-			return false;
-		}
-
-
-	public:
-		CInfoStorage(CString &aFileName, LONG64 lSize):
-		  CShareMemArray(aFileName, lSize, ISID_PPTINFOSTORAGE)
-		{
-			//ATLTRACE2("CStatusStorage created;\n");
-		};	
-		~CInfoStorage()
-		{
-			//ATLTRACE2("CStatusStorage destroyed;\n");
-		};
-	};
-}

ASCPresentationEditor/Resource.h

-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ASCPresentationEditor.rc
-//
-
-#define IDS_PROJNAME                    100
-#define IDR_ASCPRESENTATIONEDITOR		101
-
-#define IDB_XML_NOTESTHEME				201
-#define IDB_XML_NOTESMASTER				202
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        301
-#define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         201
-#define _APS_NEXT_SYMED_VALUE           102
-#endif
-#endif

ASCPresentationEditor/presentation_editor.xml

-<Presentation  xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	<Themes>
-		<Theme>
-			<Colors>
-				.color1 { color: #000000; }
-				.color2 { color: #00FF00; }
-			</Colors>
-			<Fonts>
-				<Font name="Arial" charset="0x00" monospace="0" panose="0000000000"/>
-				<Font name="Times New Roman" charset="0x00" monospace="0" panose="0000000000"/>
-			</Fonts>
-			<TextStyles>
-				<Style type="0">
-					.s0_level1 { font-family: Times New Roman; font-size: 19px; }
-					.s0_level2 { font-family: Times New Roman; font-size: 25px; }
-				</Style>
-				<Style type="1">
-					.s1_level1 { font-family: Times New Roman; font-size: 19px; }
-					.s1_level2 { font-family: Times New Roman; font-size: 25px; }
-					.s1_level3 { font-family: Times New Roman; font-size: 64px; }
-				</Style>
-			</TextStyles>
-			<Background>
-				<g>
-					<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-				</g>
-			</Background>
-			<Elements>
-				<g>
-					<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-				</g>
-				<g>
-					<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-					<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-				</g>
-			</Elements>
-			<Layouts>
-				<Layout>
-					<Background>
-						<g>
-							<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-						</g>
-					</Background>
-					<Elements>
-						<g>
-							<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-						</g>
-						<g>
-							<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-							<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-						</g>
-					</Elements>
-					<Placeholders>
-						<Placeholder id="0" type="title" bounds="10 10 80 10"/>
-						<Placeholder id="1" type="subtitle" bounds="10 10 80 10"/>
-					</Placeholders>
-				</Layout>
-			</Layouts>
-		</Theme>
-	</Themes>
-	<Slide color="16777215" duration="30000.000000" width="956" height="718" transition="0" transition-speed="0.00" themeid="0" layoutid="0" usethemeobjects="1">
-		<Background>
-			<g>
-				<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z"/>
-			</g>
-		</Background>
-		<Element type="shape" id="1000" layoutid="1" phid="1" phtype="subtitle" left="12" top="25" width="500" height="164" angle="0">
-			<Interactive/>
-			<Animations/>
-			<g>
-				<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z "/>
-			</g>
-		</Element>
-		<Element type="image" id="1001" layoutid="-1" phid="-1" phtype="" left="64" top="174" width="500" height="164" angle="0">
-			<g>
-				<path style="fill:#ffffff;fill-opacity:1.00;fill-rule:nonzero;stroke:#000000;stroke-width:1px;stroke-opacity:1"  d="M 0,0 L 0,720 L 960,720 L 960,0 Z "/>
-			</g>
-		</Element>
-		<Element type="text" id="1002" layoutid="0" phid="0" phtype="title" left="12" top="25" width="500" height="164" angle="0">
-			<body>
-				<p class="color1 s1_level2" style="padding: 0px;margin-top:0px;margin-bottom:0px;text-align: center;font-family: Arial;margin-left: 0px;">
-					<span style="font-size: 44pt;color: #000000;font-family: Arial;">AVS Karaoke Tools</span>
-				</p>
-			</body>
-		</Element>
-	</Slide>	
-</Presentation>
\ No newline at end of file

ASCPresentationEditor/stdafx.cpp

-// stdafx.cpp : source file that includes just the standard includes
-// AVSOfficeEditor.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"

ASCPresentationEditor/stdafx.h

-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-
-#pragma once
-
-#ifndef STRICT
-#define STRICT
-#endif
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif						
-
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
-#endif
-
-#define _ATL_APARTMENT_THREADED
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-
-#define _CRT_SECURE_NO_WARNINGS
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <atlwin.h>
-#include <atltypes.h>
-#include <atlctl.h>
-#include <atlhost.h>
-#include <atlcoll.h>
-
-using namespace ATL;
-
-#include <gdiplus.h>
-#pragma comment(lib, "gdiplus.lib")
-
-#include <math.h>
-
-#include "../Common/OfficeFileTemplate.h"
-#include "../DesktopEditor/graphics/IRenderer.h"
-#include "../ASCImageStudio3/ASCGraphics/Interfaces/ASCRenderer.h"
-
-#import "../Redist/ASCMediaCore3.dll"		named_guids rename_namespace("MediaCore"), exclude("tagRECT")
-#import "../Redist/ASCImageFile3.dll"		named_guids rename_namespace("ImageFile")
-#import "../Redist/ASCGraphics.dll"			named_guids rename_namespace("ASCGraphics"), raw_interfaces_only, exclude("IASCRenderer")
-#import "../Redist/ASCHTMLRenderer.dll"		named_guids rename_namespace("HTMLRenderer"), raw_interfaces_only, exclude("IASCRenderer")
-
-#import "../Redist/ASCOfficePPTFile.dll"	named_guids rename_namespace("PPTFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
-#import "../Redist/ASCOfficeDocxFile2.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
-#import "../Redist/ASCOfficePDFWriter.dll"	named_guids rename_namespace("PDFFile"),  raw_interfaces_only, exclude("IASCRenderer")
-
-#ifdef USE_ODF_FILE
-#	import "../Redist/ASCOfficeOdfFile.dll"	named_guids raw_interfaces_only rename_namespace("ODFFile"), exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
-#endif
\ No newline at end of file

ASCPresentationEditor/version.h

-#pragma once
-//1
-//0
-//1
-//153
-#define INTVER 1,0,1,153
-#define STRVER "1,0,1,153\0"