diff options
| author | dan sinclair <dsinclair@chromium.org> | 2018-04-16 21:24:57 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-16 21:24:57 +0000 |
| commit | 8b0cf76f00c6e89e8bb7bf4bcf2189b27baac31c (patch) | |
| tree | ec18d4aa800ccd9d32f113f8ec41d89948479ab3 /xfa/fxfa/cxfa_textparser.cpp | |
| parent | 262b496f25be27978abe7d98f20978820ecaeec8 (diff) | |
| download | pdfium-8b0cf76f00c6e89e8bb7bf4bcf2189b27baac31c.tar.xz | |
Merge CFX_XMLElement and CFX_XMLAttributeNode
CFX_XMLElement is the only subclass of CFX_XMLAttributeNode. This CL
merges the two classes together. The {Set|Get}String method has been
renamed to {Set|Get}Attribute to make it clearer what you're retrieving.
Change-Id: I158c961d4d8c5f563d937a3e7a35321a33622562
Reviewed-on: https://pdfium-review.googlesource.com/30710
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textparser.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textparser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp index a957147762..f0a6dd2af1 100644 --- a/xfa/fxfa/cxfa_textparser.cpp +++ b/xfa/fxfa/cxfa_textparser.cpp @@ -284,7 +284,7 @@ std::unique_ptr<CXFA_TextParser::TagProvider> CXFA_TextParser::ParseTagInfo( tagProvider->SetTagName(wsName); tagProvider->m_bTagAvailable = TagValidate(wsName); - WideString wsValue = pXMLElement->GetString(L"style"); + WideString wsValue = pXMLElement->GetAttribute(L"style"); if (!wsValue.IsEmpty()) tagProvider->SetAttribute(L"style", wsValue); } else if (pXMLNode->GetType() == FX_XMLNODE_Text) { @@ -505,13 +505,13 @@ bool CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, bool bRet = false; if (pXMLNode->GetType() == FX_XMLNODE_Element) { CFX_XMLElement* pElement = static_cast<CFX_XMLElement*>(pXMLNode); - WideString wsAttr = pElement->GetString(L"xfa:embed"); + WideString wsAttr = pElement->GetAttribute(L"xfa:embed"); if (wsAttr.IsEmpty()) return false; if (wsAttr[0] == L'#') wsAttr.Delete(0); - WideString ws = pElement->GetString(L"xfa:embedType"); + WideString ws = pElement->GetAttribute(L"xfa:embedType"); if (ws.IsEmpty()) ws = L"som"; else @@ -521,7 +521,7 @@ bool CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, if (!bURI && ws != L"som") return false; - ws = pElement->GetString(L"xfa:embedMode"); + ws = pElement->GetAttribute(L"xfa:embedMode"); if (ws.IsEmpty()) ws = L"formatted"; else |