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

For bug 73947

Browse Source
This commit is contained in:
Svetlana Kulikova
2025-05-16 17:02:02 +03:00
parent 41e0b5fe83
commit 3963f1fcef
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PdfFile/PdfEditor.cpp
View File

@ -2635,8 +2635,10 @@ bool CPdfEditor::DeleteAnnot(int nID, Object* oAnnots)
pObj = pKids->Get(i);
if (pObj == pAnnot)
{
pKids->Remove(i);
pOpt->Remove(i);
pObj = pKids->Remove(i);
delete pObj;
pObj = pOpt->Remove(i);
delete pObj;
--i;
}
else

2
PdfFile/SrcReader/Adaptors.h
View File

@ -68,7 +68,7 @@ public:
m_nCMapDataLength = 0;
m_bDrawFormField = false;
}
~GlobalParamsAdaptor()
virtual ~GlobalParamsAdaptor()
{
RELEASEARRAYOBJECTS(m_bCMapData);
}

5
PdfFile/SrcWriter/Objects.cpp
View File

@ -321,10 +321,7 @@ namespace PdfWriter
for (int nIndex = 0, nCount = m_arrList.size(); nIndex < nCount; nIndex++)
{
CObjectBase* pObjectItem = m_arrList.at(nIndex);
if (object_type_PROXY == pObjectItem->GetType())
pObjectItem = ((CProxyObject*)pObjectItem)->Get();
if (pObjectItem == pTarget)
if (pObjectItem == pTarget || (object_type_PROXY == pObjectItem->GetType() && ((CProxyObject*)pObjectItem)->Get() == pTarget))
{
if (bReplace)
{

4
PdfFile/SrcWriter/Pages.cpp
View File

@ -1547,10 +1547,6 @@ namespace PdfWriter
Add("Contents", m_pContents);
AddContents(pXref);
}
CDictObject* CPage::GetContent() const
{
return (CDictObject*)m_pContents->Remove(0);
}
int CPage::GetRotate()
{
CNumberObject* pRotate = (CNumberObject*)GetRotateItem();

1
PdfFile/SrcWriter/Pages.h
View File

@ -179,7 +179,6 @@ namespace PdfWriter
void SetRotate(int nRotate);
int GetRotate();
void ClearContent(CXref* pXref);
CDictObject* GetContent() const;
CResourcesDict* GetResourcesItem();
private:

2
PdfFile/lib/xpdf/GlobalParams.h
View File

@ -239,7 +239,7 @@ public:
// file.
GlobalParams(const char *cfgFileName);
~GlobalParams();
virtual ~GlobalParams();
void setBaseDir(const char *dir);
void setupBaseFonts(const char *dir);