summaryrefslogtreecommitdiff
path: root/xfa/src/fxfa
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-25 16:35:42 -0800
committerLei Zhang <thestig@chromium.org>2016-01-25 16:35:42 -0800
commit05e67415684adc36af228ca2f1e0efc30a40d242 (patch)
treef1b18021923a3e79aecf5fac7144df3552b06db0 /xfa/src/fxfa
parent52bb44383a705b600e0d028bff5ade17856f5a60 (diff)
downloadpdfium-05e67415684adc36af228ca2f1e0efc30a40d242.tar.xz
And a few other nits. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1635853002 .
Diffstat (limited to 'xfa/src/fxfa')
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp2
-rw-r--r--xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp2
-rw-r--r--xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp1
-rw-r--r--xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp2
4 files changed, 3 insertions, 4 deletions
diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
index bf2aa0ccbe..fc4688e34a 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
+++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp
@@ -2472,8 +2472,8 @@ void CXFA_FM2JSContext::Num2AllTime(FXJSE_HOBJECT hThis,
if (!iRet) {
strTime = "";
}
- return;
}
+
void CXFA_FM2JSContext::GetLocalTimeZone(int32_t& iHour,
int32_t& iMin,
int32_t& iSec) {
diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
index ab3ceacf84..9ce6dd318b 100644
--- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
+++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp
@@ -167,8 +167,8 @@ void CXFA_FMIdentifierExpressionn::ToJavaScript(CFX_WideTextBuf& javascript) {
tempStr = EXCLAMATION_IN_IDENTIFIER + tempStr.Mid(1);
}
javascript << tempStr;
- return;
}
+
CXFA_FMUnaryExpression::CXFA_FMUnaryExpression(FX_DWORD line,
XFA_FM_TOKEN op,
CXFA_FMSimpleExpression* pExp)
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
index 3b991065ad..08596cb090 100644
--- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp
@@ -360,7 +360,6 @@ void CXFA_ItemLayoutProcessor::SplitLayoutItem(
void CXFA_ItemLayoutProcessor::SplitLayoutItem(FX_FLOAT fSplitPos) {
ASSERT(m_pLayoutItem);
SplitLayoutItem(m_pLayoutItem, NULL, fSplitPos);
- return;
}
IXFA_LayoutPage* CXFA_LayoutItem::GetPage() const {
diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
index 9645a9d2c2..962844ea1e 100644
--- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp
@@ -715,8 +715,8 @@ void CXFA_ResolveProcessor::XFA_ResolveNode_DoPredicateFilter(
}
FXJSE_Value_Release(pRetValue);
}
- return;
}
+
void CXFA_ResolveProcessor::XFA_ResolveNode_FilterCondition(
CXFA_ResolveNodesData& rnd,
CFX_WideString wsCondition) {