summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/javascript/JS_Value.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-27 11:22:20 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-27 11:22:20 -0700
commit15a62973b9b89c3e229cc0ab501c45967f91b325 (patch)
treed95505963de5d8640fb85067639b6fdaf159d1b6 /fpdfsdk/src/javascript/JS_Value.cpp
parentef25d9995e494bd596ffea8fb8c09c2e48daa9a0 (diff)
downloadpdfium-15a62973b9b89c3e229cc0ab501c45967f91b325.tar.xz
Kill operator LPCWSTR from CFX_WideString().
This involves adding some explicit c_str() calls. Doing so flagged PDF_EncodeText() and FindOptionValue() as having suboptimal signatures, in that we are often throwing away a perfectly fine length and recomputing it. R=brucedawson@chromium.org Review URL: https://codereview.chromium.org/1101933003
Diffstat (limited to 'fpdfsdk/src/javascript/JS_Value.cpp')
-rw-r--r--fpdfsdk/src/javascript/JS_Value.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp
index be374895e4..1b36f314ca 100644
--- a/fpdfsdk/src/javascript/JS_Value.cpp
+++ b/fpdfsdk/src/javascript/JS_Value.cpp
@@ -216,7 +216,7 @@ void CJS_Value::SetNull()
void CJS_Value::operator = (FX_LPCSTR pStr)
{
- operator = (CFX_WideString::FromLocal(pStr));
+ operator = (CFX_WideString::FromLocal(pStr).c_str());
}
void CJS_Value::operator = (CJS_Array & array)
@@ -433,7 +433,7 @@ void CJS_PropValue::operator >>(CFX_WideString &wide_string) const
void CJS_PropValue::operator <<(CFX_WideString wide_string)
{
ASSERT(!m_bIsSetting);
- CJS_Value::operator = (wide_string);
+ CJS_Value::operator = (wide_string.c_str());
}
void CJS_PropValue::operator >>(CJS_Array &array) const