| Index: xfa/fxfa/parser/cxfa_occur.cpp
|
| diff --git a/xfa/fxfa/parser/cxfa_occur.cpp b/xfa/fxfa/parser/cxfa_occur.cpp
|
| index 6d105abec6c375064eea759eec1157dddbd4369e..a8994223f9356bb2903ccf848c2c8d0231e99600 100644
|
| --- a/xfa/fxfa/parser/cxfa_occur.cpp
|
| +++ b/xfa/fxfa/parser/cxfa_occur.cpp
|
| @@ -13,7 +13,7 @@ CXFA_Occur::CXFA_Occur(CXFA_Node* pNode) : CXFA_Data(pNode) {}
|
| int32_t CXFA_Occur::GetMax() {
|
| int32_t iMax = 1;
|
| if (m_pNode) {
|
| - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Max, iMax, TRUE))
|
| + if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Max, iMax, true))
|
| iMax = GetMin();
|
| }
|
| return iMax;
|
| @@ -22,46 +22,46 @@ int32_t CXFA_Occur::GetMax() {
|
| int32_t CXFA_Occur::GetMin() {
|
| int32_t iMin = 1;
|
| if (m_pNode) {
|
| - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, TRUE) || iMin < 0)
|
| + if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, true) || iMin < 0)
|
| iMin = 1;
|
| }
|
| return iMin;
|
| }
|
|
|
| -FX_BOOL CXFA_Occur::GetOccurInfo(int32_t& iMin, int32_t& iMax, int32_t& iInit) {
|
| +bool CXFA_Occur::GetOccurInfo(int32_t& iMin, int32_t& iMax, int32_t& iInit) {
|
| if (!m_pNode)
|
| - return FALSE;
|
| - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, FALSE) || iMin < 0)
|
| + return false;
|
| + if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Min, iMin, false) || iMin < 0)
|
| iMin = 1;
|
| - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Max, iMax, FALSE)) {
|
| + if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Max, iMax, false)) {
|
| if (iMin == 0)
|
| iMax = 1;
|
| else
|
| iMax = iMin;
|
| }
|
| - if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Initial, iInit, FALSE) ||
|
| + if (!m_pNode->TryInteger(XFA_ATTRIBUTE_Initial, iInit, false) ||
|
| iInit < iMin) {
|
| iInit = iMin;
|
| }
|
| - return TRUE;
|
| + return true;
|
| }
|
|
|
| void CXFA_Occur::SetMax(int32_t iMax) {
|
| iMax = (iMax != -1 && iMax < 1) ? 1 : iMax;
|
| - m_pNode->SetInteger(XFA_ATTRIBUTE_Max, iMax, FALSE);
|
| + m_pNode->SetInteger(XFA_ATTRIBUTE_Max, iMax, false);
|
| int32_t iMin = GetMin();
|
| if (iMax != -1 && iMax < iMin) {
|
| iMin = iMax;
|
| - m_pNode->SetInteger(XFA_ATTRIBUTE_Min, iMin, FALSE);
|
| + m_pNode->SetInteger(XFA_ATTRIBUTE_Min, iMin, false);
|
| }
|
| }
|
|
|
| void CXFA_Occur::SetMin(int32_t iMin) {
|
| iMin = (iMin < 0) ? 1 : iMin;
|
| - m_pNode->SetInteger(XFA_ATTRIBUTE_Min, iMin, FALSE);
|
| + m_pNode->SetInteger(XFA_ATTRIBUTE_Min, iMin, false);
|
| int32_t iMax = GetMax();
|
| if (iMax > 0 && iMax < iMin) {
|
| iMax = iMin;
|
| - m_pNode->SetInteger(XFA_ATTRIBUTE_Max, iMax, FALSE);
|
| + m_pNode->SetInteger(XFA_ATTRIBUTE_Max, iMax, false);
|
| }
|
| }
|
|
|