| Index: core/fpdfdoc/cpvt_generateap.cpp
|
| diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
|
| index be96d2d1d3bf46bf306f60b0f9d5aa12e81127f1..421b41b1bec6f9c1cca6c7f95efb0cd78a1e46a3 100644
|
| --- a/core/fpdfdoc/cpvt_generateap.cpp
|
| +++ b/core/fpdfdoc/cpvt_generateap.cpp
|
| @@ -245,7 +245,7 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
|
| vt.SetLimitChar(dwMaxLen);
|
|
|
| vt.Initialize();
|
| - vt.SetText(swValue.c_str());
|
| + vt.SetText(swValue);
|
| vt.RearrangeAll();
|
| CFX_FloatRect rcContent = vt.GetContentRect();
|
| CFX_FloatPoint ptOffset(0.0f, 0.0f);
|
| @@ -295,7 +295,7 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
|
| vt.SetFontSize(fFontSize);
|
|
|
| vt.Initialize();
|
| - vt.SetText(swValue.c_str());
|
| + vt.SetText(swValue);
|
| vt.RearrangeAll();
|
| CFX_FloatRect rcContent = vt.GetContentRect();
|
| CFX_FloatPoint ptOffset =
|
| @@ -385,7 +385,7 @@ bool GenerateWidgetAP(CPDF_Document* pDoc,
|
| vt.SetFontSize(IsFloatZero(fFontSize) ? 12.0f : fFontSize);
|
|
|
| vt.Initialize();
|
| - vt.SetText(swItem.c_str());
|
| + vt.SetText(swItem);
|
| vt.RearrangeAll();
|
| FX_FLOAT fItemHeight = vt.GetContentRect().Height();
|
| if (bSelected) {
|
| @@ -527,7 +527,7 @@ CFX_ByteString GetPopupContentsString(CPDF_Document* pDoc,
|
| vt.SetMultiLine(TRUE);
|
|
|
| vt.Initialize();
|
| - vt.SetText(swValue.c_str());
|
| + vt.SetText(swValue);
|
| vt.RearrangeAll();
|
| CFX_FloatPoint ptOffset(3.0f, -3.0f);
|
| CFX_ByteString sContent = CPVT_GenerateAP::GenerateEditAP(
|
|
|