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

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

Browse Source
This commit is contained in:
Elena.Subbotina
2023-06-28 14:13:02 +03:00
parent 1e6e6032ee 8539dc168b
commit f63eac7883
26 changed files with 242 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OfficeCryptReader/source/ECMACryptFile.cpp
View File

@ -942,9 +942,10 @@ bool ECMACryptFile::EncryptOfficeFile(const std::wstring &file_name_inp, const s
}
}
//-------------------------------------------------------------------
bool result = true;
if (bLargeFile)
{
pStorageNew->Save(file_name_out);
result = pStorageNew->Save(file_name_out);
pStorageNew->Close();
delete pStorageNew;
}
@ -974,7 +975,7 @@ bool ECMACryptFile::EncryptOfficeFile(const std::wstring &file_name_inp, const s
// }
////test back---------------------------------------------------------------------------------test back
return true;
return result;
}
bool ECMACryptFile::DecryptOfficeFile(const std::wstring &file_name_inp, const std::wstring &file_name_out, const std::wstring &password, bool & bDataIntegrity)
{