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

Fix delete IRT annots

Browse Source
This commit is contained in:
Svetlana Kulikova
2023-10-16 15:32:15 +03:00
parent d215e4d654
commit 311175cae2
6 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
PdfFile/PdfFile.cpp
View File

@ -909,7 +909,6 @@ bool CPdfFile::EditAnnot(int nPageIndex, int nID)
RELEASEOBJECT(pXref);
return false;
}
bool CPdfFile::DeleteAnnot(int nID)
{
// Проверка режима редактирования
@ -938,18 +937,33 @@ bool CPdfFile::DeleteAnnot(int nID)
}
pageRefObj.free(); pageObj.free();
Object oAnnotRef, oAnnot, oPopupRef;
bool bRes = false;
for (int i = 0; i < oAnnots.arrayGetLength(); ++i)
{
Object oAnnotRef, oAnnot;
if (oAnnots.arrayGetNF(i, &oAnnotRef)->isRef() && oAnnotRef.getRefNum() == nID)
break;
oAnnotRef.free();
{
bRes = m_pInternal->pWriter->m_pDocument->DeleteAnnot(oAnnotRef.getRefNum(), oAnnotRef.getRefGen());
if (oAnnotRef.fetch(xref, &oAnnot)->isDict())
{
Object oPopupRef;
if (oAnnot.dictLookupNF("Popup", &oPopupRef)->isRef())
m_pInternal->pWriter->m_pDocument->DeleteAnnot(oPopupRef.getRefNum(), oPopupRef.getRefGen());
oPopupRef.free();
}
}
else if (oAnnots.arrayGet(i, &oAnnot)->isDict())
{
Object oIRTRef;
if (oAnnot.dictLookupNF("IRT", &oIRTRef)->isRef() && oIRTRef.getRefNum() == nID)
DeleteAnnot(oAnnotRef.getRefNum());
oIRTRef.free();
}
oAnnotRef.free(); oAnnot.free();
}
oAnnots.free();
if (oAnnotRef.isRef() && oAnnotRef.fetch(xref, &oAnnot)->isDict() && oAnnot.dictLookupNF("Popup", &oPopupRef)->isRef())
m_pInternal->pWriter->m_pDocument->DeleteAnnot(oPopupRef.getRefNum());
return m_pInternal->pWriter->m_pDocument->DeleteAnnot(nID);
return bRes;
}
#endif // BUILDING_WASM_MODULE