diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-02 20:42:18 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-02 20:42:18 +0000 |
| commit | 8bafef176a2a810373a386373fa3f558ae427984 (patch) | |
| tree | 594d42b3497583933e16b72ff161b3ffad4d96f6 /xfa/fxfa/cxfa_textlayout.cpp | |
| parent | 453d786b16e431ee9e8174de8b0c62358d81a8a0 (diff) | |
| download | pdfium-8bafef176a2a810373a386373fa3f558ae427984.tar.xz | |
Roll {Set|Get}ScriptContent into {Set|Get}Content
The SetContent method was a proxy to SetScriptContent. The GetContent
added a default param value. The methods have been merged and the
GetContent call sites updated to pass in the needed value.
Change-Id: I61f950bef8beec7157bdb22e0a25904729f9e00a
Reviewed-on: https://pdfium-review.googlesource.com/17613
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_textlayout.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_textlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index 5d4d262999..84b183f76b 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -241,7 +241,7 @@ int32_t CXFA_TextLayout::GetText(WideString& wsText) { GetTextDataNode(); wsText.clear(); if (!m_bRichText) - wsText = m_pTextDataNode->JSNode()->GetContent(); + wsText = m_pTextDataNode->JSNode()->GetContent(false); return wsText.GetLength(); } @@ -676,7 +676,7 @@ void CXFA_TextLayout::LoadText(CXFA_Node* pNode, } } - WideString wsText = pNode->JSNode()->GetContent(); + WideString wsText = pNode->JSNode()->GetContent(false); wsText.TrimRight(L" "); bool bRet = AppendChar(wsText, fLinePos, fSpaceAbove, bSavePieces); if (bRet && m_pLoader) |