From 15a62973b9b89c3e229cc0ab501c45967f91b325 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Apr 2015 11:22:20 -0700 Subject: 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 --- fpdfsdk/src/fsdk_annothandler.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/src/fsdk_annothandler.cpp') diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index 9f208d34e2..bc0f047897 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -668,27 +668,22 @@ void CPDFSDK_BFAnnotHandler::OnLoad(CPDFSDK_Annot* pAnnot) else { CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot; - - if (!pWidget->IsAppearanceValid()) + if (!pWidget->IsAppearanceValid()) pWidget->ResetAppearance(NULL, FALSE); - + int nFieldType = pWidget->GetFieldType(); - if (nFieldType == FIELDTYPE_TEXTFIELD || nFieldType == FIELDTYPE_COMBOBOX) { FX_BOOL bFormated = FALSE; CFX_WideString sValue = pWidget->OnFormat(0, bFormated); - if (bFormated && nFieldType == FIELDTYPE_COMBOBOX) { - pWidget->ResetAppearance(sValue, FALSE); + pWidget->ResetAppearance(sValue.c_str(), FALSE); } } - if (m_pFormFiller) m_pFormFiller->OnLoad(pAnnot); - } } -- cgit v1.2.3