Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fxfa / src / parser / xfa_document_imp.cpp
index d634079..690ed29 100644 (file)
@@ -379,19 +379,19 @@ void CXFA_Document::DoProtoMerge()
             if(uSharpPos < 0) {\r
                 wsURI = wsUseVal;\r
             } else {\r
-                wsURI = CFX_WideStringC((FX_LPCWSTR)wsUseVal, uSharpPos);\r
+                wsURI = CFX_WideStringC((const FX_WCHAR*)wsUseVal, uSharpPos);\r
                 FX_STRSIZE uLen = wsUseVal.GetLength();\r
-                if(uLen >= uSharpPos + 5 && CFX_WideStringC((FX_LPCWSTR)wsUseVal + uSharpPos, 5) == FX_WSTRC(L"#som(") && wsUseVal[uLen - 1] == ')') {\r
-                    wsSOM = CFX_WideStringC((FX_LPCWSTR)wsUseVal + uSharpPos + 5, uLen - 1 - uSharpPos - 5);\r
+                if(uLen >= uSharpPos + 5 && CFX_WideStringC((const FX_WCHAR*)wsUseVal + uSharpPos, 5) == FX_WSTRC(L"#som(") && wsUseVal[uLen - 1] == ')') {\r
+                    wsSOM = CFX_WideStringC((const FX_WCHAR*)wsUseVal + uSharpPos + 5, uLen - 1 - uSharpPos - 5);\r
                 } else {\r
-                    wsID = CFX_WideStringC((FX_LPCWSTR)wsUseVal + uSharpPos + 1, uLen - uSharpPos - 1);\r
+                    wsID = CFX_WideStringC((const FX_WCHAR*)wsUseVal + uSharpPos + 1, uLen - uSharpPos - 1);\r
                 }\r
             }\r
         } else if(pUseHrefNode->TryCData(XFA_ATTRIBUTE_Use, wsUseVal) && !wsUseVal.IsEmpty()) {\r
             if(wsUseVal[0] == '#') {\r
-                wsID = CFX_WideStringC((FX_LPCWSTR)wsUseVal + 1, wsUseVal.GetLength() - 1);\r
+                wsID = CFX_WideStringC((const FX_WCHAR*)wsUseVal + 1, wsUseVal.GetLength() - 1);\r
             } else {\r
-                wsSOM = CFX_WideStringC((FX_LPCWSTR)wsUseVal, wsUseVal.GetLength());\r
+                wsSOM = CFX_WideStringC((const FX_WCHAR*)wsUseVal, wsUseVal.GetLength());\r
             }\r
         }\r
         if (!wsURI.IsEmpty() && wsURI != FX_WSTRC(L".")) {\r