diff options
| author | dan sinclair <dsinclair@chromium.org> | 2017-02-02 14:05:30 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-02 22:43:09 +0000 |
| commit | 65c7c234d026101f69754f97f40e73eb29a3ef16 (patch) | |
| tree | 166644acf64477c792b01f46de965ba07f64eea3 /xfa/fxfa/parser/cxfa_widgetdata.cpp | |
| parent | 44b297bb2c948ee4fb1e67301f31e4e7f70e48d7 (diff) | |
| download | pdfium-65c7c234d026101f69754f97f40e73eb29a3ef16.tar.xz | |
Remove FX_WSTRC usagechromium/3003chromium/3002
Not needed with modern compilers, removed.
Change-Id: Ia8977262b5791bd4445f02be8456641d1a7e18f3
Reviewed-on: https://pdfium-review.googlesource.com/2431
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index e77fa55d50..6dc3fa6561 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -462,7 +462,7 @@ bool CXFA_WidgetData::GetButtonRollover(CFX_WideString& wsRollover, while (pText) { CFX_WideStringC wsName; pText->TryCData(XFA_ATTRIBUTE_Name, wsName); - if (wsName == FX_WSTRC(L"rollover")) { + if (wsName == L"rollover") { pText->TryContent(wsRollover); bRichText = pText->GetElementType() == XFA_Element::ExData; return !wsRollover.IsEmpty(); @@ -479,7 +479,7 @@ bool CXFA_WidgetData::GetButtonDown(CFX_WideString& wsDown, bool& bRichText) { while (pText) { CFX_WideStringC wsName; pText->TryCData(XFA_ATTRIBUTE_Name, wsName); - if (wsName == FX_WSTRC(L"down")) { + if (wsName == L"down") { pText->TryContent(wsDown); bRichText = pText->GetElementType() == XFA_Element::ExData; return !wsDown.IsEmpty(); @@ -1010,9 +1010,8 @@ void CXFA_WidgetData::SetSelectedItems(CFX_ArrayTemplate<int32_t>& iSelArray, GetChoiceListItems(wsSaveTextArray, true); CFX_WideString wsItemValue; for (int32_t i = 0; i < iSize; i++) { - wsItemValue = (iSize == 1) - ? wsSaveTextArray[iSelArray[i]] - : wsSaveTextArray[iSelArray[i]] + FX_WSTRC(L"\n"); + wsItemValue = (iSize == 1) ? wsSaveTextArray[iSelArray[i]] + : wsSaveTextArray[iSelArray[i]] + L"\n"; wsValue += wsItemValue; } } @@ -1522,7 +1521,7 @@ bool CXFA_WidgetData::SetValue(const CFX_WideString& wsValue, } } else { if (eType == XFA_Element::NumericEdit) { - if (wsNewText != FX_WSTRC(L"0")) { + if (wsNewText != L"0") { int32_t iLeadDigits = 0; int32_t iFracDigits = 0; GetLeadDigits(iLeadDigits); @@ -1572,7 +1571,7 @@ bool CXFA_WidgetData::GetPictureContent(CFX_WideString& wsPicture, wsDataPicture); pLocale->GetTimePattern(FX_LOCALEDATETIMESUBCATEGORY_Medium, wsTimePicture); - wsPicture = wsDataPicture + FX_WSTRC(L"T") + wsTimePicture; + wsPicture = wsDataPicture + L"T" + wsTimePicture; break; case XFA_VT_DECIMAL: case XFA_VT_FLOAT: @@ -1640,7 +1639,7 @@ IFX_Locale* CXFA_WidgetData::GetLocal() { CFX_WideString wsLocaleName; if (!m_pNode->GetLocaleName(wsLocaleName)) return nullptr; - if (wsLocaleName == FX_WSTRC(L"ambient")) + if (wsLocaleName == L"ambient") return m_pNode->GetDocument()->GetLocalMgr()->GetDefLocale(); return m_pNode->GetDocument()->GetLocalMgr()->GetLocaleByName(wsLocaleName); } |