Index: xfa/fxfa/parser/xfa_locale.cpp |
diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp |
index bebb3ba6c592b6e35a34b8587be01f58a44136d5..18cb0687d403d0af2a6fae46303ba50e7e799379 100644 |
--- a/xfa/fxfa/parser/xfa_locale.cpp |
+++ b/xfa/fxfa/parser/xfa_locale.cpp |
@@ -138,9 +138,9 @@ CFX_WideString CXFA_XMLLocale::GetCalendarSymbol(const CFX_ByteStringC& symbol, |
void CXFA_XMLLocale::GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType, |
CFX_WideString& wsPattern) const { |
CXML_Element* pElement = m_pLocaleData->GetElement("", "datePatterns"); |
- if (pElement == NULL) { |
+ if (!pElement) |
return; |
- } |
+ |
CFX_WideString wsName; |
switch (eType) { |
case FX_LOCALEDATETIMESUBCATEGORY_Short: |
@@ -162,9 +162,9 @@ void CXFA_XMLLocale::GetDatePattern(FX_LOCALEDATETIMESUBCATEGORY eType, |
void CXFA_XMLLocale::GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType, |
CFX_WideString& wsPattern) const { |
CXML_Element* pElement = m_pLocaleData->GetElement("", "timePatterns"); |
- if (pElement == NULL) { |
+ if (!pElement) |
return; |
- } |
+ |
CFX_WideString wsName; |
switch (eType) { |
case FX_LOCALEDATETIMESUBCATEGORY_Short: |
@@ -186,9 +186,9 @@ void CXFA_XMLLocale::GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY eType, |
void CXFA_XMLLocale::GetNumPattern(FX_LOCALENUMSUBCATEGORY eType, |
CFX_WideString& wsPattern) const { |
CXML_Element* pElement = m_pLocaleData->GetElement("", "numberPatterns"); |
- if (pElement == NULL) { |
+ if (!pElement) |
return; |
- } |
+ |
switch (eType) { |
case FX_LOCALENUMPATTERN_Percent: |
wsPattern = g_FX_Percent; |
@@ -257,7 +257,7 @@ void CXFA_NodeLocale::GetNumbericSymbol(FX_LOCALENUMSYMBOL eType, |
} |
void CXFA_NodeLocale::GetDateTimeSymbols(CFX_WideString& wsDtSymbol) const { |
CXFA_Node* pSymbols = |
- m_pLocale ? m_pLocale->GetChild(0, XFA_ELEMENT_DateTimeSymbols) : NULL; |
+ m_pLocale ? m_pLocale->GetChild(0, XFA_ELEMENT_DateTimeSymbols) : nullptr; |
wsDtSymbol = pSymbols ? pSymbols->GetContent() : CFX_WideString(); |
} |
void CXFA_NodeLocale::GetMonthName(int32_t nMonth, |
@@ -337,7 +337,7 @@ void CXFA_NodeLocale::GetNumPattern(FX_LOCALENUMSUBCATEGORY eType, |
CXFA_Node* CXFA_NodeLocale::GetNodeByName(CXFA_Node* pParent, |
const CFX_WideStringC& wsName) const { |
CXFA_Node* pChild = |
- pParent ? pParent->GetNodeItem(XFA_NODEITEM_FirstChild) : NULL; |
+ pParent ? pParent->GetNodeItem(XFA_NODEITEM_FirstChild) : nullptr; |
while (pChild) { |
CFX_WideString wsChild; |
if (pChild->GetAttribute(XFA_ATTRIBUTE_Name, wsChild)) { |
@@ -347,12 +347,12 @@ CXFA_Node* CXFA_NodeLocale::GetNodeByName(CXFA_Node* pParent, |
} |
pChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling); |
} |
- return NULL; |
+ return nullptr; |
} |
CFX_WideString CXFA_NodeLocale::GetSymbol( |
XFA_ELEMENT eElement, |
const CFX_WideStringC& symbol_type) const { |
- CXFA_Node* pSymbols = m_pLocale ? m_pLocale->GetChild(0, eElement) : NULL; |
+ CXFA_Node* pSymbols = m_pLocale ? m_pLocale->GetChild(0, eElement) : nullptr; |
CXFA_Node* pSymbol = GetNodeByName(pSymbols, symbol_type); |
return pSymbol ? pSymbol->GetContent() : CFX_WideString(); |
} |
@@ -360,7 +360,7 @@ CFX_WideString CXFA_NodeLocale::GetCalendarSymbol(XFA_ELEMENT eElement, |
int index, |
FX_BOOL bAbbr) const { |
CXFA_Node* pCalendar = |
- m_pLocale ? m_pLocale->GetChild(0, XFA_ELEMENT_CalendarSymbols) : NULL; |
+ m_pLocale ? m_pLocale->GetChild(0, XFA_ELEMENT_CalendarSymbols) : nullptr; |
if (pCalendar) { |
CXFA_Node* pNode = pCalendar->GetFirstChildByClass(eElement); |
for (; pNode; pNode = pNode->GetNextSameClassSibling(eElement)) { |