| Index: xfa/fxfa/app/xfa_ffimageedit.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp
|
| index ce69b1242b7bec89760269ed1af92ab877b3ee03..d419fbd37d0035df087f2cdb778978a661ade4db 100644
|
| --- a/xfa/fxfa/app/xfa_ffimageedit.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp
|
| @@ -108,7 +108,8 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags,
|
| CFX_WideString wsFilter;
|
| pAppProvider->LoadString(XFA_IDS_ImageFilter, wsFilter);
|
| CFX_WideStringArray wsPathArray;
|
| - pAppProvider->ShowFileDialog(wsTitle, wsFilter, wsPathArray);
|
| + pAppProvider->ShowFileDialog(wsTitle.AsWideStringC(),
|
| + wsFilter.AsWideStringC(), wsPathArray);
|
| int32_t iSize = wsPathArray.GetSize();
|
| if (iSize < 1) {
|
| return TRUE;
|
| @@ -147,7 +148,8 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(uint32_t dwFlags,
|
| m_pDataAcc->SetImageEditImage(NULL);
|
| pFileRead->Release();
|
| }
|
| - m_pDataAcc->SetImageEdit(wsContentType, CFX_WideStringC(), wsImage);
|
| + m_pDataAcc->SetImageEdit(wsContentType.AsWideStringC(), CFX_WideStringC(),
|
| + wsImage.AsWideStringC());
|
| m_pDataAcc->LoadImageEditImage();
|
| AddInvalidateRect();
|
| m_pDocView->SetChangeMark();
|
|
|