summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/fpdf_ext.cpp
diff options
context:
space:
mode:
authorWei Li <weili@chromium.org>2016-01-28 15:59:38 -0800
committerWei Li <weili@chromium.org>2016-01-28 15:59:38 -0800
commitd45e7a51904164fb22049f0a7a80d2a94c06936b (patch)
tree047012090dd6dac5ed99c620f250baea480059dd /fpdfsdk/src/fpdf_ext.cpp
parentbadb41230bae96cba8fc481de47592836e3f43f8 (diff)
downloadpdfium-d45e7a51904164fb22049f0a7a80d2a94c06936b.tar.xz
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 .
Diffstat (limited to 'fpdfsdk/src/fpdf_ext.cpp')
-rw-r--r--fpdfsdk/src/fpdf_ext.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp
index e7287027bd..ee542a6453 100644
--- a/fpdfsdk/src/fpdf_ext.cpp
+++ b/fpdfsdk/src/fpdf_ext.cpp
@@ -66,7 +66,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) {
@@ -81,7 +81,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);
@@ -147,18 +147,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;