From efd5a99f98a263da9de52059681ff6ed27b2567c Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 18 Jul 2016 10:04:07 -0700 Subject: Removing default params from CFX_Edit. This CL removes all of the default params from CFX_Edit. They are either moved to the callsite or removed completely if unused. Review-Url: https://codereview.chromium.org/2152473002 --- fpdfsdk/pdfwindow/PWL_Edit.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'fpdfsdk/pdfwindow/PWL_Edit.cpp') diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp index 39ea822ea2..5d20dd46a3 100644 --- a/fpdfsdk/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp @@ -463,17 +463,8 @@ void CPWL_Edit::OnKillFocus() { m_bFocus = FALSE; } -void CPWL_Edit::SetHorzScale(int32_t nHorzScale, FX_BOOL bPaint /* = TRUE*/) { - m_pEdit->SetHorzScale(nHorzScale, bPaint); -} - -void CPWL_Edit::SetCharSpace(FX_FLOAT fCharSpace, FX_BOOL bPaint /* = TRUE*/) { - m_pEdit->SetCharSpace(fCharSpace, bPaint); -} - -void CPWL_Edit::SetLineLeading(FX_FLOAT fLineLeading, - FX_BOOL bPaint /* = TRUE*/) { - m_pEdit->SetLineLeading(fLineLeading, bPaint); +void CPWL_Edit::SetCharSpace(FX_FLOAT fCharSpace) { + m_pEdit->SetCharSpace(fCharSpace); } CFX_ByteString CPWL_Edit::GetSelectAppearanceStream( @@ -559,14 +550,14 @@ FX_FLOAT CPWL_Edit::GetCharArrayAutoFontSize(CPDF_Font* pFont, void CPWL_Edit::SetCharArray(int32_t nCharArray) { if (HasFlag(PES_CHARARRAY) && nCharArray > 0) { m_pEdit->SetCharArray(nCharArray); - m_pEdit->SetTextOverflow(TRUE); + m_pEdit->SetTextOverflow(TRUE, TRUE); if (HasFlag(PWS_AUTOFONTSIZE)) { if (IPVT_FontMap* pFontMap = GetFontMap()) { FX_FLOAT fFontSize = GetCharArrayAutoFontSize( pFontMap->GetPDFFont(0), GetClientRect(), nCharArray); if (fFontSize > 0.0f) { - m_pEdit->SetAutoFontSize(FALSE); + m_pEdit->SetAutoFontSize(FALSE, TRUE); m_pEdit->SetFontSize(fFontSize); } } @@ -580,7 +571,7 @@ void CPWL_Edit::SetLimitChar(int32_t nLimitChar) { void CPWL_Edit::ReplaceSel(const FX_WCHAR* csText) { m_pEdit->Clear(); - m_pEdit->InsertText(csText); + m_pEdit->InsertText(csText, DEFAULT_CHARSET); } CFX_FloatRect CPWL_Edit::GetFocusRect() const { -- cgit v1.2.3