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

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

Issue 1542373002: Fix a bad virtual keyword removal from commit 0f6b51c. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 4 years, 12 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
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 "fpdfsdk/include/formfiller/FFL_FormFiller.h" 7 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
8 #include "fpdfsdk/include/fsdk_actionhandler.h" 8 #include "fpdfsdk/include/fsdk_actionhandler.h"
9 #include "fpdfsdk/include/fsdk_baseannot.h" 9 #include "fpdfsdk/include/fsdk_baseannot.h"
10 #include "fpdfsdk/include/fsdk_baseform.h" 10 #include "fpdfsdk/include/fsdk_baseform.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 pImageDict->SetAtString("Name", "ImgC"); 487 pImageDict->SetAtString("Name", "ImgC");
488 } 488 }
489 } 489 }
490 490
491 CPDF_IconFit iconFit = pControl->GetIconFit(); 491 CPDF_IconFit iconFit = pControl->GetIconFit();
492 492
493 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); 493 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
494 CPDFDoc_Environment* pEnv = pDoc->GetEnv(); 494 CPDFDoc_Environment* pEnv = pDoc->GetEnv();
495 495
496 CBA_FontMap FontMap(this, pEnv->GetSysHandler()); 496 CBA_FontMap FontMap(this, pEnv->GetSysHandler());
497 FontMap.Initial(); 497 FontMap.Initialize();
498 498
499 FontMap.SetAPType("N"); 499 FontMap.SetAPType("N");
500 500
501 CFX_ByteString csAP = 501 CFX_ByteString csAP =
502 CPWL_Utils::GetRectFillAppStream(rcWindow, crBackground) + 502 CPWL_Utils::GetRectFillAppStream(rcWindow, crBackground) +
503 CPWL_Utils::GetBorderAppStream(rcWindow, fBorderWidth, crBorder, 503 CPWL_Utils::GetBorderAppStream(rcWindow, fBorderWidth, crBorder,
504 crLeftTop, crRightBottom, nBorderStyle, 504 crLeftTop, crRightBottom, nBorderStyle,
505 dsBorder) + 505 dsBorder) +
506 CPWL_Utils::GetPushButtonAppStream( 506 CPWL_Utils::GetPushButtonAppStream(
507 iconFit.GetFittingBounds() ? rcWindow : rcClient, &FontMap, 507 iconFit.GetFittingBounds() ? rcWindow : rcClient, &FontMap,
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 CPDF_Rect rcButton = rcClient; 868 CPDF_Rect rcButton = rcClient;
869 rcButton.left = rcButton.right - 13; 869 rcButton.left = rcButton.right - 13;
870 rcButton.Normalize(); 870 rcButton.Normalize();
871 871
872 if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) { 872 if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
873 pEdit->EnableRefresh(FALSE); 873 pEdit->EnableRefresh(FALSE);
874 874
875 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); 875 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
876 CPDFDoc_Environment* pEnv = pDoc->GetEnv(); 876 CPDFDoc_Environment* pEnv = pDoc->GetEnv();
877 CBA_FontMap FontMap(this, pEnv->GetSysHandler()); 877 CBA_FontMap FontMap(this, pEnv->GetSysHandler());
878 FontMap.Initial(); 878 FontMap.Initialize();
879 pEdit->SetFontMap(&FontMap); 879 pEdit->SetFontMap(&FontMap);
880 880
881 CPDF_Rect rcEdit = rcClient; 881 CPDF_Rect rcEdit = rcClient;
882 rcEdit.right = rcButton.left; 882 rcEdit.right = rcButton.left;
883 rcEdit.Normalize(); 883 rcEdit.Normalize();
884 884
885 pEdit->SetPlateRect(rcEdit); 885 pEdit->SetPlateRect(rcEdit);
886 pEdit->SetAlignmentV(1); 886 pEdit->SetAlignmentV(1);
887 887
888 FX_FLOAT fFontSize = GetFontSize(); 888 FX_FLOAT fFontSize = GetFontSize();
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 CPDF_Rect rcClient = GetClientRect(); 940 CPDF_Rect rcClient = GetClientRect();
941 CFX_ByteTextBuf sBody, sLines; 941 CFX_ByteTextBuf sBody, sLines;
942 942
943 if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) { 943 if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
944 pEdit->EnableRefresh(FALSE); 944 pEdit->EnableRefresh(FALSE);
945 945
946 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); 946 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
947 CPDFDoc_Environment* pEnv = pDoc->GetEnv(); 947 CPDFDoc_Environment* pEnv = pDoc->GetEnv();
948 948
949 CBA_FontMap FontMap(this, pEnv->GetSysHandler()); 949 CBA_FontMap FontMap(this, pEnv->GetSysHandler());
950 FontMap.Initial(); 950 FontMap.Initialize();
951 pEdit->SetFontMap(&FontMap); 951 pEdit->SetFontMap(&FontMap);
952 952
953 pEdit->SetPlateRect(CPDF_Rect(rcClient.left, 0.0f, rcClient.right, 0.0f)); 953 pEdit->SetPlateRect(CPDF_Rect(rcClient.left, 0.0f, rcClient.right, 0.0f));
954 954
955 FX_FLOAT fFontSize = GetFontSize(); 955 FX_FLOAT fFontSize = GetFontSize();
956 956
957 if (IsFloatZero(fFontSize)) 957 if (IsFloatZero(fFontSize))
958 pEdit->SetFontSize(12.0f); 958 pEdit->SetFontSize(12.0f);
959 else 959 else
960 pEdit->SetFontSize(fFontSize); 960 pEdit->SetFontSize(fFontSize);
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 CPDF_FormField* pField = pControl->GetField(); 1028 CPDF_FormField* pField = pControl->GetField();
1029 CFX_ByteTextBuf sBody, sLines; 1029 CFX_ByteTextBuf sBody, sLines;
1030 1030
1031 if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) { 1031 if (IFX_Edit* pEdit = IFX_Edit::NewEdit()) {
1032 pEdit->EnableRefresh(FALSE); 1032 pEdit->EnableRefresh(FALSE);
1033 1033
1034 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); 1034 CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
1035 CPDFDoc_Environment* pEnv = pDoc->GetEnv(); 1035 CPDFDoc_Environment* pEnv = pDoc->GetEnv();
1036 1036
1037 CBA_FontMap FontMap(this, pEnv->GetSysHandler()); 1037 CBA_FontMap FontMap(this, pEnv->GetSysHandler());
1038 FontMap.Initial(); 1038 FontMap.Initialize();
1039 pEdit->SetFontMap(&FontMap); 1039 pEdit->SetFontMap(&FontMap);
1040 1040
1041 CPDF_Rect rcClient = GetClientRect(); 1041 CPDF_Rect rcClient = GetClientRect();
1042 pEdit->SetPlateRect(rcClient); 1042 pEdit->SetPlateRect(rcClient);
1043 pEdit->SetAlignmentH(pControl->GetControlAlignment()); 1043 pEdit->SetAlignmentH(pControl->GetControlAlignment());
1044 1044
1045 FX_DWORD dwFieldFlags = pField->GetFieldFlags(); 1045 FX_DWORD dwFieldFlags = pField->GetFieldFlags();
1046 FX_BOOL bMultiLine = (dwFieldFlags >> 12) & 1; 1046 FX_BOOL bMultiLine = (dwFieldFlags >> 12) & 1;
1047 1047
1048 if (bMultiLine) { 1048 if (bMultiLine) {
(...skipping 1307 matching lines...) Expand 10 before | Expand all | Expand 10 after
2356 break; 2356 break;
2357 } 2357 }
2358 } 2358 }
2359 } 2359 }
2360 2360
2361 CPDF_Rect CBA_AnnotIterator::GetAnnotRect(CPDFSDK_Annot* pAnnot) { 2361 CPDF_Rect CBA_AnnotIterator::GetAnnotRect(CPDFSDK_Annot* pAnnot) {
2362 CPDF_Rect rcAnnot; 2362 CPDF_Rect rcAnnot;
2363 pAnnot->GetPDFAnnot()->GetRect(rcAnnot); 2363 pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
2364 return rcAnnot; 2364 return rcAnnot;
2365 } 2365 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698