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/app/xfa_ffwidgetacc.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/app/xfa_ffwidgetacc.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidgetacc.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xfa/fxfa/app/xfa_ffwidgetacc.cpp b/xfa/fxfa/app/xfa_ffwidgetacc.cpp index 5fe591c02a..97adff30ac 100644 --- a/xfa/fxfa/app/xfa_ffwidgetacc.cpp +++ b/xfa/fxfa/app/xfa_ffwidgetacc.cpp @@ -183,7 +183,7 @@ bool CXFA_WidgetAcc::GetName(CFX_WideString& wsName, int32_t iNameType) { } m_pNode->GetSOMExpression(wsName); if (iNameType == 2 && wsName.GetLength() >= 15) { - CFX_WideStringC wsPre = FX_WSTRC(L"xfa[0].form[0]."); + CFX_WideStringC wsPre = L"xfa[0].form[0]."; if (wsPre == CFX_WideStringC(wsName.c_str(), wsPre.GetLength())) { wsName.Delete(0, wsPre.GetLength()); } @@ -1497,7 +1497,7 @@ CXFA_WidgetLayoutData* CXFA_WidgetAcc::GetWidgetLayoutData() { } CFX_RetainPtr<CFGAS_GEFont> CXFA_WidgetAcc::GetFDEFont() { - CFX_WideStringC wsFontName = FX_WSTRC(L"Courier"); + CFX_WideStringC wsFontName = L"Courier"; uint32_t dwFontStyle = 0; if (CXFA_Font font = GetFont()) { if (font.IsBold()) @@ -1541,7 +1541,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { CFX_WideString wsContentType; m_pTextNode->GetAttribute(XFA_ATTRIBUTE_ContentType, wsContentType, false); - if (wsContentType == FX_WSTRC(L"text/html")) { + if (wsContentType == L"text/html") { bRichText = true; } } @@ -1557,7 +1557,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (pChildNode && pChildNode->GetElementType() == XFA_Element::ExData) { CFX_WideString wsContentType; pChildNode->GetAttribute(XFA_ATTRIBUTE_ContentType, wsContentType, false); - if (wsContentType == FX_WSTRC(L"text/html")) { + if (wsContentType == L"text/html") { bRichText = true; } } @@ -1592,7 +1592,7 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { if (pChildNode && pChildNode->GetElementType() == XFA_Element::ExData) { CFX_WideString wsContentType; pChildNode->GetAttribute(XFA_ATTRIBUTE_ContentType, wsContentType, false); - if (wsContentType == FX_WSTRC(L"text/html")) { + if (wsContentType == L"text/html") { bRichText = true; } } @@ -1607,11 +1607,10 @@ CXFA_Node* CXFA_TextProvider::GetTextNode(bool& bRichText) { while (pNode) { CFX_WideStringC wsName; pNode->TryCData(XFA_ATTRIBUTE_Name, wsName); - if (m_eType == XFA_TEXTPROVIDERTYPE_Rollover && - wsName == FX_WSTRC(L"rollover")) { + if (m_eType == XFA_TEXTPROVIDERTYPE_Rollover && wsName == L"rollover") { return pNode; } - if (m_eType == XFA_TEXTPROVIDERTYPE_Down && wsName == FX_WSTRC(L"down")) { + if (m_eType == XFA_TEXTPROVIDERTYPE_Down && wsName == L"down") { return pNode; } pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling); |