Fix non-xfa build on xfa branch.

fpdfsdk/src/javascript/app.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 "app.h"
 
 #include "Document.h"
 #include "JS_Context.h"
@@ skipping 181 matching lines @@
   }
 
   return FALSE;
 }
 
 FX_BOOL app::viewerVersion(IJS_Context* cc,
                            CJS_PropValue& vp,
                            CFX_WideString& sError) {
   if (!vp.IsGetting())
     return FALSE;
-
 #ifdef PDF_ENABLE_XFA
   CJS_Context* pContext = (CJS_Context*)cc;
   CPDFSDK_Document* pCurDoc = pContext->GetReaderDocument();
   CPDFXFA_Document* pDoc = pCurDoc->GetXFADocument();
   if (pDoc->GetDocType() == 1 || pDoc->GetDocType() == 2) {
     vp << JS_NUM_VIEWERVERSION_XFA;
     return TRUE;
   }
 #endif  // PDF_ENABLE_XFA
-
   vp << JS_NUM_VIEWERVERSION;
   return TRUE;
 }
 
 FX_BOOL app::platform(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   if (!vp.IsGetting())
     return FALSE;
+#ifdef PDF_ENABLE_XFA
   CPDFDoc_Environment* pEnv =
       static_cast<CJS_Context*>(cc)->GetJSRuntime()->GetReaderApp();
   if (!pEnv)
     return FALSE;
   CFX_WideString platfrom = pEnv->FFI_GetPlatform();
-  if (platfrom.IsEmpty())
-    vp << JS_STR_PLATFORM;
-  else
+  if (!platfrom.IsEmpty()) {
     vp << platfrom;
+    return TRUE;
+  }
+#endif
+  vp << JS_STR_PLATFORM;
   return TRUE;
 }
 
 FX_BOOL app::language(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
   if (!vp.IsGetting())
     return FALSE;
+#ifdef PDF_ENABLE_XFA
   CPDFDoc_Environment* pEnv =
       static_cast<CJS_Context*>(cc)->GetJSRuntime()->GetReaderApp();
   if (!pEnv)
     return FALSE;
   CFX_WideString language = pEnv->FFI_GetLanguage();
-  if (language.IsEmpty())
-    vp << JS_STR_LANGUANGE;
-  else
+  if (!language.IsEmpty()) {
     vp << language;
-
+    return TRUE;
+  }
+#endif
+  vp << JS_STR_LANGUANGE;
   return TRUE;
 }
 
 // creates a new fdf object that contains no data
 // comment: need reader support
 // note:
 // CFDF_Document * CPDFDoc_Environment::NewFDF();
 FX_BOOL app::newFDF(IJS_Context* cc,
                     const std::vector<CJS_Value>& params,
                     CJS_Value& vRet,
@@ skipping 568 matching lines @@
 FX_BOOL app::media(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL app::execDialog(IJS_Context* cc,
                         const std::vector<CJS_Value>& params,
                         CJS_Value& vRet,
                         CFX_WideString& sError) {
   return TRUE;
 }