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

Side by Side Diff: fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp

Issue 1801383002: Re-enable several MSVC warnings (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: 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
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_CBA_Fontmap.h" 7 #include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
8 8
9 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" 9 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
10 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" 10 #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 198
199 CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString& sAlias) { 199 CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString& sAlias) {
200 CPDF_Dictionary* pAcroFormDict = NULL; 200 CPDF_Dictionary* pAcroFormDict = NULL;
201 const bool bWidget = (m_pAnnotDict->GetStringBy("Subtype") == "Widget"); 201 const bool bWidget = (m_pAnnotDict->GetStringBy("Subtype") == "Widget");
202 if (bWidget) { 202 if (bWidget) {
203 if (CPDF_Dictionary* pRootDict = m_pDocument->GetRoot()) 203 if (CPDF_Dictionary* pRootDict = m_pDocument->GetRoot())
204 pAcroFormDict = pRootDict->GetDictBy("AcroForm"); 204 pAcroFormDict = pRootDict->GetDictBy("AcroForm");
205 } 205 }
206 206
207 CFX_ByteString sDA; 207 CFX_ByteString sDA;
208 CPDF_Object* pObj; 208 CPDF_Object* pObj = FPDF_GetFieldAttr(m_pAnnotDict, "DA");
209 if ((pObj = FPDF_GetFieldAttr(m_pAnnotDict, "DA"))) 209 if (pObj)
210 sDA = pObj->GetString(); 210 sDA = pObj->GetString();
211 211
212 if (bWidget) { 212 if (bWidget) {
213 if (sDA.IsEmpty()) { 213 if (sDA.IsEmpty()) {
214 pObj = FPDF_GetFieldAttr(pAcroFormDict, "DA"); 214 pObj = FPDF_GetFieldAttr(pAcroFormDict, "DA");
215 sDA = pObj ? pObj->GetString() : CFX_ByteString(); 215 sDA = pObj ? pObj->GetString() : CFX_ByteString();
216 } 216 }
217 } 217 }
218 218
219 CPDF_Dictionary* pFontDict = NULL; 219 CPDF_Dictionary* pFontDict = NULL;
(...skipping 30 matching lines...) Expand all
250 250
251 return pFontDict ? m_pDocument->LoadFont(pFontDict) : nullptr; 251 return pFontDict ? m_pDocument->LoadFont(pFontDict) : nullptr;
252 } 252 }
253 253
254 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) { 254 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) {
255 m_sAPType = sAPType; 255 m_sAPType = sAPType;
256 256
257 Reset(); 257 Reset();
258 Initialize(); 258 Initialize();
259 } 259 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698