| Index: xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| index c44084894189b07c9bef4ae9eb63ead9b0f18632..a59b65e058549b6b7e15767ea9946c39491b4b67 100644
|
| --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp
|
| @@ -35,7 +35,7 @@ static void XFA_FFDeleteCalcData(void* pData) {
|
| }
|
|
|
| static XFA_MAPDATABLOCKCALLBACKINFO gs_XFADeleteCalcData = {
|
| - XFA_FFDeleteCalcData, NULL};
|
| + XFA_FFDeleteCalcData, nullptr};
|
|
|
| class CXFA_WidgetLayoutData {
|
| public:
|
| @@ -134,7 +134,7 @@ class CXFA_TextEditData : public CXFA_FieldLayoutData {
|
| class CXFA_ImageEditData : public CXFA_FieldLayoutData {
|
| public:
|
| CXFA_ImageEditData()
|
| - : m_pDIBitmap(NULL),
|
| + : m_pDIBitmap(nullptr),
|
| m_bNamedImage(FALSE),
|
| m_iImageXDpi(0),
|
| m_iImageYDpi(0) {}
|
| @@ -220,7 +220,7 @@ void CXFA_WidgetAcc::ResetData() {
|
| if (!pAcc) {
|
| continue;
|
| }
|
| - CXFA_Value defValue(NULL);
|
| + CXFA_Value defValue(nullptr);
|
| if (wsValue.IsEmpty() && (defValue = pAcc->GetDefaultValue())) {
|
| defValue.GetChildValueContent(wsValue);
|
| SetValue(wsValue, XFA_VALUEPICTURE_Raw);
|
| @@ -280,7 +280,7 @@ void CXFA_WidgetAcc::SetImageEdit(const CFX_WideString& wsContentType,
|
| CXFA_WidgetAcc* CXFA_WidgetAcc::GetExclGroup() {
|
| CXFA_Node* pExcl = m_pNode->GetNodeItem(XFA_NODEITEM_Parent);
|
| if (!pExcl || pExcl->GetClassID() != XFA_ELEMENT_ExclGroup) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return (CXFA_WidgetAcc*)pExcl->GetWidgetData();
|
| }
|
| @@ -698,7 +698,7 @@ int32_t CXFA_WidgetAcc::ExecuteScript(CXFA_Script script,
|
| if (pRetValue)
|
| *pRetValue = pTmpRetValue.release();
|
|
|
| - pContext->SetNodesOfRunScript(NULL);
|
| + pContext->SetNodesOfRunScript(nullptr);
|
| return iRet;
|
| }
|
| CXFA_FFWidget* CXFA_WidgetAcc::GetNextWidget(CXFA_FFWidget* pWidget) {
|
| @@ -711,7 +711,7 @@ CXFA_FFWidget* CXFA_WidgetAcc::GetNextWidget(CXFA_FFWidget* pWidget) {
|
| return static_cast<CXFA_FFWidget*>(pLayout);
|
| }
|
| void CXFA_WidgetAcc::UpdateUIDisplay(CXFA_FFWidget* pExcept) {
|
| - CXFA_FFWidget* pWidget = NULL;
|
| + CXFA_FFWidget* pWidget = nullptr;
|
| while ((pWidget = GetNextWidget(pWidget)) != nullptr) {
|
| if (pWidget == pExcept || !pWidget->IsLoaded() ||
|
| (GetUIType() != XFA_ELEMENT_CheckButton && pWidget->IsFocused())) {
|
| @@ -1474,19 +1474,19 @@ CXFA_TextLayout* CXFA_WidgetAcc::GetTextLayout() {
|
| return m_pLayoutData
|
| ? static_cast<CXFA_TextLayoutData*>(m_pLayoutData.get())
|
| ->GetTextLayout()
|
| - : NULL;
|
| + : nullptr;
|
| }
|
| CFX_DIBitmap* CXFA_WidgetAcc::GetImageImage() {
|
| return m_pLayoutData
|
| ? static_cast<CXFA_ImageLayoutData*>(m_pLayoutData.get())
|
| ->m_pDIBitmap
|
| - : NULL;
|
| + : nullptr;
|
| }
|
| CFX_DIBitmap* CXFA_WidgetAcc::GetImageEditImage() {
|
| return m_pLayoutData
|
| ? static_cast<CXFA_ImageEditData*>(m_pLayoutData.get())
|
| ->m_pDIBitmap
|
| - : NULL;
|
| + : nullptr;
|
| }
|
|
|
| void CXFA_WidgetAcc::SetImageImage(CFX_DIBitmap* newImage) {
|
| @@ -1573,7 +1573,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(FX_BOOL& bRichText) {
|
| CXFA_Node* pElementNode = m_pWidgetAcc->GetNode();
|
| CXFA_Node* pValueNode = pElementNode->GetChild(0, XFA_ELEMENT_Value);
|
| if (!pValueNode) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| CXFA_Node* pChildNode = pValueNode->GetNodeItem(XFA_NODEITEM_FirstChild);
|
| if (pChildNode && pChildNode->GetClassID() == XFA_ELEMENT_ExData) {
|
| @@ -1603,13 +1603,13 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(FX_BOOL& bRichText) {
|
| } else if (m_eType == XFA_TEXTPROVIDERTYPE_Caption) {
|
| CXFA_Node* pCaptionNode =
|
| m_pWidgetAcc->GetNode()->GetChild(0, XFA_ELEMENT_Caption);
|
| - if (pCaptionNode == NULL) {
|
| - return NULL;
|
| - }
|
| + if (!pCaptionNode)
|
| + return nullptr;
|
| +
|
| CXFA_Node* pValueNode = pCaptionNode->GetChild(0, XFA_ELEMENT_Value);
|
| - if (pValueNode == NULL) {
|
| - return NULL;
|
| - }
|
| + if (!pValueNode)
|
| + return nullptr;
|
| +
|
| CXFA_Node* pChildNode = pValueNode->GetNodeItem(XFA_NODEITEM_FirstChild);
|
| if (pChildNode && pChildNode->GetClassID() == XFA_ELEMENT_ExData) {
|
| CFX_WideString wsContentType;
|
| @@ -1622,9 +1622,9 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(FX_BOOL& bRichText) {
|
| }
|
| CXFA_Node* pItemNode =
|
| m_pWidgetAcc->GetNode()->GetChild(0, XFA_ELEMENT_Items);
|
| - if (pItemNode == NULL) {
|
| - return NULL;
|
| - }
|
| + if (!pItemNode)
|
| + return nullptr;
|
| +
|
| CXFA_Node* pNode = pItemNode->GetNodeItem(XFA_NODEITEM_FirstChild);
|
| while (pNode) {
|
| CFX_WideStringC wsName;
|
| @@ -1638,7 +1638,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(FX_BOOL& bRichText) {
|
| }
|
| pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling);
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| CXFA_Para CXFA_TextProvider::GetParaNode() {
|
| if (m_eType == XFA_TEXTPROVIDERTYPE_Text) {
|
| @@ -1677,8 +1677,8 @@ FX_BOOL CXFA_TextProvider::GetEmbbedObj(FX_BOOL bURI,
|
| CXFA_Node* pWidgetNode = m_pWidgetAcc->GetNode();
|
| CXFA_Node* pParent = pWidgetNode->GetNodeItem(XFA_NODEITEM_Parent);
|
| CXFA_Document* pDocument = pWidgetNode->GetDocument();
|
| - CXFA_Node* pIDNode = NULL;
|
| - CXFA_WidgetAcc* pEmbAcc = NULL;
|
| + CXFA_Node* pIDNode = nullptr;
|
| + CXFA_WidgetAcc* pEmbAcc = nullptr;
|
| if (pParent) {
|
| pIDNode = pDocument->GetNodeByID(pParent, wsAttr.AsStringC());
|
| }
|
|
|