diff options
| author | Wei Li <weili@chromium.org> | 2016-01-29 15:44:20 -0800 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-01-29 15:44:20 -0800 |
| commit | 9b76113ae4567eb998618d049afde26d3f0175d5 (patch) | |
| tree | ede02b9835770dafe91eaee727e328765e4ffd52 /fpdfsdk/src/fpdf_ext.cpp | |
| parent | 47f7199eee69abdd48c5ab16a5b8f5aef433a003 (diff) | |
| download | pdfium-9b76113ae4567eb998618d049afde26d3f0175d5.tar.xz | |
Merge to XFA: Member function name refactoring
This is needed by Cl 1634373003 as the name collision with virtual functions
will be shown as warnings on Linux. Also, it is better to use
different names for different cases.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1644633003 .
(cherry picked from commit d45e7a51904164fb22049f0a7a80d2a94c06936b)
Review URL: https://codereview.chromium.org/1648233002 .
Diffstat (limited to 'fpdfsdk/src/fpdf_ext.cpp')
| -rw-r--r-- | fpdfsdk/src/fpdf_ext.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index c83464e722..aa6725b288 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -69,7 +69,7 @@ void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot) { const CPDF_Dictionary* pAnnotDict = pPDFAnnot->GetAnnotDict(); CFX_ByteString cbString; if (pAnnotDict->KeyExist("IT")) - cbString = pAnnotDict->GetString("IT"); + cbString = pAnnotDict->GetStringBy("IT"); if (cbString.Compare("Img") != 0) FPDF_UnSupportError(FPDF_UNSP_ANNOT_SCREEN_MEDIA); } else if (cbSubType.Compare("Movie") == 0) { @@ -84,7 +84,7 @@ void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot) { const CPDF_Dictionary* pAnnotDict = pPDFAnnot->GetAnnotDict(); CFX_ByteString cbString; if (pAnnotDict->KeyExist("FT")) { - cbString = pAnnotDict->GetString("FT"); + cbString = pAnnotDict->GetStringBy("FT"); } if (cbString.Compare("Sig") == 0) { FPDF_UnSupportError(FPDF_UNSP_ANNOT_SIG); @@ -150,18 +150,18 @@ void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code) { return; } if (pRootDict->KeyExist("Names")) { - CPDF_Dictionary* pNameDict = pRootDict->GetDict("Names"); + CPDF_Dictionary* pNameDict = pRootDict->GetDictBy("Names"); if (pNameDict && pNameDict->KeyExist("EmbeddedFiles")) { FPDF_UnSupportError(FPDF_UNSP_DOC_ATTACHMENT); return; } if (pNameDict && pNameDict->KeyExist("JavaScript")) { - CPDF_Dictionary* pJSDict = pNameDict->GetDict("JavaScript"); - CPDF_Array* pArray = pJSDict ? pJSDict->GetArray("Names") : NULL; + CPDF_Dictionary* pJSDict = pNameDict->GetDictBy("JavaScript"); + CPDF_Array* pArray = pJSDict ? pJSDict->GetArrayBy("Names") : NULL; if (pArray) { int nCount = pArray->GetCount(); for (int i = 0; i < nCount; i++) { - CFX_ByteString cbStr = pArray->GetString(i); + CFX_ByteString cbStr = pArray->GetStringAt(i); if (cbStr.Compare("com.adobe.acrobat.SharedReview.Register") == 0) { FPDF_UnSupportError(FPDF_UNSP_DOC_SHAREDREVIEW); return; |