diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-13 16:36:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-13 16:36:20 -0700 |
| commit | 1d023881cd53485303c0fcc0b5878e700dc470fd (patch) | |
| tree | 0f41370ff729b0495f475887a3f6f38a0210aae4 /core/fpdfdoc | |
| parent | 20f8ecc2f44332792c11cf0ac566c0114712b83c (diff) | |
| download | pdfium-1d023881cd53485303c0fcc0b5878e700dc470fd.tar.xz | |
Make CPDF_Object containers hold objects via unique pointers.
This tweaks the implementation while leaving the API the
same. The API change is more disruptive, so break this
part off first.
Review-Url: https://codereview.chromium.org/2385293002
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_formcontrol.cpp | 4 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_formfield.cpp | 2 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp index d0b4a2dced..7bb9c832ba 100644 --- a/core/fpdfdoc/cpdf_formcontrol.cpp +++ b/core/fpdfdoc/cpdf_formcontrol.cpp @@ -68,7 +68,7 @@ void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) { return; for (const auto& it : *pAP) { - CPDF_Object* pObj1 = it.second; + CPDF_Object* pObj1 = it.second.get(); if (!pObj1) continue; @@ -80,7 +80,7 @@ void CPDF_FormControl::SetOnStateName(const CFX_ByteString& csOn) { auto subdict_it = pSubDict->begin(); while (subdict_it != pSubDict->end()) { const CFX_ByteString& csKey2 = subdict_it->first; - CPDF_Object* pObj2 = subdict_it->second; + CPDF_Object* pObj2 = subdict_it->second.get(); ++subdict_it; if (!pObj2) continue; diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index dc45fbcec7..fbe2f052c4 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -839,7 +839,7 @@ FX_BOOL CPDF_FormField::IsOptionSelected(int iOptIndex) const { if (!pArray) return FALSE; - for (CPDF_Object* pObj : *pArray) { + for (const auto& pObj : *pArray) { if (pObj->GetInteger() == iOptIndex) return TRUE; } diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index b8b4b68e29..3bef85ef9c 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -138,7 +138,7 @@ CPDF_Font* GetNativeFont(CPDF_Dictionary* pFormDict, for (const auto& it : *pFonts) { const CFX_ByteString& csKey = it.first; - CPDF_Object* pObj = it.second; + CPDF_Object* pObj = it.second.get(); if (!pObj) continue; @@ -179,7 +179,7 @@ FX_BOOL FindFont(CPDF_Dictionary* pFormDict, for (const auto& it : *pFonts) { const CFX_ByteString& csKey = it.first; - CPDF_Object* pObj = it.second; + CPDF_Object* pObj = it.second.get(); if (!pObj) continue; @@ -216,7 +216,7 @@ FX_BOOL FindFont(CPDF_Dictionary* pFormDict, for (const auto& it : *pFonts) { const CFX_ByteString& csKey = it.first; - CPDF_Object* pObj = it.second; + CPDF_Object* pObj = it.second.get(); if (!pObj) continue; |