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

Merge remote-tracking branch 'origin/hotfix/v7.3.3' into develop

Browse Source
This commit is contained in:
Elena.Subbotina
2023-03-07 11:14:48 +03:00
parent 8206a74694 03a276fd88
commit 0a0a7baaf7
1070 changed files with 1370 additions and 299053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MsBinaryFile/PptFile/Reader/PPTFileReader.cpp
View File

@ -171,14 +171,21 @@ XLS::CFStreamPtr CPPTFileReader::GetStreamByName(const std::wstring & name)
if (m_bDualStorage) stream_name = std::wstring(PP97_DUALSTORAGE) + std::wstring(L"/");
POLE::Stream *pStream = new POLE::Stream(m_pStorage, stream_name + name);
if (pStream->fail())
try
{
POLE::Stream *pStream = new POLE::Stream(m_pStorage, stream_name + name);
if (pStream->fail())
{
RELEASEOBJECT(pStream);
return XLS::CFStreamPtr();
}
return XLS::CFStreamPtr(new XLS::CFStream(pStream));
}
catch (...)
{
RELEASEOBJECT(pStream);
return XLS::CFStreamPtr();
}
return XLS::CFStreamPtr( new XLS::CFStream(pStream));
}
XLS::CFStreamPtr CPPTFileReader::GetEncryptedSummaryStream()
{