summaryrefslogtreecommitdiff
path: root/fpdfsdk/fsdk_baseform.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-07-13 11:26:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-07-13 11:26:20 -0700
commite35af1e3c93e5e1f374799da115eb4b99820831c (patch)
tree1adebcd0961e7e331ff6d4172401296676967970 /fpdfsdk/fsdk_baseform.cpp
parenta2919b31197737d35e4e1df53b02f7ee7cb4cf5e (diff)
downloadpdfium-e35af1e3c93e5e1f374799da115eb4b99820831c.tar.xz
Remove some IFX_* wrappers.
This CL removes the IFX_* wrappers between fpdfsdk/fxedit and fpdfsdk/pdfwindow which only have a single implementation. Review-Url: https://codereview.chromium.org/2142213002
Diffstat (limited to 'fpdfsdk/fsdk_baseform.cpp')
-rw-r--r--fpdfsdk/fsdk_baseform.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/fpdfsdk/fsdk_baseform.cpp b/fpdfsdk/fsdk_baseform.cpp
index 90ff144759..2994981b6c 100644
--- a/fpdfsdk/fsdk_baseform.cpp
+++ b/fpdfsdk/fsdk_baseform.cpp
@@ -18,6 +18,7 @@
#include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
#include "core/fxge/include/fx_ge.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
+#include "fpdfsdk/fxedit/include/fxet_edit.h"
#include "fpdfsdk/include/fsdk_actionhandler.h"
#include "fpdfsdk/include/fsdk_baseannot.h"
#include "fpdfsdk/include/fsdk_define.h"
@@ -1362,7 +1363,7 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) {
rcButton.left = rcButton.right - 13;
rcButton.Normalize();
- IFX_Edit* pEdit = IFX_Edit::NewEdit();
+ std::unique_ptr<CFX_Edit> pEdit(new CFX_Edit);
pEdit->EnableRefresh(FALSE);
CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
@@ -1399,7 +1400,7 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) {
CFX_FloatRect rcContent = pEdit->GetContentRect();
CFX_ByteString sEdit =
- CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f));
+ CPWL_Utils::GetEditAppStream(pEdit.get(), CFX_FloatPoint(0.0f, 0.0f));
if (sEdit.GetLength() > 0) {
sBody << "/Tx BMC\n"
<< "q\n";
@@ -1415,8 +1416,6 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) {
<< "Q\nEMC\n";
}
- IFX_Edit::DelEdit(pEdit);
-
sBody << CPWL_Utils::GetDropButtonAppStream(rcButton);
CFX_ByteString sAP = GetBackgroundAppStream() + GetBorderAppStream() +
@@ -1431,7 +1430,7 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() {
CFX_FloatRect rcClient = GetClientRect();
CFX_ByteTextBuf sBody, sLines;
- IFX_Edit* pEdit = IFX_Edit::NewEdit();
+ std::unique_ptr<CFX_Edit> pEdit(new CFX_Edit);
pEdit->EnableRefresh(FALSE);
CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
@@ -1484,13 +1483,15 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() {
sList << "BT\n"
<< CPWL_Utils::GetColorAppStream(CPWL_Color(COLORTYPE_GRAY, 1),
TRUE)
- << CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, fy))
+ << CPWL_Utils::GetEditAppStream(pEdit.get(),
+ CFX_FloatPoint(0.0f, fy))
<< "ET\n";
} else {
CPWL_Color crText = GetTextPWLColor();
sList << "BT\n"
<< CPWL_Utils::GetColorAppStream(crText, TRUE)
- << CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, fy))
+ << CPWL_Utils::GetEditAppStream(pEdit.get(),
+ CFX_FloatPoint(0.0f, fy))
<< "ET\n";
}
@@ -1505,8 +1506,6 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() {
sBody << sList << "Q\nEMC\n";
}
- IFX_Edit::DelEdit(pEdit);
-
CFX_ByteString sAP = GetBackgroundAppStream() + GetBorderAppStream() +
sLines.AsStringC() + sBody.AsStringC();
@@ -1518,7 +1517,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) {
CPDF_FormField* pField = pControl->GetField();
CFX_ByteTextBuf sBody, sLines;
- IFX_Edit* pEdit = IFX_Edit::NewEdit();
+ std::unique_ptr<CFX_Edit> pEdit(new CFX_Edit);
pEdit->EnableRefresh(FALSE);
CPDFSDK_Document* pDoc = m_pInterForm->GetDocument();
@@ -1589,7 +1588,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) {
CFX_FloatRect rcContent = pEdit->GetContentRect();
CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(
- pEdit, CFX_FloatPoint(0.0f, 0.0f), nullptr, !bCharArray, subWord);
+ pEdit.get(), CFX_FloatPoint(0.0f, 0.0f), nullptr, !bCharArray, subWord);
if (sEdit.GetLength() > 0) {
sBody << "/Tx BMC\n"
@@ -1659,8 +1658,6 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) {
}
}
- IFX_Edit::DelEdit(pEdit);
-
CFX_ByteString sAP = GetBackgroundAppStream() + GetBorderAppStream() +
sLines.AsStringC() + sBody.AsStringC();
WriteAppearance("N", GetRotatedRect(), GetMatrix(), sAP);