diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-27 15:58:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-27 15:58:25 -0700 |
| commit | a103b1a74a388a285191ba4826ea8e60706df59d (patch) | |
| tree | f41a82f0289915d6e19bff3acaef938a7d80fde6 | |
| parent | 169e0ae9da6e87e89417ff9f3e4f637979f4c986 (diff) | |
| download | pdfium-a103b1a74a388a285191ba4826ea8e60706df59d.tar.xz | |
Fix more FX_BOOL / int noise in fxfa/parser.
Review-Url: https://codereview.chromium.org/2460723002
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_locale.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index ce07faf60f..f237ad0a00 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -235,7 +235,7 @@ FX_BOOL GetAttributeDefaultValue_Boolean(XFA_Element eElement, void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, XFA_ATTRIBUTETYPE_Boolean, dwPacket)) { - return (FX_BOOL)(uintptr_t)pValue; + return !!pValue; } return FALSE; } diff --git a/xfa/fxfa/parser/xfa_locale.cpp b/xfa/fxfa/parser/xfa_locale.cpp index 19511bebce..5e8c7a208c 100644 --- a/xfa/fxfa/parser/xfa_locale.cpp +++ b/xfa/fxfa/parser/xfa_locale.cpp @@ -122,10 +122,10 @@ CFX_WideString CXFA_XMLLocale::GetCalendarSymbol(const CFX_ByteStringC& symbol, CXML_Element* pSymbolNames = pChild->GetElement("", pstrSymbolNames.AsStringC()); if (pSymbolNames) { - if (pSymbolNames->GetAttrInteger("abbr") != bAbbr) { + if ((!!pSymbolNames->GetAttrInteger("abbr")) != bAbbr) { pSymbolNames = pChild->GetElement("", pstrSymbolNames.AsStringC(), 1); } - if (pSymbolNames && pSymbolNames->GetAttrInteger("abbr") == bAbbr) { + if (pSymbolNames && (!!pSymbolNames->GetAttrInteger("abbr")) == bAbbr) { CXML_Element* pSymbolName = pSymbolNames->GetElement("", symbol, index); if (pSymbolName) { |