From f13c1f3d21b1fad7a3ac70c14387379f6e146a1a Mon Sep 17 00:00:00 2001
From: Bo Xu <bo_xu@foxitsoftware.com>
Date: Fri, 14 Nov 2014 17:03:50 -0800
Subject: Merge to XFA: Patch from CL 726143002

BUG=https://code.google.com/p/pdfium/issues/detail?id=78
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/726143002
---
 core/src/fpdfdoc/doc_basic.cpp      | 4 ++--
 core/src/fxcrt/fx_basic_wstring.cpp | 4 ++--
 core/src/fxcrt/fx_xml_parser.cpp    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'core')

diff --git a/core/src/fpdfdoc/doc_basic.cpp b/core/src/fpdfdoc/doc_basic.cpp
index 5ccf4ceee9..459ae87a0a 100644
--- a/core/src/fpdfdoc/doc_basic.cpp
+++ b/core/src/fpdfdoc/doc_basic.cpp
@@ -488,7 +488,7 @@ static CFX_WideString _GetLabelNumPortion(int num, const CFX_ByteString& bsStyle
         return wsNumPortion;
     }
     if (bsStyle == "D") {
-        wsNumPortion.Format((FX_LPCWSTR)L"%d", num);
+        wsNumPortion.Format(L"%d", num);
     } else if (bsStyle == "R") {
         wsNumPortion = _MakeRoman(num);
         wsNumPortion.MakeUpper();
@@ -537,7 +537,7 @@ CFX_WideString CPDF_PageLabel::GetLabel(int nPage) const
             return wsLabel;
         }
     }
-    wsLabel.Format((FX_LPCWSTR)L"%d", nPage + 1);
+    wsLabel.Format(L"%d", nPage + 1);
     return wsLabel;
 }
 FX_INT32 CPDF_PageLabel::GetPageByLabel(FX_BSTR bsLabel) const
diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp
index 794630b9e5..3a13d59054 100644
--- a/core/src/fxcrt/fx_basic_wstring.cpp
+++ b/core/src/fxcrt/fx_basic_wstring.cpp
@@ -829,7 +829,7 @@ void CFX_WideString::FormatV(FX_LPCWSTR lpszFormat, va_list argList)
                 ;
         }
         if (nWidth < 0 || nWidth > 128 * 1024) {
-            lpszFormat = (FX_LPCWSTR)L"Bad width";
+            lpszFormat = L"Bad width";
             nMaxLen = 10;
             break;
         }
@@ -846,7 +846,7 @@ void CFX_WideString::FormatV(FX_LPCWSTR lpszFormat, va_list argList)
             }
         }
         if (nPrecision < 0 || nPrecision > 128 * 1024) {
-            lpszFormat = (FX_LPCWSTR)L"Bad precision";
+            lpszFormat = L"Bad precision";
             nMaxLen = 14;
             break;
         }
diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp
index bd418b2d08..d96b38b675 100644
--- a/core/src/fxcrt/fx_xml_parser.cpp
+++ b/core/src/fxcrt/fx_xml_parser.cpp
@@ -472,7 +472,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent, FX_BOOL bStartTag
                         content << decoder.GetResult();
                         CFX_WideString dataStr = content.GetWideString();
                         if (!bCDATA && !m_bSaveSpaceChars) {
-                            dataStr.TrimRight((FX_LPCWSTR)L" \t\r\n");
+                            dataStr.TrimRight(L" \t\r\n");
                         }
                         InsertContentSegment(bCDATA, dataStr, pElement);
                         content.Clear();
@@ -516,7 +516,7 @@ CXML_Element* CXML_Parser::ParseElement(CXML_Element* pParent, FX_BOOL bStartTag
     content << decoder.GetResult();
     CFX_WideString dataStr = content.GetWideString();
     if (!m_bSaveSpaceChars) {
-        dataStr.TrimRight((FX_LPCWSTR)L" \t\r\n");
+        dataStr.TrimRight(L" \t\r\n");
     }
     InsertContentSegment(bCDATA, dataStr, pElement);
     content.Clear();
-- 
cgit v1.2.3