summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/pdfwindow/PWL_Note.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/pdfwindow/PWL_Note.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/pdfwindow/PWL_Note.cpp')
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Note.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
index 7bc8fad395..33d1b3b009 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
@@ -82,7 +82,7 @@ void CPWL_Note_Options::CreateChildWnd(const PWL_CREATEPARAM & cp)
void CPWL_Note_Options::SetText(const CFX_WideString& sText)
{
- m_pText->SetText(sText);
+ m_pText->SetText(sText.c_str());
}
void CPWL_Note_Options::DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device)
@@ -443,9 +443,9 @@ void CPWL_Note_Contents::SetText(const CFX_WideString& sText)
if (m_pEdit)
{
m_pEdit->EnableNotify(FALSE);
- m_pEdit->SetText(sText);
+ m_pEdit->SetText(sText.c_str());
m_pEdit->EnableNotify(TRUE);
- OnNotify(m_pEdit, PNM_NOTEEDITCHANGED, 0, 0);
+ OnNotify(m_pEdit, PNM_NOTEEDITCHANGED, 0, 0);
}
}
@@ -811,7 +811,7 @@ void CPWL_NoteItem::SetSubjectName(const CFX_WideString& sName)
{
if (m_pSubject)
{
- m_pSubject->SetText(sName);
+ m_pSubject->SetText(sName.c_str());
}
if (IPWL_NoteNotify* pNotify = GetNoteNotify())
@@ -848,11 +848,10 @@ void CPWL_NoteItem::ResetSubjectName(FX_INT32 nItemIndex)
ASSERT(pNote != NULL);
CFX_WideString sSubject;
- sSubject.Format(pNote->GetReplyString(), nItemIndex);
+ sSubject.Format(pNote->GetReplyString().c_str(), nItemIndex);
if (!m_sAuthor.IsEmpty())
{
-
sSubject += L" - ";
sSubject += m_sAuthor;
}
@@ -863,12 +862,12 @@ void CPWL_NoteItem::ResetSubjectName(FX_INT32 nItemIndex)
void CPWL_NoteItem::SetDateTime(FX_SYSTEMTIME time)
{
m_dtNote = time;
-
+
CFX_WideString swTime;
swTime.Format(L"%04d-%02d-%02d %02d:%02d:%02d", time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
if (m_pDateTime)
{
- m_pDateTime->SetText(swTime);
+ m_pDateTime->SetText(swTime.c_str());
}
this->RePosChildWnd();
@@ -1528,14 +1527,14 @@ void CPWL_Note::SetAuthorName(const CFX_WideString& sName)
{
if (m_pAuthor)
{
- m_pAuthor->SetText(sName);
+ m_pAuthor->SetText(sName.c_str());
RePosChildWnd();
}
if (IPWL_NoteNotify* pNotify = GetNoteNotify())
{
pNotify->OnSetAuthorName(this);
- }
+ }
}
CFX_WideString CPWL_Note::GetAuthorName() const