pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 02:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

x2t - fix return codes

Browse Source
This commit is contained in:
ElenaSubbotina
2018-09-24 15:37:34 +03:00
committed by Alexey Golubev
parent dd40e3e53c
commit 3e5fed8482
28 changed files with 542 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Common/OfficeFileFormatChecker2.cpp
View File

@ -34,9 +34,9 @@
#include "../DesktopEditor/common/File.h"
#include "../OfficeUtils/src/OfficeUtils.h"
#if defined FILE_FORMAT_CHECKER_WITH_MACRO
#include "../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
#endif
//#if defined FILE_FORMAT_CHECKER_WITH_MACRO
// #include "../ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h"
//#endif
#include "3dParty/pole/pole.h"
#include <algorithm>
@ -362,17 +362,17 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & _fileName)
}
else if ( isPptFormatFile(&storage) )
{
#if defined FILE_FORMAT_CHECKER_WITH_MACRO
COfficePPTFile pptFile;
bMacroEnabled = true;
long nResult = pptFile.OpenFile(fileName, L"", bMacroEnabled);
if (nResult != S_OK)
{
return false;
}
pptFile.CloseFile();
#endif
//#if defined FILE_FORMAT_CHECKER_WITH_MACRO
// COfficePPTFile pptFile;
//
// bMacroEnabled = true;
// long nResult = pptFile.OpenFile(fileName, L"", bMacroEnabled);
// if (nResult != S_OK)
// {
// return false;
// }
// pptFile.CloseFile();
//#endif
nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT;
return true;
}