| Index: core/src/fpdfdoc/doc_action.cpp
|
| diff --git a/core/src/fpdfdoc/doc_action.cpp b/core/src/fpdfdoc/doc_action.cpp
|
| index da2e05af2e639d97319c8f468f6acaec38155760..c75b397f0e846265a5d95eaa1d7764fbabbb0100 100644
|
| --- a/core/src/fpdfdoc/doc_action.cpp
|
| +++ b/core/src/fpdfdoc/doc_action.cpp
|
| @@ -10,7 +10,7 @@ CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const
|
| if (!m_pDict) {
|
| return CPDF_Dest();
|
| }
|
| - CFX_ByteString type = m_pDict->GetString("S");
|
| + CFX_ByteString type = m_pDict->GetStringAt("S");
|
| if (type != "GoTo" && type != "GoToR") {
|
| return CPDF_Dest();
|
| }
|
| @@ -36,7 +36,7 @@ CPDF_Action::ActionType CPDF_Action::GetType() const
|
| {
|
| ActionType eType = Unknown;
|
| if (m_pDict != NULL) {
|
| - CFX_ByteString csType = m_pDict->GetString("S");
|
| + CFX_ByteString csType = m_pDict->GetStringAt("S");
|
| if (!csType.IsEmpty()) {
|
| int i = 0;
|
| while (g_sATypes[i][0] != '\0') {
|
| @@ -51,7 +51,7 @@ CPDF_Action::ActionType CPDF_Action::GetType() const
|
| }
|
| CFX_WideString CPDF_Action::GetFilePath() const
|
| {
|
| - CFX_ByteString type = m_pDict->GetString("S");
|
| + CFX_ByteString type = m_pDict->GetStringAt("S");
|
| if (type != "GoToR" && type != "Launch" &&
|
| type != "SubmitForm" && type != "ImportData") {
|
| return CFX_WideString();
|
| @@ -62,7 +62,7 @@ CFX_WideString CPDF_Action::GetFilePath() const
|
| if (type == "Launch") {
|
| CPDF_Dictionary* pWinDict = m_pDict->GetDict(FX_BSTRC("Win"));
|
| if (pWinDict) {
|
| - return CFX_WideString::FromLocal(pWinDict->GetString(FX_BSTRC("F")));
|
| + return CFX_WideString::FromLocal(pWinDict->GetStringAt("F"));
|
| }
|
| }
|
| return path;
|
| @@ -77,15 +77,15 @@ CFX_ByteString CPDF_Action::GetURI(CPDF_Document* pDoc) const
|
| if (m_pDict == NULL) {
|
| return csURI;
|
| }
|
| - if (m_pDict->GetString("S") != "URI") {
|
| + if (m_pDict->GetStringAt("S") != "URI") {
|
| return csURI;
|
| }
|
| - csURI = m_pDict->GetString("URI");
|
| + csURI = m_pDict->GetStringAt("URI");
|
| CPDF_Dictionary* pRoot = pDoc->GetRoot();
|
| CPDF_Dictionary* pURI = pRoot->GetDict("URI");
|
| if (pURI != NULL) {
|
| if (csURI.Find(FX_BSTRC(":"), 0) < 1) {
|
| - csURI = pURI->GetString("Base") + csURI;
|
| + csURI = pURI->GetStringAt("Base") + csURI;
|
| }
|
| }
|
| return csURI;
|
| @@ -99,7 +99,7 @@ FX_DWORD CPDF_ActionFields::GetFieldsCount() const
|
| if (pDict == NULL) {
|
| return 0;
|
| }
|
| - CFX_ByteString csType = pDict->GetString("S");
|
| + CFX_ByteString csType = pDict->GetStringAt("S");
|
| CPDF_Object* pFields = NULL;
|
| if (csType == "Hide") {
|
| pFields = pDict->GetElementValue("T");
|
| @@ -129,7 +129,7 @@ void CPDF_ActionFields::GetAllFields(CFX_PtrArray& fieldObjects) const
|
| if (pDict == NULL) {
|
| return;
|
| }
|
| - CFX_ByteString csType = pDict->GetString("S");
|
| + CFX_ByteString csType = pDict->GetStringAt("S");
|
| CPDF_Object* pFields = NULL;
|
| if (csType == "Hide") {
|
| pFields = pDict->GetElementValue("T");
|
| @@ -162,7 +162,7 @@ CPDF_Object* CPDF_ActionFields::GetField(FX_DWORD iIndex) const
|
| if (pDict == NULL) {
|
| return NULL;
|
| }
|
| - CFX_ByteString csType = pDict->GetString("S");
|
| + CFX_ByteString csType = pDict->GetStringAt("S");
|
| CPDF_Object* pFields = NULL;
|
| if (csType == "Hide") {
|
| pFields = pDict->GetElementValue("T");
|
| @@ -188,7 +188,7 @@ CPDF_LWinParam CPDF_Action::GetWinParam() const
|
| if (m_pDict == NULL) {
|
| return NULL;
|
| }
|
| - if (m_pDict->GetString("S") != "Launch") {
|
| + if (m_pDict->GetStringAt("S") != "Launch") {
|
| return NULL;
|
| }
|
| return m_pDict->GetDict("Win");
|
| @@ -210,7 +210,7 @@ CPDF_Dictionary* CPDF_Action::GetAnnot() const
|
| if (m_pDict == NULL) {
|
| return NULL;
|
| }
|
| - CFX_ByteString csType = m_pDict->GetString("S");
|
| + CFX_ByteString csType = m_pDict->GetStringAt("S");
|
| if (csType == FX_BSTRC("Rendition")) {
|
| return m_pDict->GetDict("AN");
|
| } else if (csType == FX_BSTRC("Movie")) {
|
| @@ -223,11 +223,11 @@ int32_t CPDF_Action::GetOperationType() const
|
| if (m_pDict == NULL) {
|
| return 0;
|
| }
|
| - CFX_ByteString csType = m_pDict->GetString("S");
|
| + CFX_ByteString csType = m_pDict->GetStringAt("S");
|
| if (csType == FX_BSTRC("Rendition")) {
|
| return m_pDict->GetInteger("OP");
|
| } else if (csType == FX_BSTRC("Movie")) {
|
| - CFX_ByteString csOP = m_pDict->GetString("Operation");
|
| + CFX_ByteString csOP = m_pDict->GetStringAt("Operation");
|
| if (csOP == FX_BSTRC("Play")) {
|
| return 0;
|
| } else if (csOP == FX_BSTRC("Stop")) {
|
|
|