pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #68010

Browse Source
This commit is contained in:
Elena.Subbotina
2024-05-21 20:47:23 +03:00
parent 28f873be5c
commit f28119e646
7 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Common/OfficeFileFormatChecker2.cpp
View File

@ -326,27 +326,33 @@ bool COfficeFileFormatChecker::isOleObjectFile(POLE::Storage *storage)
if (sz_obj > 4)
Program = ReadStringFromOle(&streamCompObject, sz_obj);
}
if (std::string::npos != Program.find("Excel") || std::string::npos != UserType.find("Excel"))
POLE::Stream streamPackage(storage, L"Package");
if (false == streamPackage.fail())
{
nFileType = AVS_OFFICESTUDIO_FILE_OTHER_PACKAGE_IN_OLE;
}
else if (std::string::npos != Program.find("Excel") || std::string::npos != UserType.find("Excel"))
{
if (isXlsFormatFile(storage))
{
nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLS;
}
}
if (std::string::npos != Program.find("Word") || std::string::npos != UserType.find("Word"))
else if (std::string::npos != Program.find("Word") || std::string::npos != UserType.find("Word"))
{
if (isDocFormatFile(storage))
{
//nFileType inside
}
}
if (std::string::npos != Program.find("PowerPoint") || std::string::npos != UserType.find("PowerPoint"))
else if (std::string::npos != Program.find("PowerPoint") || std::string::npos != UserType.find("PowerPoint"))
{
if (isPptFormatFile(storage))
{
nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_PPT;
}
}
return true;
}
else