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

Add nMaxID

Browse Source
This commit is contained in:
Svetlana Kulikova
2025-04-10 15:50:01 +03:00
parent 3fe4c2ac21
commit 7cd7b03b89
11 changed files with 61 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PdfFile/PdfFile.cpp
View File

@ -135,12 +135,12 @@ bool CPdfFile::AddPage(int nPageIndex)
return false;
return m_pInternal->pEditor->AddPage(nPageIndex);
}
bool CPdfFile::MergePages(const std::wstring& wsPath, const std::wstring& wsPassword, const int* arrPageIndex, unsigned int unLength)
bool CPdfFile::MergePages(const std::wstring& wsPath, int nMaxID, const std::wstring& wsPrefixForm)
{
if (!m_pInternal->pEditor)
return false;
if (m_pInternal->pReader->MergePages(wsPath, wsPassword))
return m_pInternal->pEditor->MergePages(wsPath, arrPageIndex, unLength);
if (m_pInternal->pReader->MergePages(wsPath, L"", nMaxID))
return m_pInternal->pEditor->MergePages(wsPath, wsPrefixForm);
return false;
}
bool CPdfFile::MovePage(int nPageIndex, int nPos)
@ -336,11 +336,11 @@ void CPdfFile::GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, do
else
m_pInternal->pReader->GetPageInfo(nPageIndex, pdWidth, pdHeight, pdDpiX, pdDpiY);
}
bool CPdfFile::MergePages(BYTE* data, DWORD length)
bool CPdfFile::MergePages(BYTE* data, DWORD length, int nMaxID)
{
if (!m_pInternal->pReader)
return false;
return m_pInternal->pReader->MergePages(data, length) && (m_pInternal->pReader->GetError() == 0);
return m_pInternal->pReader->MergePages(data, length, L"", nMaxID) && (m_pInternal->pReader->GetError() == 0);
}
int CPdfFile::GetRotate(int nPageIndex)
{