diff options
Diffstat (limited to 'core/fpdfapi')
4 files changed, 5 insertions, 11 deletions
diff --git a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp index 20fd1959f2..08bdb5bb07 100644 --- a/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/fpdf_edit/cpdf_pagecontentgenerator.cpp @@ -58,22 +58,22 @@ void CPDF_PageContentGenerator::GenerateContent() { } CFX_ByteString CPDF_PageContentGenerator::RealizeResource( CPDF_Object* pResourceObj, - const FX_CHAR* szType) { + const CFX_ByteString& bsType) { if (!m_pPage->m_pResources) { m_pPage->m_pResources = new CPDF_Dictionary; int objnum = m_pDocument->AddIndirectObject(m_pPage->m_pResources); m_pPage->m_pFormDict->SetAtReference("Resources", m_pDocument, objnum); } - CPDF_Dictionary* pResList = m_pPage->m_pResources->GetDictBy(szType); + CPDF_Dictionary* pResList = m_pPage->m_pResources->GetDictBy(bsType); if (!pResList) { pResList = new CPDF_Dictionary; - m_pPage->m_pResources->SetAt(szType, pResList); + m_pPage->m_pResources->SetAt(bsType, pResList); } m_pDocument->AddIndirectObject(pResourceObj); CFX_ByteString name; int idnum = 1; while (1) { - name.Format("FX%c%d", szType[0], idnum); + name.Format("FX%c%d", bsType[0], idnum); if (!pResList->KeyExist(name)) { break; } diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h index 564a9ff54c..f60b083be1 100644 --- a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h +++ b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h @@ -32,7 +32,7 @@ class CPDF_PageContentGenerator { uint32_t size, CFX_Matrix& matrix); CFX_ByteString RealizeResource(CPDF_Object* pResourceObj, - const FX_CHAR* szType); + const CFX_ByteString& bsType); CPDF_Page* m_pPage; CPDF_Document* m_pDocument; diff --git a/core/fpdfapi/fpdf_parser/cpdf_name.cpp b/core/fpdfapi/fpdf_parser/cpdf_name.cpp index 2999772aec..7d67b51d7c 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_name.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_name.cpp @@ -10,10 +10,6 @@ CPDF_Name::CPDF_Name(const CFX_ByteString& str) : m_Name(str) {} -CPDF_Name::CPDF_Name(const CFX_ByteStringC& str) : m_Name(str) {} - -CPDF_Name::CPDF_Name(const FX_CHAR* str) : m_Name(str) {} - CPDF_Name::~CPDF_Name() {} CPDF_Object::Type CPDF_Name::GetType() const { diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_name.h b/core/fpdfapi/fpdf_parser/include/cpdf_name.h index bebccb5841..523238c892 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_name.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_name.h @@ -12,8 +12,6 @@ class CPDF_Name : public CPDF_Object { public: explicit CPDF_Name(const CFX_ByteString& str); - explicit CPDF_Name(const CFX_ByteStringC& str); - explicit CPDF_Name(const FX_CHAR* str); // CPDF_Object. Type GetType() const override; |