pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

error odp->pptx

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53922 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2014-01-27 13:33:13 +00:00
committed by Alexander Trofimov
parent 472e734b80
commit a1e0ed7c4a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ASCPresentationEditor/ASCPresentationEditor.h
View File

@ -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;

2
ASCPresentationEditor/PPTStorage.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "ShareMemArray.h"
#include "../Common/ShareMemArray.h"
namespace NSPresentationEditor
{

2
ASCPresentationEditor/stdafx.h
View File

@ -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