From fcfa3b828b92013a45c6bc6d44b04f42a912eff7 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Dec 2015 21:07:28 -0800 Subject: Merge to XFA: Fix a bad virtual keyword removal from commit 0f6b51c. BUG=546744 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1542373002 . (cherry picked from commit ae58ed8bccc56dd78c12d89972b19d58de94f790) Review URL: https://codereview.chromium.org/1548093002 . --- fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp | 19 ++++------------ fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 5 +---- fpdfsdk/src/formfiller/FFL_ListBox.cpp | 4 +--- fpdfsdk/src/formfiller/FFL_TextField.cpp | 4 +--- fpdfsdk/src/fsdk_baseform.cpp | 35 +++++++++++++----------------- fpdfsdk/src/pdfwindow/PWL_FontMap.cpp | 9 ++------ 6 files changed, 24 insertions(+), 52 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index dd58180e61..b08ce35d41 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -18,17 +18,9 @@ CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, m_pDocument = pPage->m_pDocument; m_pAnnotDict = pAnnot->GetPDFAnnot()->GetAnnotDict(); + Initialize(); } -CBA_FontMap::CBA_FontMap(CPDF_Document* pDocument, - CPDF_Dictionary* pAnnotDict, - IFX_SystemHandler* pSystemHandler) - : CPWL_FontMap(pSystemHandler), - m_pDocument(pDocument), - m_pAnnotDict(pAnnotDict), - m_pDefaultFont(NULL), - m_sAPType("N") {} - CBA_FontMap::~CBA_FontMap() {} void CBA_FontMap::Reset() { @@ -37,7 +29,7 @@ void CBA_FontMap::Reset() { m_sDefaultFontName = ""; } -void CBA_FontMap::Initial(const FX_CHAR* fontname) { +void CBA_FontMap::Initialize() { int32_t nCharset = DEFAULT_CHARSET; if (!m_pDefaultFont) { @@ -60,7 +52,7 @@ void CBA_FontMap::Initial(const FX_CHAR* fontname) { } if (nCharset != ANSI_CHARSET) - CPWL_FontMap::Initial(fontname); + CPWL_FontMap::Initialize(); } void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont, @@ -73,9 +65,6 @@ void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont, m_pDefaultFont = pFont; m_sDefaultFontName = sFontName; - // if (m_sDefaultFontName.IsEmpty()) - // m_sDefaultFontName = pFont->GetFontTypeName(); - int32_t nCharset = DEFAULT_CHARSET; if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont()) nCharset = pSubstFont->m_Charset; @@ -278,5 +267,5 @@ void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) { m_sAPType = sAPType; Reset(); - Initial(); + Initialize(); } diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index 8d801c8352..bef276d1cc 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -32,11 +32,8 @@ PWL_CREATEPARAM CFFL_ComboBox::GetCreateParam() { cp.dwFlags |= PCBS_ALLOWCUSTOMTEXT; } - if (!m_pFontMap) { + if (!m_pFontMap) m_pFontMap = new CBA_FontMap(m_pWidget, GetSystemHandler()); - m_pFontMap->Initial(); - } - cp.pFontMap = m_pFontMap; cp.pFocusHandler = this; diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp index d00bfb12ff..d9244e699f 100644 --- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp @@ -36,10 +36,8 @@ PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() { if (cp.dwFlags & PWS_AUTOFONTSIZE) cp.fFontSize = FFL_DEFAULTLISTBOXFONTSIZE; - if (!m_pFontMap) { + if (!m_pFontMap) m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler()); - m_pFontMap->Initial(); - } cp.pFontMap = m_pFontMap; return cp; diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index cc2d31827f..fe0a3aae9c 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -68,10 +68,8 @@ PWL_CREATEPARAM CFFL_TextField::GetCreateParam() { break; } - if (!m_pFontMap) { + if (!m_pFontMap) m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler()); - m_pFontMap->Initial(); - } cp.pFontMap = m_pFontMap; cp.pFocusHandler = this; diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 12faea2bef..d27ac00606 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1015,10 +1015,8 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); CPDFDoc_Environment* pEnv = pDoc->GetEnv(); - CBA_FontMap FontMap(this, pEnv->GetSysHandler()); - FontMap.Initial(); - - FontMap.SetAPType("N"); + CBA_FontMap font_map(this, pEnv->GetSysHandler()); + font_map.SetAPType("N"); CFX_ByteString csAP = CPWL_Utils::GetRectFillAppStream(rcWindow, crBackground) + @@ -1026,7 +1024,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { crLeftTop, crRightBottom, nBorderStyle, dsBorder) + CPWL_Utils::GetPushButtonAppStream( - iconFit.GetFittingBounds() ? rcWindow : rcClient, &FontMap, + iconFit.GetFittingBounds() ? rcWindow : rcClient, &font_map, pNormalIcon, iconFit, csNormalCaption, crText, fFontSize, nLayout); WriteAppearance("N", GetRotatedRect(), GetMatrix(), csAP); @@ -1040,14 +1038,14 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { pRolloverIcon = pNormalIcon; } - FontMap.SetAPType("R"); + font_map.SetAPType("R"); csAP = CPWL_Utils::GetRectFillAppStream(rcWindow, crBackground) + CPWL_Utils::GetBorderAppStream(rcWindow, fBorderWidth, crBorder, crLeftTop, crRightBottom, nBorderStyle, dsBorder) + CPWL_Utils::GetPushButtonAppStream( - iconFit.GetFittingBounds() ? rcWindow : rcClient, &FontMap, + iconFit.GetFittingBounds() ? rcWindow : rcClient, &font_map, pRolloverIcon, iconFit, csRolloverCaption, crText, fFontSize, nLayout); @@ -1072,7 +1070,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { break; } - FontMap.SetAPType("D"); + font_map.SetAPType("D"); csAP = CPWL_Utils::GetRectFillAppStream( rcWindow, CPWL_Utils::SubstractColor(crBackground, 0.25f)) + @@ -1080,7 +1078,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() { crLeftTop, crRightBottom, nBorderStyle, dsBorder) + CPWL_Utils::GetPushButtonAppStream( - iconFit.GetFittingBounds() ? rcWindow : rcClient, &FontMap, + iconFit.GetFittingBounds() ? rcWindow : rcClient, &font_map, pDownIcon, iconFit, csDownCaption, crText, fFontSize, nLayout); WriteAppearance("D", GetRotatedRect(), GetMatrix(), csAP); @@ -1396,9 +1394,8 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(const FX_WCHAR* sValue) { CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); CPDFDoc_Environment* pEnv = pDoc->GetEnv(); - CBA_FontMap FontMap(this, pEnv->GetSysHandler()); - FontMap.Initial(); - pEdit->SetFontMap(&FontMap); + CBA_FontMap font_map(this, pEnv->GetSysHandler()); + pEdit->SetFontMap(&font_map); CPDF_Rect rcEdit = rcClient; rcEdit.right = rcButton.left; @@ -1468,9 +1465,8 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() { CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); CPDFDoc_Environment* pEnv = pDoc->GetEnv(); - CBA_FontMap FontMap(this, pEnv->GetSysHandler()); - FontMap.Initial(); - pEdit->SetFontMap(&FontMap); + CBA_FontMap font_map(this, pEnv->GetSysHandler()); + pEdit->SetFontMap(&font_map); pEdit->SetPlateRect(CPDF_Rect(rcClient.left, 0.0f, rcClient.right, 0.0f)); @@ -1556,9 +1552,8 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { CPDFSDK_Document* pDoc = m_pInterForm->GetDocument(); CPDFDoc_Environment* pEnv = pDoc->GetEnv(); - CBA_FontMap FontMap(this, pEnv->GetSysHandler()); - FontMap.Initial(); - pEdit->SetFontMap(&FontMap); + CBA_FontMap font_map(this, pEnv->GetSysHandler()); + pEdit->SetFontMap(&font_map); CPDF_Rect rcClient = GetClientRect(); pEdit->SetPlateRect(rcClient); @@ -1597,8 +1592,8 @@ void CPDFSDK_Widget::ResetAppearance_TextField(const FX_WCHAR* sValue) { pEdit->SetCharArray(nMaxLen); if (IsFloatZero(fFontSize)) { - fFontSize = CPWL_Edit::GetCharArrayAutoFontSize(FontMap.GetPDFFont(0), - rcClient, nMaxLen); + fFontSize = CPWL_Edit::GetCharArrayAutoFontSize( + font_map.GetPDFFont(0), rcClient, nMaxLen); } } else { if (sValue) diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index d5ca376882..fadea905d4 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -151,13 +151,8 @@ void CPWL_FontMap::Empty() { } } -void CPWL_FontMap::Initial(const FX_CHAR* fontname) { - CFX_ByteString sFontName = fontname; - - if (sFontName.IsEmpty()) - sFontName = DEFAULT_FONT_NAME; - - GetFontIndex(sFontName, ANSI_CHARSET, FALSE); +void CPWL_FontMap::Initialize() { + GetFontIndex(DEFAULT_FONT_NAME, ANSI_CHARSET, FALSE); } /* -- cgit v1.2.3