Remove no-op ShowFileDialog(s).

xfa/fxfa/app/xfa_ffimageedit.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 "xfa/fxfa/app/xfa_ffimageedit.h"
 
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/ifwl_app.h"
@@ skipping 88 matching lines @@
   ms.m_fy = fy;
   ms.m_pDstTarget = m_pNormalWidget->m_pIface;
   FWLToClient(ms.m_fx, ms.m_fy);
   TranslateFWLMessage(&ms);
   IXFA_AppProvider* pAppProvider = GetAppProvider();
   if (!pAppProvider) {
     return TRUE;
   }
   CFX_WideString wsTitle;
   CFX_WideString wsFilter;
   pAppProvider->LoadString(XFA_IDS_ImageFilter, wsFilter);

[dsinclair, 2016/04/26 00:05:40]

This can also be removed I think. I believe LoadString is just filling in
wsFilter which is never used. You should be able to remove up to at least 103.

[Tom Sepez, 2016/04/26 16:13:02]

Done.

-  CFX_WideStringArray wsPathArray;
-  pAppProvider->ShowFileDialog(wsTitle.AsStringC(), wsFilter.AsStringC(),
-                               wsPathArray);
-  int32_t iSize = wsPathArray.GetSize();
-  if (iSize < 1) {
-    return TRUE;

[Tom Sepez, 2016/04/25 22:59:09]

This is always hit .

-  }
-  CFX_WideString wsFilePath = wsPathArray[0];
-  FX_STRSIZE nLen = wsFilePath.GetLength();
-  FX_STRSIZE nIndex = nLen - 1;
-  while (nIndex > 0 && wsFilePath[nIndex] != '.') {
-    nIndex--;
-  }
-  if (nIndex <= 0) {
-    return TRUE;
-  }
-  CFX_WideString wsContentType(L"image/");
-  wsContentType += wsFilePath.Right(nLen - nIndex - 1);
-  wsContentType.MakeLower();
-  FXCODEC_IMAGE_TYPE eImageType = XFA_GetImageType(wsContentType);
-  if (eImageType == FXCODEC_IMAGE_UNKNOWN) {
-    return TRUE;
-  }
-  CFX_WideString wsImage;
-  IFX_FileRead* pFileRead = FX_CreateFileRead(wsFilePath.c_str());
-  if (pFileRead) {
-    int32_t nDataSize = pFileRead->GetSize();
-    if (nDataSize > 0) {
-      CFX_ByteString bsBuf;
-      FX_CHAR* pImageBuffer = bsBuf.GetBuffer(nDataSize);
-      pFileRead->ReadBlock(pImageBuffer, 0, nDataSize);
-      bsBuf.ReleaseBuffer();
-      if (!bsBuf.IsEmpty()) {
-        FX_CHAR* pData = XFA_Base64Encode(bsBuf.raw_str(), nDataSize);
-        wsImage = CFX_WideString::FromLocal(pData);
-        FX_Free(pData);
-      }
-    }
-    m_pDataAcc->SetImageEditImage(NULL);
-    pFileRead->Release();
-  }
-  m_pDataAcc->SetImageEdit(wsContentType.AsStringC(), CFX_WideStringC(),
-                           wsImage.AsStringC());
-  m_pDataAcc->LoadImageEditImage();
-  AddInvalidateRect();
-  m_pDocView->SetChangeMark();
   return TRUE;
 }
 void CXFA_FFImageEdit::SetFWLRect() {
   if (!m_pNormalWidget) {
     return;
   }
   CFX_RectF rtUIMargin;
   m_pDataAcc->GetUIMargin(rtUIMargin);
   CFX_RectF rtImage(m_rtUI);
   rtImage.Deflate(rtUIMargin.left, rtUIMargin.top, rtUIMargin.width,
@@ skipping 12 matching lines @@
   return m_pOldDelegate->OnProcessMessage(pMessage);
 }
 FWL_ERR CXFA_FFImageEdit::OnProcessEvent(CFWL_Event* pEvent) {
   CXFA_FFField::OnProcessEvent(pEvent);
   return m_pOldDelegate->OnProcessEvent(pEvent);
 }
 FWL_ERR CXFA_FFImageEdit::OnDrawWidget(CFX_Graphics* pGraphics,
                                        const CFX_Matrix* pMatrix) {
   return m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
 }