XFA: merge patch from issue 801913002 and 804463003

fpdfsdk/src/fpdfppo.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 "../include/fpdfppo.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 
@@ skipping 32 matching lines @@
         if(!pNewRoot)   return FALSE;
         
         //Set the document information////////////////////////////////////////////
         
         CPDF_Dictionary* DInfoDict = pDestPDFDoc->GetInfo();
         
         if(!DInfoDict)
                 return FALSE;
         
         CFX_ByteString producerstr;
-        
-#ifdef FOXIT_CHROME_BUILD
-        producerstr.Format("Google");
-#else
-         producerstr.Format("Foxit PDF SDK %s - Foxit Corporation", "2.0");
-#endif
+        producerstr.Format("PDFium");
         DInfoDict->SetAt("Producer", new CPDF_String(producerstr));
 
         //Set type////////////////////////////////////////////////////////////////
         CFX_ByteString cbRootType = pNewRoot->GetString("Type","");
         if( cbRootType.Equal("") )
         {
                 pNewRoot->SetAt("Type", new CPDF_Name("Catalog"));
         }
         
         CPDF_Dictionary* pNewPages = (CPDF_Dictionary*)(pNewRoot->GetElement("Pages")? pNewRoot->GetElement("Pages")->GetDirect() : NULL);
@@ skipping 399 matching lines @@
                 return FALSE;
         CPDFXFA_Document* pDstDoc = (CPDFXFA_Document*)dest_doc;
         CPDF_Document* pDstPDFDoc = pDstDoc->GetPDFDoc();
         CPDF_Dictionary* pDstDict = pDstPDFDoc->GetRoot();
         if(!pDstDict)
                 return FALSE;
         pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
         return TRUE;
 }