| Index: xfa/fxfa/parser/xfa_localemgr.cpp
|
| diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
|
| index 0982537b15712f13c2ee4fa44e6114b386f72e5d..83c7cf025da66c44507590877d9668bbd79c515e 100644
|
| --- a/xfa/fxfa/parser/xfa_localemgr.cpp
|
| +++ b/xfa/fxfa/parser/xfa_localemgr.cpp
|
| @@ -1123,9 +1123,8 @@ static uint16_t XFA_GetLanguage(CFX_WideString wsLanguage) {
|
| CXFA_LocaleMgr::CXFA_LocaleMgr(CXFA_Node* pLocaleSet, CFX_WideString wsDeflcid)
|
| : m_dwLocaleFlags(0x00) {
|
| m_dwDeflcid = XFA_GetLanguage(wsDeflcid);
|
| - CXFA_Node* pNodeLocale = NULL;
|
| - if (pLocaleSet &&
|
| - (pNodeLocale = pLocaleSet->GetNodeItem(XFA_NODEITEM_FirstChild))) {
|
| + if (pLocaleSet) {
|
| + CXFA_Node* pNodeLocale = pLocaleSet->GetNodeItem(XFA_NODEITEM_FirstChild);
|
| while (pNodeLocale) {
|
| m_LocaleArray.Add(new CXFA_NodeLocale(pNodeLocale));
|
| pNodeLocale = pNodeLocale->GetNodeItem(XFA_NODEITEM_NextSibling);
|
|
|