pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix use of DR in forms' (#292) from fix/pdf-merge into release/v9.0.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/292
This commit is contained in:
Oleg Korshul
2025-04-25 09:51:20 +00:00
parent 21f5e09237 8318535aae
commit 36b7400e0e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PdfFile/SrcWriter/Annotation.cpp
View File

@ -932,14 +932,15 @@ namespace PdfWriter
{ {
CAnnotAppearance* pAP = new CAnnotAppearance(m_pXref, this); CAnnotAppearance* pAP = new CAnnotAppearance(m_pXref, this);
Add("AP", pAP); Add("AP", pAP);
CAnnotAppearanceObject* pN = pAP->GetNormal(); CResourcesDict* pResources = new CResourcesDict(m_pXref, true, false);
CAnnotAppearanceObject* pN = pAP->GetNormal(pResources);
CStream* pStream = pN->GetStream(); CStream* pStream = pN->GetStream();
pN->AddBBox(GetRect().fLeft, GetRect().fBottom, GetRect().fRight, GetRect().fTop); pN->AddBBox(GetRect().fLeft, GetRect().fBottom, GetRect().fRight, GetRect().fTop);
pN->AddMatrix(1, 0, 0, 1, -GetRect().fLeft, -GetRect().fBottom); pN->AddMatrix(1, 0, 0, 1, -GetRect().fLeft, -GetRect().fBottom);
CExtGrState* pExtGrState = m_pDocument->GetExtGState(dCA, dCA, m_nSubtype == AnnotHighLight ? blendmode_Multiply : blendmode_Unknown); CExtGrState* pExtGrState = m_pDocument->GetExtGState(dCA, dCA, m_nSubtype == AnnotHighLight ? blendmode_Multiply : blendmode_Unknown);
const char* sExtGrStateName = m_pDocument->GetFieldsResources()->GetExtGrStateName(pExtGrState); const char* sExtGrStateName = pResources->GetExtGrStateName(pExtGrState);
if (sExtGrStateName) if (sExtGrStateName)
{ {
pStream->WriteEscapeName(sExtGrStateName); pStream->WriteEscapeName(sExtGrStateName);
@ -1512,6 +1513,7 @@ namespace PdfWriter
CAnnotAppearanceObject* CWidgetAnnotation::StartAP() CAnnotAppearanceObject* CWidgetAnnotation::StartAP()
{ {
CAnnotAppearanceObject* pNormal = CAnnotation::StartAP(); CAnnotAppearanceObject* pNormal = CAnnotation::StartAP();
m_pResources = dynamic_cast<CResourcesDict*>(pNormal->Get("Resources"));
pNormal->StartDrawText(m_pFont, m_dFontSize, 0, 0, 0, NULL, fabs(m_oRect.fRight - m_oRect.fLeft), fabs(m_oRect.fBottom - m_oRect.fTop)); pNormal->StartDrawText(m_pFont, m_dFontSize, 0, 0, 0, NULL, fabs(m_oRect.fRight - m_oRect.fLeft), fabs(m_oRect.fBottom - m_oRect.fTop));
pNormal->EndText(); pNormal->EndText();
return pNormal; return pNormal;