Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(611)

Side by Side Diff: fpdfsdk/src/fpdfformfill.cpp

Issue 834413002: XFA: merge patch from CL 792953005, fix most VC++ warnings (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Pulled latest code. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/include/fsdk_mgr.h ('k') | fpdfsdk/src/fsdk_mgr.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../include/fpdfview.h" 7 #include "../include/fpdfview.h"
8 #include "../include/fpdfformfill.h" 8 #include "../include/fpdfformfill.h"
9 #include "../include/fsdk_define.h" 9 #include "../include/fsdk_define.h"
10 #include "../include/fpdfxfa/fpdfxfa_doc.h" 10 #include "../include/fpdfxfa/fpdfxfa_doc.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 pXFAAnnot = pWidgetIterator->MoveToNext(); 64 pXFAAnnot = pWidgetIterator->MoveToNext();
65 while (pXFAAnnot) { 65 while (pXFAAnnot) {
66 CFX_RectF rcBBox; 66 CFX_RectF rcBBox;
67 pWidgetHandler->GetBBox (pXFAAnnot, rcBBox, 0); 67 pWidgetHandler->GetBBox (pXFAAnnot, rcBBox, 0);
68 CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.l eft + rcBBox.width, rcBBox.top+rcBBox.height); 68 CFX_FloatRect rcWidget(rcBBox.left, rcBBox.top, rcBBox.l eft + rcBBox.width, rcBBox.top+rcBBox.height);
69 rcWidget.left -= 1.0f; 69 rcWidget.left -= 1.0f;
70 rcWidget.right += 1.0f; 70 rcWidget.right += 1.0f;
71 rcWidget.bottom -= 1.0f; 71 rcWidget.bottom -= 1.0f;
72 rcWidget.top += 1.0f; 72 rcWidget.top += 1.0f;
73 73
74 » » » if (rcWidget.Contains(page_x, page_y)) { 74 » » » if (rcWidget.Contains(static_cast<FX_FLOAT>(page_x),
75 » » » » static_cast<FX_FLOAT>(page_y))) {
75 pWidgetIterator->Release(); 76 pWidgetIterator->Release();
76 return FPDF_FORMFIELD_XFA; 77 return FPDF_FORMFIELD_XFA;
77 } 78 }
78 pXFAAnnot = pWidgetIterator->MoveToNext(); 79 pXFAAnnot = pWidgetIterator->MoveToNext();
79 } 80 }
80 81
81 pWidgetIterator->Release(); 82 pWidgetIterator->Release();
82 } 83 }
83 84
84 return -1; 85 return -1;
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 if (bExistCAAction) 730 if (bExistCAAction)
730 { 731 {
731 CPDF_Action action = aa.GetAction(CPDF_AAction:: ClosePage); 732 CPDF_Action action = aa.GetAction(CPDF_AAction:: ClosePage);
732 pActionHandler->DoAction_Page(action, CPDF_AActi on::ClosePage, pSDKDoc); 733 pActionHandler->DoAction_Page(action, CPDF_AActi on::ClosePage, pSDKDoc);
733 } 734 }
734 } 735 }
735 } 736 }
736 } 737 }
737 738
738 739
OLDNEW
« no previous file with comments | « fpdfsdk/include/fsdk_mgr.h ('k') | fpdfsdk/src/fsdk_mgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698