Inflict PPDF_ENABLE_XFA ifdefs on XFA core/

core/src/fpdfdoc/doc_form.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 const int nMaxRecursion = 32;
@@ skipping 353 matching lines @@
                                     LPCSTR pcsFontName,
                                     LOGFONTA& lf) {
   memset(&lf, 0, sizeof(LOGFONTA));
   lf.lfCharSet = charSet;
   lf.lfPitchAndFamily = pitchAndFamily;
   if (pcsFontName != NULL) {
     strcpy(lf.lfFaceName, pcsFontName);
   }
   return RetrieveSpecificFont(lf);
 }
+#ifdef PDF_ENABLE_XFA
 static FX_BOOL RetrieveStockFont(int iFontObject,
                                  uint8_t charSet,
                                  LOGFONTA& lf) {
   HFONT hFont = (HFONT)::GetStockObject(iFontObject);
   if (hFont != NULL) {
     memset(&lf, 0, sizeof(LOGFONTA));
     int iRet = ::GetObject(hFont, sizeof(LOGFONTA), &lf);
     if (iRet > 0 && (lf.lfCharSet == charSet || charSet == 255)) {
       return RetrieveSpecificFont(lf);
     }
   }
   return FALSE;
 }
 #endif
+#endif

[Lei Zhang, 2015/11/24 23:38:10]

These 2 needs to be labeled.

[Tom Sepez, 2015/11/25 18:51:45]

I will label all in next CL.

[Tom Sepez, 2015/11/25 21:01:39]

Am I blind?  I see no matching ifdef!

[Lei Zhang, 2015/11/25 21:20:21]

#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ on line 333, thus the need for
#endif  // FOO

 
 CPDF_Font* CPDF_InterForm::AddStandardFont(CPDF_Document* pDocument,
                                            CFX_ByteString csFontName) {
   if (!pDocument || csFontName.IsEmpty())
     return nullptr;
 
   if (csFontName == "ZapfDingbats")
     return pDocument->AddStandardFont(csFontName.c_str(), nullptr);
 
   CPDF_FontEncoding encoding(PDFFONT_ENCODING_WINANSI);
@@ skipping 872 matching lines @@
     FDF_ImportField(pField, L"", bNotify);
   }
   if (bNotify && m_pFormNotify != NULL) {
     m_pFormNotify->AfterFormImportData(this);
   }
   return TRUE;
 }
 void CPDF_InterForm::SetFormNotify(const CPDF_FormNotify* pNotify) {
   m_pFormNotify = (CPDF_FormNotify*)pNotify;
 }