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 branch 'develop' into fix/drawing_file_client

Browse Source 
# Conflicts:
#	PdfReader/PdfReader.h
#	PdfReader/Src/RendererOutputDev.cpp
#	PdfReader/old/Graphics.cpp
This commit is contained in:
Kulikova Svetlana
2021-10-04 15:37:09 +03:00
parent d9217329eb 601f615a35
commit e0fd7ff1f0
638 changed files with 171382 additions and 24868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DjVuFile/DjVu.cpp
View File

@ -63,6 +63,11 @@ void CDjVuFile::Close()
m_pImplementation->Close();
}
OfficeDrawingFileType CDjVuFile::GetType()
{
return odftDJVU;
}
std::wstring CDjVuFile::GetTempDirectory()
{
return m_pImplementation ? m_pImplementation->GetTempDirectory() : L"";