summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-02 19:09:58 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-02 19:09:58 +0000
commit3ac07ffafea1ee4d3cf985e32692849dd3fcfdfb (patch)
tree3edbd3db87541a57fa0ee172bd50b70d35d45a11 /xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
parentbf29e5b532e4ef9a309906083b33b6d4c48ff757 (diff)
downloadpdfium-3ac07ffafea1ee4d3cf985e32692849dd3fcfdfb.tar.xz
Cleanup params to CJX_Node::TryCData
This CL removes the bProto param as it was never set and inlines the value where needed in the methods. The default value was removed from bUseDefault and inlined into callsites as needed. Change-Id: I773261d19aa3799bc607e7df482b5f5e5217bee6 Reviewed-on: https://pdfium-review.googlesource.com/17533 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_layoutpagemgr.cpp')
-rw-r--r--xfa/fxfa/parser/cxfa_layoutpagemgr.cpp29
1 files changed, 16 insertions, 13 deletions
diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
index d3a33e7de9..2c1e6e4fd3 100644
--- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp
@@ -66,7 +66,7 @@ class PageSetContainerLayoutItem {
uint32_t GetRelevant(CXFA_Node* pFormItem, uint32_t dwParentRelvant) {
uint32_t dwRelevant = XFA_WidgetStatus_Viewable | XFA_WidgetStatus_Printable;
WideStringView wsRelevant;
- if (pFormItem->JSNode()->TryCData(XFA_ATTRIBUTE_Relevant, wsRelevant)) {
+ if (pFormItem->JSNode()->TryCData(XFA_ATTRIBUTE_Relevant, wsRelevant, true)) {
if (wsRelevant == L"+print" || wsRelevant == L"print")
dwRelevant &= ~XFA_WidgetStatus_Viewable;
else if (wsRelevant == L"-print")
@@ -950,11 +950,11 @@ CXFA_Node* CXFA_LayoutPageMgr::BreakOverflow(CXFA_Node* pOverflowNode,
WideStringView wsOverflowTarget;
WideStringView wsOverflowTrailer;
pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_OverflowLeader,
- wsOverflowLeader);
+ wsOverflowLeader, true);
pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_OverflowTrailer,
- wsOverflowTrailer);
+ wsOverflowTrailer, true);
pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_OverflowTarget,
- wsOverflowTarget);
+ wsOverflowTarget, true);
if (!wsOverflowLeader.IsEmpty() || !wsOverflowTrailer.IsEmpty() ||
!wsOverflowTarget.IsEmpty()) {
if (!wsOverflowTarget.IsEmpty() && bCreatePage &&
@@ -994,9 +994,12 @@ CXFA_Node* CXFA_LayoutPageMgr::BreakOverflow(CXFA_Node* pOverflowNode,
WideStringView wsOverflowLeader;
WideStringView wsOverflowTrailer;
WideStringView wsOverflowTarget;
- pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_Leader, wsOverflowLeader);
- pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_Trailer, wsOverflowTrailer);
- pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_Target, wsOverflowTarget);
+ pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_Leader, wsOverflowLeader,
+ true);
+ pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_Trailer, wsOverflowTrailer,
+ true);
+ pOverflowNode->JSNode()->TryCData(XFA_ATTRIBUTE_Target, wsOverflowTarget,
+ true);
if (!wsOverflowTarget.IsEmpty() && bCreatePage && !m_bCreateOverFlowPage) {
CXFA_Node* pTarget =
ResolveBreakTarget(m_pTemplatePageSetRoot, true, wsOverflowTarget);
@@ -1088,7 +1091,7 @@ bool CXFA_LayoutPageMgr::ResolveBookendLeaderOrTrailer(
if (pBookendNode->GetElementType() == XFA_Element::Break) {
pBookendNode->JSNode()->TryCData(
bLeader ? XFA_ATTRIBUTE_BookendLeader : XFA_ATTRIBUTE_BookendTrailer,
- wsBookendLeader);
+ wsBookendLeader, true);
if (!wsBookendLeader.IsEmpty()) {
pBookendAppendTemplate =
ResolveBreakTarget(pContainer, false, wsBookendLeader);
@@ -1097,8 +1100,8 @@ bool CXFA_LayoutPageMgr::ResolveBookendLeaderOrTrailer(
return false;
} else if (pBookendNode->GetElementType() == XFA_Element::Bookend) {
pBookendNode->JSNode()->TryCData(
- bLeader ? XFA_ATTRIBUTE_Leader : XFA_ATTRIBUTE_Trailer,
- wsBookendLeader);
+ bLeader ? XFA_ATTRIBUTE_Leader : XFA_ATTRIBUTE_Trailer, wsBookendLeader,
+ true);
pBookendAppendTemplate =
ResolveBreakTarget(pContainer, true, wsBookendLeader);
return true;
@@ -1664,11 +1667,11 @@ CXFA_Node* CXFA_LayoutPageMgr::QueryOverflow(CXFA_Node* pFormNode) {
WideStringView wsOverflowTarget;
WideStringView wsOverflowTrailer;
pCurNode->JSNode()->TryCData(XFA_ATTRIBUTE_OverflowLeader,
- wsOverflowLeader);
+ wsOverflowLeader, true);
pCurNode->JSNode()->TryCData(XFA_ATTRIBUTE_OverflowTrailer,
- wsOverflowTrailer);
+ wsOverflowTrailer, true);
pCurNode->JSNode()->TryCData(XFA_ATTRIBUTE_OverflowTarget,
- wsOverflowTarget);
+ wsOverflowTarget, true);
if (!wsOverflowLeader.IsEmpty() || !wsOverflowTrailer.IsEmpty() ||
!wsOverflowTarget.IsEmpty()) {
return pCurNode;