From dc8a2b7606c2c6c12d5cfb280dfb49128c1a60ab Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 24 May 2017 13:45:11 -0700 Subject: Convert to CFX_UnownedPtr, part 10 Change-Id: I4eab5e843580845753c5f80c05cf9490a85114b6 Reviewed-on: https://pdfium-review.googlesource.com/5890 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- fpdfsdk/formfiller/cba_fontmap.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/formfiller/cba_fontmap.cpp') diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 273317401d..8bef264085 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -58,8 +58,8 @@ void CBA_FontMap::Initialize() { else nCharset = FX_CHARSET_ANSI; } - AddFontData(m_pDefaultFont, m_sDefaultFontName, nCharset); - AddFontToAnnotDict(m_pDefaultFont, m_sDefaultFontName); + AddFontData(m_pDefaultFont.Get(), m_sDefaultFontName, nCharset); + AddFontToAnnotDict(m_pDefaultFont.Get(), m_sDefaultFontName); } } @@ -80,7 +80,7 @@ void CBA_FontMap::SetDefaultFont(CPDF_Font* pFont, int32_t nCharset = FX_CHARSET_Default; if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont()) nCharset = pSubstFont->m_Charset; - AddFontData(m_pDefaultFont, m_sDefaultFontName, nCharset); + AddFontData(m_pDefaultFont.Get(), m_sDefaultFontName, nCharset); } CPDF_Font* CBA_FontMap::FindFontSameCharset(CFX_ByteString* sFontAlias, @@ -105,7 +105,7 @@ CPDF_Font* CBA_FontMap::FindFontSameCharset(CFX_ByteString* sFontAlias, } CPDF_Document* CBA_FontMap::GetDocument() { - return m_pDocument; + return m_pDocument.Get(); } CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict, @@ -167,7 +167,7 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, CPDF_Stream* pStream = pAPDict->GetStreamFor(m_sAPType); if (!pStream) { pStream = m_pDocument->NewIndirect(); - pAPDict->SetNewFor(m_sAPType, m_pDocument, + pAPDict->SetNewFor(m_sAPType, m_pDocument.Get(), pStream->GetObjNum()); } @@ -185,12 +185,12 @@ void CBA_FontMap::AddFontToAnnotDict(CPDF_Font* pFont, CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDictFor("Font"); if (!pStreamResFontList) { pStreamResFontList = m_pDocument->NewIndirect(); - pStreamResList->SetNewFor("Font", m_pDocument, + pStreamResList->SetNewFor("Font", m_pDocument.Get(), pStreamResFontList->GetObjNum()); } if (!pStreamResFontList->KeyExist(sAlias)) { pStreamResFontList->SetNewFor( - sAlias, m_pDocument, pFont->GetFontDict()->GetObjNum()); + sAlias, m_pDocument.Get(), pFont->GetFontDict()->GetObjNum()); } } @@ -203,7 +203,7 @@ CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString* sAlias) { } CFX_ByteString sDA; - CPDF_Object* pObj = FPDF_GetFieldAttr(m_pAnnotDict, "DA"); + CPDF_Object* pObj = FPDF_GetFieldAttr(m_pAnnotDict.Get(), "DA"); if (pObj) sDA = pObj->GetString(); -- cgit v1.2.3