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

Merge remote-tracking branch 'origin/develop' into feature/pdfForms

Browse Source 
# Conflicts:
#	DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp
This commit is contained in:
Kulikova Svetlana
2023-02-07 11:31:09 +03:00
parent f8b9847e28 000f64267f
commit 2c73c6044f
217 changed files with 5770 additions and 4152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PdfFile/PdfFile.cpp
View File

@ -789,6 +789,7 @@ void CPdfFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pB
{
if (!m_pInternal->pReader)
return;
pRenderer->CommandLong(c_nPenWidth0As1px, 1);
m_pInternal->pReader->DrawPageOnRenderer(pRenderer, nPageIndex, pBreak);
}
std::wstring CPdfFile::GetInfo()