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

Password NULL and empty

Browse Source
This commit is contained in:
Svetlana Kulikova
2026-01-19 17:14:26 +03:00
parent 0f85422315
commit bb4ceb14e5
20 changed files with 125 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
XpsFile/XpsFile.cpp
View File

@ -104,7 +104,7 @@ void CXpsFile::SetTempDirectory(const std::wstring& wsPath)
m_pInternal->m_wsTempFolder = new CFolderSystem(wsTempFolder);
}
bool CXpsFile::LoadFromFile(const std::wstring& wsSrcFileName, const std::wstring& wsXmlOptions,
const std::wstring& owner_password, const std::wstring& user_password)
const wchar_t* owner_password, const wchar_t* user_password)
{
Close();
@ -122,7 +122,7 @@ bool CXpsFile::LoadFromFile(const std::wstring& wsSrcFileName, const std::wstrin
return true;
}
bool CXpsFile::LoadFromMemory(BYTE* data, DWORD length, const std::wstring& options,
const std::wstring& owner_password, const std::wstring& user_password)
const wchar_t* owner_password, const wchar_t* user_password)
{
Close();

4
XpsFile/XpsFile.h
View File

@ -50,9 +50,9 @@ public:
virtual ~CXpsFile();
virtual bool LoadFromFile(const std::wstring& file, const std::wstring& options = L"",
const std::wstring& owner_password = L"", const std::wstring& user_password = L"");
const wchar_t* owner_password = NULL, const wchar_t* user_password = NULL);
virtual bool LoadFromMemory(BYTE* data, DWORD length, const std::wstring& options = L"",
const std::wstring& owner_password = L"", const std::wstring& user_password = L"");
const wchar_t* owner_password = NULL, const wchar_t* user_password = NULL);
virtual void Close();
virtual NSFonts::IApplicationFonts* GetFonts();