| Index: core/src/fpdfdoc/doc_metadata.cpp
|
| diff --git a/core/src/fpdfdoc/doc_metadata.cpp b/core/src/fpdfdoc/doc_metadata.cpp
|
| index e6c7a641e657b68f8a367ff8fa8d2508b658ec15..a09c688b38a79104e0fd18f6fd9425ccfc4feb79 100644
|
| --- a/core/src/fpdfdoc/doc_metadata.cpp
|
| +++ b/core/src/fpdfdoc/doc_metadata.cpp
|
| @@ -70,7 +70,7 @@ void CPDF_Metadata::LoadDoc(CPDF_Document *pDoc)
|
| if (pXmlElmnt->GetTagName() == FX_BSTRC("RDF")) {
|
| pElmntRdf = pXmlElmnt;
|
| } else {
|
| - pElmntRdf = pXmlElmnt->GetElement(NULL, FX_BSTRC("RDF"));
|
| + pElmntRdf = pXmlElmnt->GetElement(CFX_ByteStringC(), FX_BSTRC("RDF"));
|
| }
|
| }
|
| FX_INT32 CPDF_Metadata::GetString(FX_BSTR bsItem, CFX_WideString &wsStr)
|
| @@ -93,42 +93,42 @@ FX_INT32 CPDF_Metadata::GetString(FX_BSTR bsItem, CFX_WideString &wsStr)
|
| }
|
| int nChild = pElmntRdf->CountChildren();
|
| for (int i = 0; i < nChild; i++) {
|
| - CXML_Element *pTag = pElmntRdf->GetElement(NULL, FX_BSTRC("Description"), i);
|
| + CXML_Element *pTag = pElmntRdf->GetElement(CFX_ByteStringC(), "Description", i);
|
| if (!pTag) {
|
| continue;
|
| }
|
| if (bsItem == FX_BSTRC("Title") || bsItem == FX_BSTRC("Subject")) {
|
| - CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
|
| + CXML_Element *pElmnt = pTag->GetElement(CFX_ByteString(), bsTag);
|
| if (!pElmnt) {
|
| continue;
|
| }
|
| - pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Alt"));
|
| + pElmnt = pElmnt->GetElement(CFX_ByteString(), FX_BSTRC("Alt"));
|
| if (!pElmnt) {
|
| continue;
|
| }
|
| - pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
|
| + pElmnt = pElmnt->GetElement(CFX_ByteString(), FX_BSTRC("li"));
|
| if (!pElmnt) {
|
| continue;
|
| }
|
| wsStr = pElmnt->GetContent(0);
|
| return wsStr.GetLength();
|
| } else if (bsItem == FX_BSTRC("Author")) {
|
| - CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
|
| + CXML_Element *pElmnt = pTag->GetElement(CFX_ByteString(), bsTag);
|
| if (!pElmnt) {
|
| continue;
|
| }
|
| - pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Seq"));
|
| + pElmnt = pElmnt->GetElement(CFX_ByteString(), FX_BSTRC("Seq"));
|
| if (!pElmnt) {
|
| continue;
|
| }
|
| - pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
|
| + pElmnt = pElmnt->GetElement(CFX_ByteString(), FX_BSTRC("li"));
|
| if (!pElmnt) {
|
| continue;
|
| }
|
| wsStr = pElmnt->GetContent(0);
|
| return wsStr.GetLength();
|
| } else {
|
| - CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
|
| + CXML_Element *pElmnt = pTag->GetElement(CFX_ByteString(), bsTag);
|
| if (!pElmnt) {
|
| continue;
|
| }
|
|
|