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

Side by Side Diff: xfa/fxfa/app/xfa_ffimageedit.cpp

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: String argument type Created 4 years, 8 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
« no previous file with comments | « xfa/fxfa/app/xfa_fffield.cpp ('k') | xfa/fxfa/app/xfa_ffpageview.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "xfa/fxfa/app/xfa_ffimageedit.h" 7 #include "xfa/fxfa/app/xfa_ffimageedit.h"
8 8
9 #include "xfa/fwl/core/cfwl_message.h" 9 #include "xfa/fwl/core/cfwl_message.h"
10 #include "xfa/fwl/core/ifwl_app.h" 10 #include "xfa/fwl/core/ifwl_app.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 FWLToClient(ms.m_fx, ms.m_fy); 101 FWLToClient(ms.m_fx, ms.m_fy);
102 TranslateFWLMessage(&ms); 102 TranslateFWLMessage(&ms);
103 IXFA_AppProvider* pAppProvider = GetAppProvider(); 103 IXFA_AppProvider* pAppProvider = GetAppProvider();
104 if (!pAppProvider) { 104 if (!pAppProvider) {
105 return TRUE; 105 return TRUE;
106 } 106 }
107 CFX_WideString wsTitle; 107 CFX_WideString wsTitle;
108 CFX_WideString wsFilter; 108 CFX_WideString wsFilter;
109 pAppProvider->LoadString(XFA_IDS_ImageFilter, wsFilter); 109 pAppProvider->LoadString(XFA_IDS_ImageFilter, wsFilter);
110 CFX_WideStringArray wsPathArray; 110 CFX_WideStringArray wsPathArray;
111 pAppProvider->ShowFileDialog(wsTitle, wsFilter, wsPathArray); 111 pAppProvider->ShowFileDialog(wsTitle.AsWideStringC(),
112 wsFilter.AsWideStringC(), wsPathArray);
112 int32_t iSize = wsPathArray.GetSize(); 113 int32_t iSize = wsPathArray.GetSize();
113 if (iSize < 1) { 114 if (iSize < 1) {
114 return TRUE; 115 return TRUE;
115 } 116 }
116 CFX_WideString wsFilePath = wsPathArray[0]; 117 CFX_WideString wsFilePath = wsPathArray[0];
117 FX_STRSIZE nLen = wsFilePath.GetLength(); 118 FX_STRSIZE nLen = wsFilePath.GetLength();
118 FX_STRSIZE nIndex = nLen - 1; 119 FX_STRSIZE nIndex = nLen - 1;
119 while (nIndex > 0 && wsFilePath[nIndex] != '.') { 120 while (nIndex > 0 && wsFilePath[nIndex] != '.') {
120 nIndex--; 121 nIndex--;
121 } 122 }
(...skipping 18 matching lines...) Expand all
140 bsBuf.ReleaseBuffer(); 141 bsBuf.ReleaseBuffer();
141 if (!bsBuf.IsEmpty()) { 142 if (!bsBuf.IsEmpty()) {
142 FX_CHAR* pData = XFA_Base64Encode(bsBuf, nDataSize); 143 FX_CHAR* pData = XFA_Base64Encode(bsBuf, nDataSize);
143 wsImage = CFX_WideString::FromLocal(pData); 144 wsImage = CFX_WideString::FromLocal(pData);
144 FX_Free(pData); 145 FX_Free(pData);
145 } 146 }
146 } 147 }
147 m_pDataAcc->SetImageEditImage(NULL); 148 m_pDataAcc->SetImageEditImage(NULL);
148 pFileRead->Release(); 149 pFileRead->Release();
149 } 150 }
150 m_pDataAcc->SetImageEdit(wsContentType, CFX_WideStringC(), wsImage); 151 m_pDataAcc->SetImageEdit(wsContentType.AsWideStringC(), CFX_WideStringC(),
152 wsImage.AsWideStringC());
151 m_pDataAcc->LoadImageEditImage(); 153 m_pDataAcc->LoadImageEditImage();
152 AddInvalidateRect(); 154 AddInvalidateRect();
153 m_pDocView->SetChangeMark(); 155 m_pDocView->SetChangeMark();
154 return TRUE; 156 return TRUE;
155 } 157 }
156 void CXFA_FFImageEdit::SetFWLRect() { 158 void CXFA_FFImageEdit::SetFWLRect() {
157 if (!m_pNormalWidget) { 159 if (!m_pNormalWidget) {
158 return; 160 return;
159 } 161 }
160 CFX_RectF rtUIMargin; 162 CFX_RectF rtUIMargin;
(...skipping 15 matching lines...) Expand all
176 return m_pOldDelegate->OnProcessMessage(pMessage); 178 return m_pOldDelegate->OnProcessMessage(pMessage);
177 } 179 }
178 FWL_ERR CXFA_FFImageEdit::OnProcessEvent(CFWL_Event* pEvent) { 180 FWL_ERR CXFA_FFImageEdit::OnProcessEvent(CFWL_Event* pEvent) {
179 CXFA_FFField::OnProcessEvent(pEvent); 181 CXFA_FFField::OnProcessEvent(pEvent);
180 return m_pOldDelegate->OnProcessEvent(pEvent); 182 return m_pOldDelegate->OnProcessEvent(pEvent);
181 } 183 }
182 FWL_ERR CXFA_FFImageEdit::OnDrawWidget(CFX_Graphics* pGraphics, 184 FWL_ERR CXFA_FFImageEdit::OnDrawWidget(CFX_Graphics* pGraphics,
183 const CFX_Matrix* pMatrix) { 185 const CFX_Matrix* pMatrix) {
184 return m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix); 186 return m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
185 } 187 }
OLDNEW
« no previous file with comments | « xfa/fxfa/app/xfa_fffield.cpp ('k') | xfa/fxfa/app/xfa_ffpageview.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698