Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Unified Diff: fpdfsdk/src/fsdk_annothandler.cpp

Issue 1101933003: Reduce usage of operator LPCWSTR from CFX_WideString(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Restore operator. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « fpdfsdk/src/fpdfdoc.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/src/fsdk_annothandler.cpp
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index 9f208d34e25fdd3644b596f4b385bc9673cd6fc6..bc0f047897b8a5488d7ef58e87baf356199da3ab 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);
-
}
}
« no previous file with comments | « fpdfsdk/src/fpdfdoc.cpp ('k') | fpdfsdk/src/fsdk_baseform.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698