error odp->pptx

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

ASCPresentationEditor/ASCPresentationEditor.h

@@ -79,7 +79,7 @@ protected:
 	LONG m_lFileType;
 	PPTFile::IAVSOfficePPTFile*		m_pPPTFile;
 	PPTXFile::IAVSOfficePPTXFile*	m_pPPTXFile;
-	ODPFile::IAVSOfficeODPFile*		m_pODPFile;
+	//ODPFile::IAVSOfficeODPFile*		m_pODPFile;
 
 	SPPTStatusStorage   m_oSS;
 	
@@ -120,7 +120,7 @@ public:
 		
 		m_pPPTFile	= NULL;
 		m_pPPTXFile = NULL;
-		m_pODPFile	= NULL;
+		//m_pODPFile	= NULL;
 		m_lFileType = AVS_OFFICESTUDIO_FILE_UNKNOWN;
 
 		m_lStatus = NULLMODE;
@@ -268,7 +268,7 @@ public:
 					
 					CString strOptions = _T("<Options><onlyPresentation></onlyPresentation></Options>");
 					BSTR bsOptions = strOptions.AllocSysString();
-					HRESULT hRes = m_pODFFile->LoadFromFile(fileName, bstrTemp, bsOptions);
+					hRes = m_pODFFile->LoadFromFile(fileName, bstrTemp, bsOptions);
 					SysFreeString(bsOptions);
 
 					if (hRes != S_OK)
@@ -382,7 +382,7 @@ public:
 
 		RELEASEINTERFACE(m_pPPTFile);
 		RELEASEINTERFACE(m_pPPTXFile);
-		RELEASEINTERFACE(m_pODPFile);
+		//RELEASEINTERFACE(m_pODPFile);
 
 		m_lFileType = AVS_OFFICESTUDIO_FILE_UNKNOWN;
 		m_lStatus = NULLMODE;

ASCPresentationEditor/PPTStorage.h

 #pragma once
 
-#include "ShareMemArray.h"
+#include "../Common/ShareMemArray.h"
 
 namespace NSPresentationEditor
 {

ASCPresentationEditor/stdafx.h

@@ -63,7 +63,7 @@ using namespace Gdiplus;
 
 #import "../Redist/ASCOfficePPTFile.dll"	named_guids rename_namespace("PPTFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
 #import "../Redist/ASCOfficePPTXFile.dll"	named_guids rename_namespace("PPTXFile"), raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile")
-#import "../Redist/ASCOfficeOdpFile.dll"	named_guids rename_namespace("ODPFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
+//#import "../Redist/ASCOfficeOdpFile.dll"	named_guids rename_namespace("ODPFile"),  raw_interfaces_only, exclude("IAVSOfficeFileTemplate", "_IAVSOfficeFileTemplateEvents", "_IAVSOfficeFileTemplateEvents2", "IAVSOfficeFile") 
 #import "../Redist/ASCOfficePDFWriter.dll"	named_guids rename_namespace("PDFFile"),  raw_interfaces_only, exclude("IASCRenderer")
 
 #define USE_ODF_FILE