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

Side by Side Diff: fpdfsdk/fsdk_baseform.cpp

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 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/fsdk_baseannot.cpp ('k') | fpdfsdk/fxedit/fxet_ap.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 "fpdfsdk/include/fsdk_baseform.h" 7 #include "fpdfsdk/include/fsdk_baseform.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <memory> 10 #include <memory>
(...skipping 1548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1559 FX_DWORD dwFieldFlags = pField->GetFieldFlags(); 1559 FX_DWORD dwFieldFlags = pField->GetFieldFlags();
1560 FX_BOOL bMultiLine = (dwFieldFlags >> 12) & 1; 1560 FX_BOOL bMultiLine = (dwFieldFlags >> 12) & 1;
1561 1561
1562 if (bMultiLine) { 1562 if (bMultiLine) {
1563 pEdit->SetMultiLine(TRUE); 1563 pEdit->SetMultiLine(TRUE);
1564 pEdit->SetAutoReturn(TRUE); 1564 pEdit->SetAutoReturn(TRUE);
1565 } else { 1565 } else {
1566 pEdit->SetAlignmentV(1); 1566 pEdit->SetAlignmentV(1);
1567 } 1567 }
1568 1568
1569 FX_WORD subWord = 0; 1569 uint16_t subWord = 0;
1570 if ((dwFieldFlags >> 13) & 1) { 1570 if ((dwFieldFlags >> 13) & 1) {
1571 subWord = '*'; 1571 subWord = '*';
1572 pEdit->SetPasswordChar(subWord); 1572 pEdit->SetPasswordChar(subWord);
1573 } 1573 }
1574 1574
1575 int nMaxLen = pField->GetMaxLen(); 1575 int nMaxLen = pField->GetMaxLen();
1576 FX_BOOL bCharArray = (dwFieldFlags >> 24) & 1; 1576 FX_BOOL bCharArray = (dwFieldFlags >> 24) & 1;
1577 FX_FLOAT fFontSize = GetFontSize(); 1577 FX_FLOAT fFontSize = GetFontSize();
1578 1578
1579 #ifdef PDF_ENABLE_XFA 1579 #ifdef PDF_ENABLE_XFA
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
2865 break; 2865 break;
2866 } 2866 }
2867 } 2867 }
2868 } 2868 }
2869 2869
2870 CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) { 2870 CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
2871 CFX_FloatRect rcAnnot; 2871 CFX_FloatRect rcAnnot;
2872 pAnnot->GetPDFAnnot()->GetRect(rcAnnot); 2872 pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
2873 return rcAnnot; 2873 return rcAnnot;
2874 } 2874 }
OLDNEW
« no previous file with comments | « fpdfsdk/fsdk_baseannot.cpp ('k') | fpdfsdk/fxedit/fxet_ap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698