Index: core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp |
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp |
index 82ab3705643bae1801e47bdcf66e6df3256ac780..ef0344cda0352fb2f23a4c49e7645311724df3d7 100644 |
--- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp |
+++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp |
@@ -14,25 +14,18 @@ CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_Matrix& matrix) { |
<< matrix.e << " " << matrix.f; |
return ar; |
} |
+ |
CPDF_PageContentGenerator::CPDF_PageContentGenerator(CPDF_Page* pPage) |
- : m_pPage(pPage) { |
- m_pDocument = NULL; |
- if (m_pPage) { |
- m_pDocument = m_pPage->m_pDocument; |
- } |
- FX_POSITION pos = pPage->GetPageObjectList()->GetHeadPosition(); |
- while (pos) { |
- InsertPageObject(pPage->GetPageObjectList()->GetNextObject(pos)); |
- } |
+ : m_pPage(pPage), m_pDocument(m_pPage->m_pDocument) { |
+ for (const auto& pObj : *pPage->GetPageObjectList()) |
+ InsertPageObject(pObj.get()); |
} |
-CPDF_PageContentGenerator::~CPDF_PageContentGenerator() {} |
+ |
FX_BOOL CPDF_PageContentGenerator::InsertPageObject( |
CPDF_PageObject* pPageObject) { |
- if (!pPageObject) { |
- return FALSE; |
- } |
- return m_pageObjects.Add(pPageObject); |
+ return pPageObject && m_pageObjects.Add(pPageObject); |
} |
+ |
void CPDF_PageContentGenerator::GenerateContent() { |
CFX_ByteTextBuf buf; |
CPDF_Dictionary* pPageDict = m_pPage->m_pFormDict; |