diff options
Diffstat (limited to 'xfa/src/fxfa/src/app/xfa_ffimageedit.cpp')
-rw-r--r-- | xfa/src/fxfa/src/app/xfa_ffimageedit.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index 1b3967ace0..634175acd9 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -30,7 +30,7 @@ FX_BOOL CXFA_FFImageEdit::LoadWidget() { pNoteDriver->RegisterEventTarget(pWidget, pWidget); m_pOldDelegate = pPictureBox->SetDelegate(this); CXFA_FFField::LoadWidget(); - if (m_pDataAcc->GetImageEditImage() != NULL) { + if (m_pDataAcc->GetImageEditImage()) { return TRUE; } UpdateFWLData(); @@ -127,7 +127,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags, } CFX_WideString wsImage; IFX_FileRead* pFileRead = FX_CreateFileRead(wsFilePath); - if (pFileRead != NULL) { + if (pFileRead) { int32_t nDataSize = pFileRead->GetSize(); if (nDataSize > 0) { CFX_ByteString bsBuf; @@ -137,9 +137,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags, if (!bsBuf.IsEmpty()) { FX_CHAR* pData = XFA_Base64Encode(bsBuf, nDataSize); wsImage = CFX_WideString::FromLocal(pData); - if (pData != NULL) { - FX_Free(pData); - } + FX_Free(pData); } } m_pDataAcc->SetImageEditImage(NULL); |