From 4cc9acb6ca21590b68044d189d276985883373e4 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 6 Mar 2015 12:37:13 -0800 Subject: Merge to XFA: Make conversions for CPDF_Link explicit. Original Review URL: https://codereview.chromium.org/985503005 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/985153002 --- fpdfsdk/src/fpdfdoc.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index e89a7aa294..1cd7c8be3b 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -180,18 +180,17 @@ DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page, double x, do pLinkList = FX_NEW CPDF_LinkList(pDoc); pDoc->SetPrivateData(&THISMODULE, pLinkList, ReleaseLinkList); } - return pLinkList->GetLinkAtPoint(pPage, (FX_FLOAT)x, (FX_FLOAT)y); + return pLinkList->GetLinkAtPoint(pPage, (FX_FLOAT)x, (FX_FLOAT)y).GetDict(); } DLLEXPORT FPDF_DEST STDCALL FPDFLink_GetDest(FPDF_DOCUMENT document, FPDF_LINK pDict) { if (!document) return NULL; - CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc(); if (!pDict) return NULL; - CPDF_Link link = (CPDF_Dictionary*)pDict; - + CPDF_Document* pDoc = ((CPDFXFA_Document*)document)->GetPDFDoc(); + CPDF_Link link((CPDF_Dictionary*)pDict); FPDF_DEST dest = link.GetDest(pDoc).GetObject(); if (dest) return dest; @@ -206,7 +205,7 @@ DLLEXPORT FPDF_ACTION STDCALL FPDFLink_GetAction(FPDF_LINK pDict) { if (!pDict) return NULL; - CPDF_Link link = (CPDF_Dictionary*)pDict; + CPDF_Link link((CPDF_Dictionary*)pDict); return link.GetAction().GetDict(); } -- cgit v1.2.3